diff options
| author | Andy Clement <aclement@pivotal.io> | 2020-07-22 12:34:07 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2020-07-22 12:34:07 -0700 |
| commit | 3d7bc042885bb01697fbd5004fe36cf6c274cfea (patch) | |
| tree | 4abc319e37a631fd57bc56decce9ab5233cdf470 | |
| parent | 199aaba33af3874bc5b27a7af2ac60a2dadbeab2 (diff) | |
| download | aspectj-3d7bc042885bb01697fbd5004fe36cf6c274cfea.tar.gz aspectj-3d7bc042885bb01697fbd5004fe36cf6c274cfea.zip | |
AspectJ 1.9.6 final bitsV1_9_6
35 files changed, 73 insertions, 39 deletions
diff --git a/.gitignore b/.gitignore index 799d2dc2a..09871eb4e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Maven target/ +*.versionsBackup # Files + directories created during build aj-build/ diff --git a/ajbrowser/pom.xml b/ajbrowser/pom.xml index 03acbc275..4a7cbce2b 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml index 5529b4e5f..36716e513 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/ajde/pom.xml b/ajde/pom.xml index 7108c3f11..aa361cba5 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml index f5046dadc..dcf3dec1e 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/asm/pom.xml b/asm/pom.xml index 6e61563a4..53f0c264b 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml index e791fa97c..e555d53f0 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> </parent> <artifactId>aspectjmatcher</artifactId> diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml index 68918cfb7..26e89c83a 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> </parent> <artifactId>aspectjrt</artifactId> diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml index bcfa35a52..6c7eacc9f 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> </parent> <artifactId>aspectjtools</artifactId> diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml index 6d8b94e99..d7319a687 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> </parent> <artifactId>aspectjweaver</artifactId> diff --git a/bcel-builder/pom.xml b/bcel-builder/pom.xml index a975edf53..32f550391 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/bridge/pom.xml b/bridge/pom.xml index e02445e5b..115fbcb08 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/build/pom.xml b/build/pom.xml index 8d3348459..0e7112476 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/build/pomsForRelease/aspectjmatcher.pom b/build/pomsForRelease/aspectjmatcher.pom new file mode 100644 index 000000000..fef415ac1 --- /dev/null +++ b/build/pomsForRelease/aspectjmatcher.pom @@ -0,0 +1,33 @@ +<?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>VERSION</version> + <name>AspectJ weaver</name> + <description>The AspectJ matcher includes the pointcut matching capabilities</description> + <url>https://www.eclipse.org/aspectj/</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> + + <developers> + <developer> + <id>aclement</id> + <name>Andy Clement</name> + <email>aclement@vmware.com</email> + </developer> + </developers> + + <scm> + <url>https://github.com/eclipse/org.aspectj</url> + </scm> + +</project> diff --git a/build/usedForMavenUpload_release/aspectjrt.pom b/build/usedForMavenUpload_release/aspectjrt.pom index f745bce1f..6a9e0c000 100644 --- a/build/usedForMavenUpload_release/aspectjrt.pom +++ b/build/usedForMavenUpload_release/aspectjrt.pom @@ -8,7 +8,7 @@ <version>1.8.6</version> <name>AspectJ runtime</name> <description>The runtime needed to execute a program using AspectJ</description> - <url>http://www.aspectj.org</url> + <url>https://www.eclipse.org/aspectj/</url> <licenses> <license> @@ -27,7 +27,7 @@ </developers> <scm> - <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url> + <url>https://github.com/eclipse/org.aspectj</url> </scm> </project> diff --git a/build/usedForMavenUpload_release/aspectjtools.pom b/build/usedForMavenUpload_release/aspectjtools.pom index 50526540a..5802ba208 100644 --- a/build/usedForMavenUpload_release/aspectjtools.pom +++ b/build/usedForMavenUpload_release/aspectjtools.pom @@ -8,7 +8,7 @@ <version>1.8.6</version> <name>AspectJ tools</name> <description>Tools from the AspectJ project</description> - <url>http://www.aspectj.org</url> + <url>https://www.eclipse.org/aspectj/</url> <licenses> <license> @@ -27,7 +27,7 @@ </developers> <scm> - <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url> + <url>https://github.com/eclipse/org.aspectj</url> </scm> </project> diff --git a/build/usedForMavenUpload_release/aspectjweaver.pom b/build/usedForMavenUpload_release/aspectjweaver.pom index d9d49848f..9c15d2712 100644 --- a/build/usedForMavenUpload_release/aspectjweaver.pom +++ b/build/usedForMavenUpload_release/aspectjweaver.pom @@ -8,7 +8,7 @@ <version>1.8.6</version> <name>AspectJ weaver</name> <description>The AspectJ weaver introduces advices to java classes</description> - <url>http://www.aspectj.org</url> + <url>https://www.eclipse.org/aspectj/</url> <licenses> <license> @@ -27,7 +27,7 @@ </developers> <scm> - <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url> + <url>https://github.com/eclipse/org.aspectj</url> </scm> </project> diff --git a/docs/dist/doc/README-196.html b/docs/dist/doc/README-196.html index 6d47a926c..e85348867 100644 --- a/docs/dist/doc/README-196.html +++ b/docs/dist/doc/README-196.html @@ -63,7 +63,7 @@ execution(String Person.firstName()) A </code></pre> -<p>Available: 1.9.6 available 22-Apr-2020</p> +<p>Available: 1.9.6 available 22-Jul-2020</p> <br><br> diff --git a/docs/pom.xml b/docs/pom.xml index ce5aad9a6..5dad05d70 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/installer/pom.xml b/installer/pom.xml index 0bbb7da4e..6c3aa33c1 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> </parent> <artifactId>installer</artifactId> diff --git a/loadtime/pom.xml b/loadtime/pom.xml index ef1ad2539..0fc51c37d 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml index 1d36af960..e0bef4ef1 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml index cfff5ce94..99f245684 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/org.eclipse.jdt.core/pom.xml b/org.eclipse.jdt.core/pom.xml index a4798a2b4..b19e05a86 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> @@ -33,7 +33,7 @@ <configuration> <groupId>org.aspectj</groupId> <artifactId>org.eclipse.jdt.core</artifactId> - <version>1.9.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <packaging>jar</packaging> <file>${basedir}/jdtcore-for-aspectj.jar</file> <createChecksum>true</createChecksum> @@ -49,7 +49,7 @@ <configuration> <groupId>org.aspectj</groupId> <artifactId>org.eclipse.jdt.core</artifactId> - <version>1.9.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <packaging>jar</packaging> <file>${basedir}/jdtcore-for-aspectj-src.zip</file> <createChecksum>true</createChecksum> @@ -5,14 +5,14 @@ <modelVersion>4.0.0</modelVersion> <properties> - <revision>1.9.6.BUILD-SNAPSHOT</revision> + <revision>1.9.6</revision> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <groupId>org.aspectj</groupId> <artifactId>aspectj-parent</artifactId> <packaging>pom</packaging> - <version>1.9.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <name>AspectJ Parent Project</name> <modules> diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml index b84bdcf3c..5986fef32 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/runtime/pom.xml b/runtime/pom.xml index 81beb0408..d34c61d7c 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml index 98b9ae8dd..f0f777d14 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/testing-client/pom.xml b/testing-client/pom.xml index 4eacf144f..cd3dace96 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml index 383732416..dde1cd11a 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/testing-util/pom.xml b/testing-util/pom.xml index c1da23789..b0b16fc26 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/testing/pom.xml b/testing/pom.xml index 03f77f995..64f1a73f5 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/tests/pom.xml b/tests/pom.xml index 6a8cbaf50..30841303b 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> diff --git a/util/pom.xml b/util/pom.xml index 266612176..df104d6cf 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> </parent> <artifactId>util</artifactId> diff --git a/weaver/pom.xml b/weaver/pom.xml index a3104152e..8ec6dc774 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.6.BUILD-SNAPSHOT</version> + <version>1.9.6</version> <relativePath>..</relativePath> </parent> |