From 3d7bc042885bb01697fbd5004fe36cf6c274cfea Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Wed, 22 Jul 2020 12:34:07 -0700 Subject: [PATCH] AspectJ 1.9.6 final bits --- .gitignore | 1 + ajbrowser/pom.xml | 2 +- ajde.core/pom.xml | 2 +- ajde/pom.xml | 2 +- ajdoc/pom.xml | 2 +- asm/pom.xml | 2 +- aspectjmatcher/pom.xml | 2 +- aspectjrt/pom.xml | 2 +- aspectjtools/pom.xml | 2 +- aspectjweaver/pom.xml | 2 +- bcel-builder/pom.xml | 2 +- bridge/pom.xml | 2 +- build/pom.xml | 2 +- build/pomsForRelease/aspectjmatcher.pom | 33 +++++++++++++++++++ .../usedForMavenUpload_release/aspectjrt.pom | 4 +-- .../aspectjtools.pom | 4 +-- .../aspectjweaver.pom | 4 +-- docs/dist/doc/README-196.html | 2 +- docs/pom.xml | 2 +- installer/pom.xml | 2 +- loadtime/pom.xml | 2 +- org.aspectj.ajdt.core/pom.xml | 2 +- org.aspectj.matcher/pom.xml | 2 +- org.eclipse.jdt.core/pom.xml | 6 ++-- pom.xml | 4 +-- run-all-junit-tests/pom.xml | 2 +- runtime/pom.xml | 2 +- taskdefs/pom.xml | 2 +- testing-client/pom.xml | 2 +- testing-drivers/pom.xml | 2 +- testing-util/pom.xml | 2 +- testing/pom.xml | 2 +- tests/pom.xml | 2 +- util/pom.xml | 2 +- weaver/pom.xml | 2 +- 35 files changed, 73 insertions(+), 39 deletions(-) create mode 100644 build/pomsForRelease/aspectjmatcher.pom 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 aspectjmatcher 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 aspectjrt 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 aspectjtools 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 aspectjweaver 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ + + + 4.0.0 + org.aspectj + aspectjmatcher + jar + VERSION + AspectJ weaver + The AspectJ matcher includes the pointcut matching capabilities + https://www.eclipse.org/aspectj/ + + + + Eclipse Public License - v 1.0 + http://www.eclipse.org/legal/epl-v10.html + repo + + + + + + aclement + Andy Clement + aclement@vmware.com + + + + + https://github.com/eclipse/org.aspectj + + + 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 @@ 1.8.6 AspectJ runtime The runtime needed to execute a program using AspectJ - http://www.aspectj.org + https://www.eclipse.org/aspectj/ @@ -27,7 +27,7 @@ - http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project + https://github.com/eclipse/org.aspectj 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 @@ 1.8.6 AspectJ tools Tools from the AspectJ project - http://www.aspectj.org + https://www.eclipse.org/aspectj/ @@ -27,7 +27,7 @@ - http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project + https://github.com/eclipse/org.aspectj 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 @@ 1.8.6 AspectJ weaver The AspectJ weaver introduces advices to java classes - http://www.aspectj.org + https://www.eclipse.org/aspectj/ @@ -27,7 +27,7 @@ - http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project + https://github.com/eclipse/org.aspectj 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 -

Available: 1.9.6 available 22-Apr-2020

+

Available: 1.9.6 available 22-Jul-2020



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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 installer 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. @@ -33,7 +33,7 @@ org.aspectj org.eclipse.jdt.core - 1.9.6.BUILD-SNAPSHOT + 1.9.6 jar ${basedir}/jdtcore-for-aspectj.jar true @@ -49,7 +49,7 @@ org.aspectj org.eclipse.jdt.core - 1.9.6.BUILD-SNAPSHOT + 1.9.6 jar ${basedir}/jdtcore-for-aspectj-src.zip true diff --git a/pom.xml b/pom.xml index 32e00bfb4..e8ac6c011 100644 --- a/pom.xml +++ b/pom.xml @@ -5,14 +5,14 @@ 4.0.0 - 1.9.6.BUILD-SNAPSHOT + 1.9.6 UTF-8 org.aspectj aspectj-parent pom - 1.9.6.BUILD-SNAPSHOT + 1.9.6 AspectJ Parent Project 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 util 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 @@ org.aspectj aspectj-parent - 1.9.6.BUILD-SNAPSHOT + 1.9.6 .. -- 2.39.5