Use canonical snapshot version 1.9.7-SNAPSHOT

Before, we used 1.9.7.BUILD-SNAPSHOT, which according to Andy Clement
was originally an intent across a group of Spring projects he was
involved in, to ensure that SNAPSHOTS were sorted alphabetically ahead
of MILESTONEs and ahead of RCs.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

diff --git a/README.md b/README.md
index 871f341afaa815dceb15298d0c50528f9161fc80..5c4831c1ba62666a08278096b4ad611719d7324a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -24,4 +24,4 @@ Once you have imported all the projects using `m2e`, close the `org.eclipse.jdt.
  
 ## Setting version for release:
 
-mvn versions:set -DgroupId=org.aspectj -DartifactId=* -DoldVersion=1.9.3.BUILD-SNAPSHOT -DnewVersion=1.9.3
+mvn versions:set -DgroupId=org.aspectj -DartifactId=* -DoldVersion=1.9.3-SNAPSHOT -DnewVersion=1.9.3

diff --git a/ajbrowser/pom.xml b/ajbrowser/pom.xml
index a8c63fa32258eefe05d8a9b33a13d7c89d3ca29e..54bd2376232d13d5774c3e634d4b58e8aaa868d3 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>ajbrowser</artifactId>

diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml
index 9cb66316f64c3786f284b8649b1972adada31534..865067c2552fb13a0062c253129fb33758cfee4f 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>ajde.core</artifactId>

diff --git a/ajde/pom.xml b/ajde/pom.xml
index 79d22931816bd1fcb41702b1921159e2d6b7c09b..c732cd8fe667dab76c46a3aa01232817278e05de 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>ajde</artifactId>

diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml
index 60b39e6cb86af5438bc0656ac88f8abed889fd79..875c4ce7fa356e654359d683dc6c63ab5ebed098 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>ajdoc</artifactId>

diff --git a/asm/pom.xml b/asm/pom.xml
index 254832933f02820bccfe5213ac07ddec3c964daf..bc2083163f70976c31c93916440833b750a3b202 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>asm</artifactId>

diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index 6dd9428097769c9c515c2dfdf55f16d1174d1589..2bb07121d89c196a92172af2d5905d0f4473a809 100644 (file)
--- a/aspectjmatcher/pom.xml
+++ b/aspectjmatcher/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-SNAPSHOT</version>
        </parent>
 
        <artifactId>aspectjmatcher</artifactId>

diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml
index bc5e36e59f618bb636fdf6793d0bdfdff5e4822f..623e1ad3e644a14712f42a581a3279e772bca044 100644 (file)
--- a/aspectjrt/pom.xml
+++ b/aspectjrt/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-SNAPSHOT</version>
        </parent>
 
        <artifactId>aspectjrt</artifactId>

diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml
index 5145a09cca5e3f20021d650a03db2519751acd61..df4ce6a9a5a3025f4d3c56ebbf966a2156ba27d2 100644 (file)
--- a/aspectjtools/pom.xml
+++ b/aspectjtools/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-SNAPSHOT</version>
        </parent>
 
        <artifactId>aspectjtools</artifactId>

diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml
index feb448dcdec9d161727aa51086f6795d512dd75b..0b747d36fc61e75b03d1629ac106e20d4bb850fa 100644 (file)
--- a/aspectjweaver/pom.xml
+++ b/aspectjweaver/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-SNAPSHOT</version>
        </parent>
 
        <artifactId>aspectjweaver</artifactId>

diff --git a/bcel-builder/pom.xml b/bcel-builder/pom.xml
index 2188c7918348836fc893f7b084f66d5d005c2fa8..e7e9a493064a1b5cde6483c6e34382d5aa690cdb 100644 (file)
--- a/bcel-builder/pom.xml
+++ b/bcel-builder/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-SNAPSHOT</version>
        </parent>
 
        <artifactId>bcel-builder</artifactId>

diff --git a/bridge/pom.xml b/bridge/pom.xml
index f85ffa4d9890c0e322460598b621607d9ec37c06..18e546849e881b5f7412e6b5611653a9bc3dc2fa 100644 (file)
--- 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-SNAPSHOT</version>
        </parent>
 
        <artifactId>bridge</artifactId>

diff --git a/build/build.xml b/build/build.xml
index 49b5b1979232f579fdad52711a17bfe314954e34..a24ced72927207a509f5c8f28b006c7fbfd2f3d0 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -806,11 +806,11 @@ ant -propertyfile XXX publishtomaven
     <property name="maven.central.repository" value="https://repo.spring.io/libs-snapshot-local/org/aspectj/aspectjweaver"/>
 -->
 
-<!-- aspectjtools/target/aspectjtools-1.9.6.BUILD-SNAPSHOT.jar -->
+<!-- aspectjtools/target/aspectjtools-1.9.7-SNAPSHOT.jar -->
 
     <property name="bin.jars.folder" value="${build.root}/dist/tools/lib"/>
     <property name="src.jars.folder" value="${build.root}/src"/>
-    <property name="suffix" value="1.9.6.BUILD-SNAPSHOT"/>
+    <property name="suffix" value="1.9.7-SNAPSHOT"/>
 
     <!-- ASPECTJRT -->
     <maven:deploy file="${build.root}/aspectjrt/target/aspectjrt-${suffix}.jar">

diff --git a/build/pom.xml b/build/pom.xml
index 302d9038801182a68f074af7bf99aadd23ffc653..bac4aecc521c0a1fb2056028638f0eef6f4dfde1 100644 (file)
--- 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-SNAPSHOT</version>
        </parent>
 
        <artifactId>build</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
index edefc4f93ca34049fb07f277190ddd311588a235..f2caccaf8d9755a368065a5348477b05d6a7845d 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>docs</artifactId>

diff --git a/installer/pom.xml b/installer/pom.xml
index dece35288458d068db66bfc52554efbce3fd084e..6f9b9168fa4d482ba03b894ea9e8ce8d62a6da22 100644 (file)
--- a/installer/pom.xml
+++ b/installer/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-SNAPSHOT</version>
        </parent>
 
        <artifactId>installer</artifactId>

diff --git a/lib/pom.xml b/lib/pom.xml
index a8cddc23afc07ba619cc02e268a7f0d724cae966..abb416de60f58fe06dc4b9b41250a45eb9084bad 100644 (file)
--- a/lib/pom.xml
+++ b/lib/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-SNAPSHOT</version>
   </parent>
 
   <artifactId>lib</artifactId>

diff --git a/loadtime/pom.xml b/loadtime/pom.xml
index 7bc38c2fc18e64c732c86d8c5f97ad816c496ed9..76b3258201f2f56e4c4b3c19bf534e9e98ae49e9 100644 (file)
--- 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-SNAPSHOT</version>
        </parent>
 
        <artifactId>loadtime</artifactId>

diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml
index 6117b1580a8f4acc207cea1fa1504d847c399d5c..e2f63a005bc91af29e71f8194eda5b6a12d19bca 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.aspectj.ajdt.core</artifactId>

diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml
index 4588c40cdebab6671559d80ee14a3c73e771b580..09d588d58ee25af188170565c8c70a6fdcf639b6 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.aspectj.matcher</artifactId>

diff --git a/pom.xml b/pom.xml
index 3219f0a987c55e04aefc92edebb98eca4c879742..dbcc71bae6516f72221f37c38e15d9fbde052ad2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,14 +5,12 @@
 
        <groupId>org.aspectj</groupId>
        <artifactId>aspectj-parent</artifactId>
-       <version>1.9.7.BUILD-SNAPSHOT</version>
+       <version>1.9.7-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>AspectJ Parent Project</name>
 
        <properties>
-               <!-- TODO: Do we still need this? -->
-               <revision>1.9.7.BUILD-SNAPSHOT</revision>
                <!-- Basic build properties -->
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml
index 7a3f8abe973201756843c662ec79c5f03da2de24..ff35e03af8ea2da3d71780960829e1c0cb03d417 100644 (file)
--- 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-SNAPSHOT</version>
        </parent>
 
        <artifactId>run-all-junit-tests</artifactId>

diff --git a/runtime/pom.xml b/runtime/pom.xml
index ff4c8836d4ac2f077570588998994291d1d90567..ceb3c8462c5f8125f2e273148d3403d9f208bca7 100644 (file)
--- 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-SNAPSHOT</version>
        </parent>
 
        <artifactId>runtime</artifactId>

diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml
index 39e120e213113aed6b17e653e3c3f5cdc81cea28..961e4fc087e421d0c914ba25561eef2a14a69379 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>taskdefs</artifactId>

diff --git a/testing-client/pom.xml b/testing-client/pom.xml
index 4d1f602ecf7a93f07c0b8791ff01ca237f0d7f26..7ab814b729310309849c0b7c3ffeb793e7e319c2 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>testing-client</artifactId>

diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml
index b252d276ab258431912ca17f80a617a2c52f9d11..95d27ec2a6f3a6095d5a319f4f50c0d027254e0a 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>testing-drivers</artifactId>

diff --git a/testing-util/pom.xml b/testing-util/pom.xml
index cd62ba319d4e7588b05c8bfa4d1c1932fd782843..e1db8f2a68fc9a3b081daf3eac649cf932346e36 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>testing-util</artifactId>

diff --git a/testing/pom.xml b/testing/pom.xml
index 335da941de7b213a9cfb0144b017f90bf905aeab..84502ec6006688bbcf084033de0be2d51da1bd12 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>testing</artifactId>

diff --git a/tests/pom.xml b/tests/pom.xml
index 99d1809ec7b1be16242ba891b9407f6c15c57e41..83dba3178904e383c4d2b516b14ffbafbe2e53a1 100644 (file)
--- 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-SNAPSHOT</version>
        </parent>
 
        <artifactId>tests</artifactId>

diff --git a/util/pom.xml b/util/pom.xml
index 4d65e69ec6f6ca71af2c263b9a43db8b7fe97643..07d8125559ba7e9424885a85ed232ccda6ef1892 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>util</artifactId>

diff --git a/weaver/pom.xml b/weaver/pom.xml
index f47c1ddc50f3694c6dab3b086ed8edccc29f28ff..e3bb65e7d011d79c09f03d61d761b4bfcc9e455f 100644 (file)
--- 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-SNAPSHOT</version>
   </parent>
 
   <artifactId>weaver</artifactId>