aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ajbrowser/pom.xml2
-rw-r--r--ajde.core/pom.xml2
-rw-r--r--ajde/pom.xml2
-rw-r--r--ajdoc/pom.xml2
-rw-r--r--asm/pom.xml2
-rw-r--r--aspectjmatcher/pom.xml2
-rw-r--r--aspectjrt/pom.xml2
-rw-r--r--aspectjtools/pom.xml2
-rw-r--r--aspectjweaver/pom.xml2
-rw-r--r--bcel-builder/pom.xml2
-rw-r--r--bridge/pom.xml2
-rw-r--r--build/build.xml28
-rw-r--r--build/pom.xml2
-rw-r--r--build/usedForMavenUpload_milestone/aspectjmatcher.pom25
-rw-r--r--build/usedForMavenUpload_milestone/aspectjrt.pom2
-rw-r--r--build/usedForMavenUpload_milestone/aspectjtools.pom2
-rw-r--r--build/usedForMavenUpload_milestone/aspectjweaver.pom2
-rw-r--r--docs/pom.xml2
-rw-r--r--installer/pom.xml2
-rw-r--r--loadtime/pom.xml2
-rw-r--r--org.aspectj.ajdt.core/pom.xml2
-rw-r--r--org.aspectj.matcher/pom.xml2
-rw-r--r--org.eclipse.jdt.core/pom.xml2
-rw-r--r--pom.xml4
-rw-r--r--run-all-junit-tests/pom.xml2
-rw-r--r--runtime/pom.xml2
-rw-r--r--taskdefs/pom.xml2
-rw-r--r--testing-client/pom.xml2
-rw-r--r--testing-drivers/pom.xml2
-rw-r--r--testing-util/pom.xml2
-rw-r--r--testing/pom.xml2
-rw-r--r--tests/pom.xml2
-rw-r--r--util/pom.xml2
-rw-r--r--weaver/pom.xml2
34 files changed, 77 insertions, 42 deletions
diff --git a/ajbrowser/pom.xml b/ajbrowser/pom.xml
index 009bc2f77..413b6e803 100644
--- a/ajbrowser/pom.xml
+++ b/ajbrowser/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>ajbrowser</artifactId>
diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml
index d15533915..1d9ee7fce 100644
--- a/ajde.core/pom.xml
+++ b/ajde.core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>ajde.core</artifactId>
diff --git a/ajde/pom.xml b/ajde/pom.xml
index 3a42b7e80..7f7825c56 100644
--- a/ajde/pom.xml
+++ b/ajde/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>ajde</artifactId>
diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml
index fa24692c9..f4a0fb609 100644
--- a/ajdoc/pom.xml
+++ b/ajdoc/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>ajdoc</artifactId>
diff --git a/asm/pom.xml b/asm/pom.xml
index 9032d6b1f..6e6497c2c 100644
--- a/asm/pom.xml
+++ b/asm/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>asm</artifactId>
diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index 296504a0e..f4922a878 100644
--- a/aspectjmatcher/pom.xml
+++ b/aspectjmatcher/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>aspectjmatcher</artifactId>
diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml
index 9f721aed5..6b324b6ba 100644
--- a/aspectjrt/pom.xml
+++ b/aspectjrt/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>aspectjrt</artifactId>
diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml
index 56453245f..1b285f4d4 100644
--- a/aspectjtools/pom.xml
+++ b/aspectjtools/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>aspectjtools</artifactId>
diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml
index 481a2a740..d4705f184 100644
--- a/aspectjweaver/pom.xml
+++ b/aspectjweaver/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>aspectjweaver</artifactId>
diff --git a/bcel-builder/pom.xml b/bcel-builder/pom.xml
index fde8b9f05..f4bf8f874 100644
--- a/bcel-builder/pom.xml
+++ b/bcel-builder/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
</project>
diff --git a/bridge/pom.xml b/bridge/pom.xml
index eae496e79..d23314a65 100644
--- a/bridge/pom.xml
+++ b/bridge/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>bridge</artifactId>
diff --git a/build/build.xml b/build/build.xml
index 573908871..013f32610 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -855,40 +855,50 @@ ant -propertyfile XXX publishtomaven
<target name="publishtomaven_milestone" depends="maven.init">
- <property name="suffix" value="1.9.0.BETA-6"/>
-
- <property name="build.root" value="/Users/aclement/gits/org.aspectj/aj-build"/>
+ <property name="build.root" value="/Users/aclement/gits/org.aspectj"/>
+ <property name="suffix" value="1.9.7.M1"/>
+
<property name="adjusted.release.type" value="milestone"/>
<property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/>
<property name="bin.jars.folder" value="${build.root}/dist/tools/lib"/>
<property name="src.jars.folder" value="${build.root}/src"/>
<!-- ASPECTJRT -->
- <maven:deploy file="${bin.jars.folder}/aspectjrt.jar">
+ <maven:deploy file="${build.root}/aspectjrt/target/aspectjrt-${suffix}.jar">
<remoteRepository url="${maven.central.repository}">
<authentication username="${accessKey}" passphrase="${secretKey}"/>
</remoteRepository>
<pom file="usedForMavenUpload_milestone/aspectjrt.pom"/>
- <attach file="${src.jars.folder}/aspectjrt${suffix}-src.jar" classifier="sources"/>
+ <attach file="${build.root}/aspectjrt/target/aspectjrt-${suffix}-sources.jar" classifier="sources"/>
</maven:deploy>
<!-- ASPECTJTOOLS -->
- <maven:deploy file="${bin.jars.folder}/aspectjtools.jar">
+ <maven:deploy file="${build.root}/aspectjtools/target/aspectjtools-${suffix}.jar">
<remoteRepository url="${maven.central.repository}">
<authentication username="${accessKey}" passphrase="${secretKey}"/>
</remoteRepository>
<pom file="usedForMavenUpload_milestone/aspectjtools.pom"/>
- <attach file="${src.jars.folder}/aspectjtools${suffix}-src.jar" classifier="sources"/>
+ <attach file="${build.root}/aspectjtools/target/aspectjtools-${suffix}-sources.jar" classifier="sources"/>
</maven:deploy>
<!-- ASPECTJWEAVER -->
- <maven:deploy file="${bin.jars.folder}/aspectjweaver.jar">
+ <maven:deploy file="${build.root}/aspectjweaver/target/aspectjweaver-${suffix}.jar">
<remoteRepository url="${maven.central.repository}">
<authentication username="${accessKey}" passphrase="${secretKey}"/>
</remoteRepository>
<pom file="usedForMavenUpload_milestone/aspectjweaver.pom"/>
- <attach file="${src.jars.folder}/aspectjweaver${suffix}-src.jar" classifier="sources"/>
+ <attach file="${build.root}/aspectjweaver/target/aspectjweaver-${suffix}-sources.jar" classifier="sources"/>
+ </maven:deploy>
+
+ <!-- ASPECTJMATCHER -->
+ <maven:deploy file="${build.root}/aspectjmatcher/target/aspectjmatcher-${suffix}.jar">
+ <remoteRepository url="${maven.central.repository}">
+ <authentication username="${accessKey}" passphrase="${secretKey}"/>
+ </remoteRepository>
+ <pom file="usedForMavenUpload_milestone/aspectjmatcher.pom"/>
+ <attach file="${build.root}/aspectjmatcher/target/aspectjmatcher-${suffix}-sources.jar" classifier="sources"/>
</maven:deploy>
+
</target>
<target name="publishtomaven_release" depends="maven.init">
diff --git a/build/pom.xml b/build/pom.xml
index f486bb1d5..eb7d2d4f4 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>build</artifactId>
diff --git a/build/usedForMavenUpload_milestone/aspectjmatcher.pom b/build/usedForMavenUpload_milestone/aspectjmatcher.pom
new file mode 100644
index 000000000..d57047b73
--- /dev/null
+++ b/build/usedForMavenUpload_milestone/aspectjmatcher.pom
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjmatcher</artifactId>
+ <packaging>jar</packaging>
+ <version>1.9.7.M1</version>
+ <name>AspectJ matcher</name>
+ <description>The AspectJ matcher can be used for matching pointcuts</description>
+ <url>http://www.aspectj.org</url>
+
+ <licenses>
+ <license>
+ <name>Eclipse Public License - v 1.0</name>
+ <url>http://www.eclipse.org/legal/epl-v10.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
+ </scm>
+
+</project>
diff --git a/build/usedForMavenUpload_milestone/aspectjrt.pom b/build/usedForMavenUpload_milestone/aspectjrt.pom
index 4fafffc63..79175e87d 100644
--- a/build/usedForMavenUpload_milestone/aspectjrt.pom
+++ b/build/usedForMavenUpload_milestone/aspectjrt.pom
@@ -5,7 +5,7 @@
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<packaging>jar</packaging>
- <version>1.9.0.RC4</version>
+ <version>1.9.7.M1</version>
<name>AspectJ runtime</name>
<description>The runtime needed to execute a program using AspectJ</description>
<url>http://www.aspectj.org</url>
diff --git a/build/usedForMavenUpload_milestone/aspectjtools.pom b/build/usedForMavenUpload_milestone/aspectjtools.pom
index 7ad6b32ce..d3ade9c4d 100644
--- a/build/usedForMavenUpload_milestone/aspectjtools.pom
+++ b/build/usedForMavenUpload_milestone/aspectjtools.pom
@@ -5,7 +5,7 @@
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<packaging>jar</packaging>
- <version>1.9.0.RC4</version>
+ <version>1.9.7.M1</version>
<name>AspectJ tools</name>
<description>Tools from the AspectJ project</description>
<url>http://www.aspectj.org</url>
diff --git a/build/usedForMavenUpload_milestone/aspectjweaver.pom b/build/usedForMavenUpload_milestone/aspectjweaver.pom
index 9567196ad..5dddf2c9c 100644
--- a/build/usedForMavenUpload_milestone/aspectjweaver.pom
+++ b/build/usedForMavenUpload_milestone/aspectjweaver.pom
@@ -5,7 +5,7 @@
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<packaging>jar</packaging>
- <version>1.9.0.RC4</version>
+ <version>1.9.7.M1</version>
<name>AspectJ weaver</name>
<description>The AspectJ weaver introduces advices to java classes</description>
<url>http://www.aspectj.org</url>
diff --git a/docs/pom.xml b/docs/pom.xml
index 1f707646f..c351d817d 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>docs</artifactId>
diff --git a/installer/pom.xml b/installer/pom.xml
index 527be9ab5..3aaa0d481 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>installer</artifactId>
diff --git a/loadtime/pom.xml b/loadtime/pom.xml
index 91a850ef7..54afbbdf9 100644
--- a/loadtime/pom.xml
+++ b/loadtime/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>loadtime</artifactId>
diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml
index ec800b1da..259891766 100644
--- a/org.aspectj.ajdt.core/pom.xml
+++ b/org.aspectj.ajdt.core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>org.aspectj.ajdt.core</artifactId>
diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml
index 2af081949..3b1e53530 100644
--- a/org.aspectj.matcher/pom.xml
+++ b/org.aspectj.matcher/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>org.aspectj.matcher</artifactId>
diff --git a/org.eclipse.jdt.core/pom.xml b/org.eclipse.jdt.core/pom.xml
index f6cae4e57..64139af82 100644
--- a/org.eclipse.jdt.core/pom.xml
+++ b/org.eclipse.jdt.core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>org.eclipse.jdt.core</artifactId>
diff --git a/pom.xml b/pom.xml
index e73828d2c..5221c8037 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,14 +5,14 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <revision>1.9.6</revision>
+ <revision>1.9.7.M1</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
<packaging>pom</packaging>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
<name>AspectJ Parent Project</name>
<modules>
diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml
index 97347e3eb..c560ab9d8 100644
--- a/run-all-junit-tests/pom.xml
+++ b/run-all-junit-tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>run-all-junit-tests</artifactId>
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 554f74a62..9de47a14f 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>runtime</artifactId>
diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml
index b686fa663..b9da0a520 100644
--- a/taskdefs/pom.xml
+++ b/taskdefs/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>taskdefs</artifactId>
diff --git a/testing-client/pom.xml b/testing-client/pom.xml
index 0409be08b..40f22ef47 100644
--- a/testing-client/pom.xml
+++ b/testing-client/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>testing-client</artifactId>
diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml
index d5542cca2..7ce84cd00 100644
--- a/testing-drivers/pom.xml
+++ b/testing-drivers/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>testing-drivers</artifactId>
diff --git a/testing-util/pom.xml b/testing-util/pom.xml
index 8e5262fd6..c76e5ea99 100644
--- a/testing-util/pom.xml
+++ b/testing-util/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>testing-util</artifactId>
diff --git a/testing/pom.xml b/testing/pom.xml
index d0c20be24..5108c6365 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>testing</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index 9b59abd2e..4c09f056d 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>tests</artifactId>
diff --git a/util/pom.xml b/util/pom.xml
index 1b92b298b..55d518229 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>util</artifactId>
diff --git a/weaver/pom.xml b/weaver/pom.xml
index 4cc59bdfb..d18205878 100644
--- a/weaver/pom.xml
+++ b/weaver/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.aspectj</groupId>
<artifactId>aspectj-parent</artifactId>
- <version>1.9.7.BUILD-SNAPSHOT</version>
+ <version>1.9.7.M1</version>
</parent>
<artifactId>weaver</artifactId>