AspectJ 1.9.6 final bits

diff --git a/.gitignore b/.gitignore
index 799d2dc2a73d104782d103ab960437f0949fa82e..09871eb4ebf7861971d944291968b2960f417659 100644 (file)
--- 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 03acbc275203cb4d4623cb400ab247312a5efd1a..4a7cbce2b85e06f008f2970e67569a58ffaa091a 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.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 5529b4e5f152e55172af903d670e0bb84e53d604..36716e51307f918fe0ac5738f4ebb6d356998cea 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.6.BUILD-SNAPSHOT</version>
+    <version>1.9.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/ajde/pom.xml b/ajde/pom.xml
index 7108c3f11be1d5f010aa1446a2733934f9fa988d..aa361cba51698efed58f354aeba8a2946d556383 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.6.BUILD-SNAPSHOT</version>
+    <version>1.9.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml
index f5046dadc36447ed07f4394387dc555776be37f8..dcf3dec1e3e35477cd50469a4ee831b4aecf229d 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.6.BUILD-SNAPSHOT</version>
+    <version>1.9.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/asm/pom.xml b/asm/pom.xml
index 6e61563a4feda6503b3ef1893394f77e3619f33d..53f0c264b740c1fdc505e04733f9ae9b004e6199 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.6.BUILD-SNAPSHOT</version>
+    <version>1.9.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index e791fa97c8de8728cf89713c50e7447d5444687e..e555d53f0d8c6fbc40559cee253f246d9a42ae7c 100644 (file)
--- 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 68918cfb7e44fa3fd65f4d7609e5d993cac49207..26e89c83aff486a2e58c99629be7cfb25819f485 100644 (file)
--- 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 bcfa35a527605eb9f37fe4b6fa252c47e0e2fa50..6c7eacc9f7ce9b2db500c5375867ec01345898cd 100644 (file)
--- 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 6d8b94e99a44d46511ba6e0883c2cb33c005ef21..d7319a687462096791f14c8e542b7635aca807cf 100644 (file)
--- 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 a975edf53ac39ecafacebd77715501e4136613f1..32f5503910bdee4cb311a4320852b8d23ba0b59d 100644 (file)
--- 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 e02445e5be2ca13e6bee7919345832f041aca00b..115fbcb080c7ceabee9e4f5a52408600dea3ff6e 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.6.BUILD-SNAPSHOT</version>
+               <version>1.9.6</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/build/pom.xml b/build/pom.xml
index 8d33484597f0865e4a2722e4bc2160e54ead9a05..0e711247681e33d6517df4d57d1f3e0f5d2deaf2 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.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 (file)
index 0000000..fef415a
--- /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 f745bce1febaf9b0d0ee2f6b79e6477ddcfb7b08..6a9e0c000786b2fd8686cc84995f277f0997555c 100644 (file)
--- 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 50526540a9818b3ac72f07a54309f9f572219fed..5802ba20832ee67626b8bed8bd10f201683b535e 100644 (file)
--- 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 d9d49848f46f3325194194efb81ba0692e52ee50..9c15d271226862e32b476791faf6140cc2ff3730 100644 (file)
--- 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 6d47a926c4619cdcbf99c54240fd5f1162b4e6a9..e85348867ed3f871b4aa1e1ab398ef346cf3fe48 100644 (file)
--- 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 ce5aad9a6f761febcdccb989b248981c685d2ef1..5dad05d701a54b8124820af4ad1a064b7fc9dff3 100644 (file)
--- 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 0bbb7da4e9638ba19d6cb33680aa8d70d8053f0b..6c3aa33c1fd12633f6791848ae584803678e0cb4 100644 (file)
--- 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 ef1ad25395a9becfa811b52649b25ffba78ec544..0fc51c37dc6eff6eae782c4d10e44ff5cfaccdae 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.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 1d36af96045a6fb5f37d61e3698ad6d9f2a4e877..e0bef4ef16717628b18129059d1399aa3c4c823f 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.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 cfff5ce949f521278cda51f0eaf95bbfb110fbca..99f245684bc55a3e7e25cd06a93009bac50bdf99 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.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 a4798a2b466c83972c162ba70975ed229fb49ec6..b19e05a8652d29fd4fa48be68bd9f40ed7a5617e 100644 (file)
--- 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>

diff --git a/pom.xml b/pom.xml
index 32e00bfb4f545449bd9696424d82c80eb9a92800..e8ac6c0112e809010dc8f0ca34c984d587c8ad3a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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 b84bdcf3c4eb8dd6c9334b96c3c87e6b38a5836b..5986fef32de0cb8d8ec2a0b1e3bfb1c5ea60412b 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.6.BUILD-SNAPSHOT</version>
+               <version>1.9.6</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 81beb04081b6776ba9dfe44db8287c40a28d2110..d34c61d7c54665ca752cec68654f0cb9f40adef7 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.6.BUILD-SNAPSHOT</version>
+               <version>1.9.6</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml
index 98b9ae8ddd322613f2bcf06df2cbc190f7e92441..f0f777d143d8a63d3de208cfa5dee729329a681b 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.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 4eacf144fc164c811506de3eb87fee8b9977b70c..cd3dace96790d93c9aded48b238b1fca623c0e8e 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.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 3837324162d1f3fc3e2975fb2b556a579995f03f..dde1cd11afaa40689e7fd0ae50218d02d93646e8 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.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 c1da23789497ec07725849a5ffe0e7225c099da3..b0b16fc26388859e761842c34d8cd4b996849088 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.6.BUILD-SNAPSHOT</version>
+    <version>1.9.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/testing/pom.xml b/testing/pom.xml
index 03f77f9953fa46a578147a8be4055cc5160fbafe..64f1a73f5599e7bbf9d762e89b2362b45643c1a6 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.6.BUILD-SNAPSHOT</version>
+    <version>1.9.6</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/tests/pom.xml b/tests/pom.xml
index 6a8cbaf5024cd722b08c75034a5a863c6896ad72..30841303bc305590420b9777bcab33fa894da9e4 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.6.BUILD-SNAPSHOT</version>
+               <version>1.9.6</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/util/pom.xml b/util/pom.xml
index 266612176bd7a0949b4c7d692e85c3a89e5e06ad..df104d6cf1d34775c741fcb6f0eba4c66e33163e 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.6.BUILD-SNAPSHOT</version>
+    <version>1.9.6</version>
   </parent>
 
   <artifactId>util</artifactId>

diff --git a/weaver/pom.xml b/weaver/pom.xml
index a3104152ea8f8f925ba7889f353b6c7731ebcb5e..8ec6dc774db74bd7b553ca0c06152534eaa8ed4a 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.6.BUILD-SNAPSHOT</version>
+    <version>1.9.6</version>
     <relativePath>..</relativePath>
   </parent>