From b20196924eba2d42a842d9adc62f523fa181ffbd Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Fri, 21 Aug 2020 12:16:30 -0700 Subject: [PATCH] 1.9.7 milestone 1 published --- 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/build.xml | 28 +++++++++++++------ build/pom.xml | 2 +- .../aspectjmatcher.pom | 25 +++++++++++++++++ .../aspectjrt.pom | 2 +- .../aspectjtools.pom | 2 +- .../aspectjweaver.pom | 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 | 2 +- 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 +- 34 files changed, 77 insertions(+), 42 deletions(-) create mode 100644 build/usedForMavenUpload_milestone/aspectjmatcher.pom 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 ajbrowser 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 ajde.core 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 ajde 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 ajdoc 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 asm 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 aspectjmatcher 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 aspectjrt 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 aspectjtools 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 aspectjweaver 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 bridge 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 - - - + + + - + - + - + - + - + - + + + + + + + + + + + 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 build 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 @@ + + + 4.0.0 + org.aspectj + aspectjmatcher + jar + 1.9.7.M1 + AspectJ matcher + The AspectJ matcher can be used for matching pointcuts + http://www.aspectj.org + + + + Eclipse Public License - v 1.0 + http://www.eclipse.org/legal/epl-v10.html + repo + + + + + http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_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 @@ org.aspectj aspectjrt jar - 1.9.0.RC4 + 1.9.7.M1 AspectJ runtime The runtime needed to execute a program using AspectJ http://www.aspectj.org 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 @@ org.aspectj aspectjtools jar - 1.9.0.RC4 + 1.9.7.M1 AspectJ tools Tools from the AspectJ project http://www.aspectj.org 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 @@ org.aspectj aspectjweaver jar - 1.9.0.RC4 + 1.9.7.M1 AspectJ weaver The AspectJ weaver introduces advices to java classes http://www.aspectj.org 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 docs 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 installer 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 loadtime 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 org.aspectj.ajdt.core 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 org.aspectj.matcher 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 org.eclipse.jdt.core diff --git a/pom.xml b/pom.xml index e73828d2c..5221c8037 100644 --- a/pom.xml +++ b/pom.xml @@ -5,14 +5,14 @@ 4.0.0 - 1.9.6 + 1.9.7.M1 UTF-8 org.aspectj aspectj-parent pom - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 AspectJ Parent Project 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 run-all-junit-tests 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 runtime 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 taskdefs 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 testing-client 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 testing-drivers 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 testing-util 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 testing 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 tests 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 util 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 @@ org.aspectj aspectj-parent - 1.9.7.BUILD-SNAPSHOT + 1.9.7.M1 weaver -- 2.39.5