diff options
author | Andy Clement <aclement@pivotal.io> | 2021-05-22 22:09:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-22 22:09:35 -0700 |
commit | 269fa294abb8c0d1209ca76b15327f41df0bae9d (patch) | |
tree | ed3aba94d2dc31322243c4016ed145a92000f7f0 | |
parent | da333d21e0a5e6fb052803abe9c08984c7386905 (diff) | |
parent | 2ea1a6e46f056ec0fc80eb1abf2eba6669d7157e (diff) | |
download | aspectj-269fa294abb8c0d1209ca76b15327f41df0bae9d.tar.gz aspectj-269fa294abb8c0d1209ca76b15327f41df0bae9d.zip |
Merge pull request #56 from kriegaex/canonical-snapshot-version
Use canonical snapshot version 1.9.7-SNAPSHOT
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | ajbrowser/pom.xml | 2 | ||||
-rw-r--r-- | ajde.core/pom.xml | 2 | ||||
-rw-r--r-- | ajde/pom.xml | 2 | ||||
-rw-r--r-- | ajdoc/pom.xml | 2 | ||||
-rw-r--r-- | asm/pom.xml | 2 | ||||
-rw-r--r-- | aspectjmatcher/pom.xml | 2 | ||||
-rw-r--r-- | aspectjrt/pom.xml | 2 | ||||
-rw-r--r-- | aspectjtools/pom.xml | 2 | ||||
-rw-r--r-- | aspectjweaver/pom.xml | 2 | ||||
-rw-r--r-- | bcel-builder/pom.xml | 2 | ||||
-rw-r--r-- | bridge/pom.xml | 2 | ||||
-rw-r--r-- | build/build.xml | 4 | ||||
-rw-r--r-- | build/pom.xml | 2 | ||||
-rw-r--r-- | docs/pom.xml | 2 | ||||
-rw-r--r-- | installer/pom.xml | 2 | ||||
-rw-r--r-- | lib/pom.xml | 2 | ||||
-rw-r--r-- | loadtime/pom.xml | 2 | ||||
-rw-r--r-- | org.aspectj.ajdt.core/pom.xml | 2 | ||||
-rw-r--r-- | org.aspectj.matcher/pom.xml | 2 | ||||
-rw-r--r-- | pom.xml | 4 | ||||
-rw-r--r-- | run-all-junit-tests/pom.xml | 2 | ||||
-rw-r--r-- | runtime/pom.xml | 2 | ||||
-rw-r--r-- | taskdefs/pom.xml | 2 | ||||
-rw-r--r-- | testing-client/pom.xml | 2 | ||||
-rw-r--r-- | testing-drivers/pom.xml | 2 | ||||
-rw-r--r-- | testing-util/pom.xml | 2 | ||||
-rw-r--r-- | testing/pom.xml | 2 | ||||
-rw-r--r-- | tests/pom.xml | 2 | ||||
-rw-r--r-- | util/pom.xml | 2 | ||||
-rw-r--r-- | weaver/pom.xml | 2 |
31 files changed, 32 insertions, 34 deletions
@@ -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 a8c63fa32..54bd23762 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-SNAPSHOT</version> </parent> <artifactId>ajbrowser</artifactId> diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml index 9cb66316f..865067c25 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-SNAPSHOT</version> </parent> <artifactId>ajde.core</artifactId> diff --git a/ajde/pom.xml b/ajde/pom.xml index 79d229318..c732cd8fe 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-SNAPSHOT</version> </parent> <artifactId>ajde</artifactId> diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml index 60b39e6cb..875c4ce7f 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-SNAPSHOT</version> </parent> <artifactId>ajdoc</artifactId> diff --git a/asm/pom.xml b/asm/pom.xml index 254832933..bc2083163 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-SNAPSHOT</version> </parent> <artifactId>asm</artifactId> diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml index 6dd942809..2bb07121d 100644 --- 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 bc5e36e59..623e1ad3e 100644 --- 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 5145a09cc..df4ce6a9a 100644 --- 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 feb448dcd..0b747d36f 100644 --- 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 2188c7918..e7e9a4930 100644 --- 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 f85ffa4d9..18e546849 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-SNAPSHOT</version> </parent> <artifactId>bridge</artifactId> diff --git a/build/build.xml b/build/build.xml index 49b5b1979..a24ced729 100644 --- 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 302d90388..bac4aecc5 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-SNAPSHOT</version> </parent> <artifactId>build</artifactId> diff --git a/docs/pom.xml b/docs/pom.xml index edefc4f93..f2caccaf8 100644 --- 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 dece35288..6f9b9168f 100644 --- 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 a8cddc23a..abb416de6 100644 --- 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 7bc38c2fc..76b325820 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-SNAPSHOT</version> </parent> <artifactId>loadtime</artifactId> diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml index 6117b1580..e2f63a005 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-SNAPSHOT</version> </parent> <artifactId>org.aspectj.ajdt.core</artifactId> diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml index 4588c40cd..09d588d58 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-SNAPSHOT</version> </parent> <artifactId>org.aspectj.matcher</artifactId> @@ -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 7a3f8abe9..ff35e03af 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-SNAPSHOT</version> </parent> <artifactId>run-all-junit-tests</artifactId> diff --git a/runtime/pom.xml b/runtime/pom.xml index ff4c8836d..ceb3c8462 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-SNAPSHOT</version> </parent> <artifactId>runtime</artifactId> diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml index 39e120e21..961e4fc08 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-SNAPSHOT</version> </parent> <artifactId>taskdefs</artifactId> diff --git a/testing-client/pom.xml b/testing-client/pom.xml index 4d1f602ec..7ab814b72 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-SNAPSHOT</version> </parent> <artifactId>testing-client</artifactId> diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml index b252d276a..95d27ec2a 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-SNAPSHOT</version> </parent> <artifactId>testing-drivers</artifactId> diff --git a/testing-util/pom.xml b/testing-util/pom.xml index cd62ba319..e1db8f2a6 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-SNAPSHOT</version> </parent> <artifactId>testing-util</artifactId> diff --git a/testing/pom.xml b/testing/pom.xml index 335da941d..84502ec60 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-SNAPSHOT</version> </parent> <artifactId>testing</artifactId> diff --git a/tests/pom.xml b/tests/pom.xml index 99d1809ec..83dba3178 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-SNAPSHOT</version> </parent> <artifactId>tests</artifactId> diff --git a/util/pom.xml b/util/pom.xml index 4d65e69ec..07d812555 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-SNAPSHOT</version> </parent> <artifactId>util</artifactId> diff --git a/weaver/pom.xml b/weaver/pom.xml index f47c1ddc5..e3bb65e7d 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-SNAPSHOT</version> </parent> <artifactId>weaver</artifactId> |