]> source.dussan.org Git - aspectj.git/commitdiff
1.9.7 milestone 1 published
authorAndy Clement <aclement@pivotal.io>
Fri, 21 Aug 2020 19:16:30 +0000 (12:16 -0700)
committerAndy Clement <aclement@pivotal.io>
Fri, 21 Aug 2020 19:16:30 +0000 (12:16 -0700)
34 files changed:
ajbrowser/pom.xml
ajde.core/pom.xml
ajde/pom.xml
ajdoc/pom.xml
asm/pom.xml
aspectjmatcher/pom.xml
aspectjrt/pom.xml
aspectjtools/pom.xml
aspectjweaver/pom.xml
bcel-builder/pom.xml
bridge/pom.xml
build/build.xml
build/pom.xml
build/usedForMavenUpload_milestone/aspectjmatcher.pom [new file with mode: 0644]
build/usedForMavenUpload_milestone/aspectjrt.pom
build/usedForMavenUpload_milestone/aspectjtools.pom
build/usedForMavenUpload_milestone/aspectjweaver.pom
docs/pom.xml
installer/pom.xml
loadtime/pom.xml
org.aspectj.ajdt.core/pom.xml
org.aspectj.matcher/pom.xml
org.eclipse.jdt.core/pom.xml
pom.xml
run-all-junit-tests/pom.xml
runtime/pom.xml
taskdefs/pom.xml
testing-client/pom.xml
testing-drivers/pom.xml
testing-util/pom.xml
testing/pom.xml
tests/pom.xml
util/pom.xml
weaver/pom.xml

index 009bc2f77aedc1085dc477a45c6c7fcac1af784d..413b6e803bb415b8e69ecabf1693c8728610ec15 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>ajbrowser</artifactId>
index d155339159eb34e3b499387f5d5c6bcc275cd34e..1d9ee7fce8ab87dc55bb55954a8f24e914ab6b44 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>ajde.core</artifactId>
index 3a42b7e801a8caf53bdddc5d07371b1b98b7ab57..7f7825c56f9d5fb6128cdf67bd84edc11b95a82e 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>ajde</artifactId>
index fa24692c9ea71e29016949e6dda92b8779f24abf..f4a0fb609e8aca1f617252fb54afd7975b689c4a 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>ajdoc</artifactId>
index 9032d6b1fc5665f02ed2f93c6eada57e98a03cf8..6e6497c2c00d16af99794e03633a20d11a65143f 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>asm</artifactId>
index 296504a0ed2b22359fe31af341168b0897d07558..f4922a87849e0185219cd0bbdc741514d967d7e7 100644 (file)
@@ -7,7 +7,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-               <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.M1</version>
        </parent>
 
        <artifactId>aspectjmatcher</artifactId>
index 9f721aed5fcba48caf2d17a23506b6580321993e..6b324b6bace5b07966871f1fa6bc053c5291122d 100644 (file)
@@ -7,7 +7,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-               <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.M1</version>
        </parent>
 
        <artifactId>aspectjrt</artifactId>
index 56453245ffeeec2aa571c8acbcab081534a5747b..1b285f4d4e67cf91783a37cf8e38ca3da10a5ccb 100644 (file)
@@ -7,7 +7,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-               <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.M1</version>
        </parent>
 
        <artifactId>aspectjtools</artifactId>
index 481a2a7400ac19f3de95699822c9b72b61a09c77..d4705f184a5ec43b8bce975b01cc927bbb12cd24 100644 (file)
@@ -7,7 +7,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-               <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.M1</version>
        </parent>
 
        <artifactId>aspectjweaver</artifactId>
index fde8b9f05d057b47eaa21cc26401fd2963e5bf9f..f4bf8f874a720f973dc3ba7127b7e553b59acb3d 100644 (file)
@@ -12,7 +12,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
        </parent>
 
 </project>
index eae496e79978c4bead683a968bf4f8487a5879d0..d23314a652b463291e1b910bd8283a0e463b1269 100644 (file)
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-               <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.M1</version>
        </parent>
 
        <artifactId>bridge</artifactId>
index 5739088711244ced332b9e357afb5b4b2d8c03c3..013f32610df58e4d12af8e49ea01045c44418a17 100644 (file)
@@ -855,40 +855,50 @@ ant -propertyfile XXX publishtomaven
 
 
   <target name="publishtomaven_milestone" depends="maven.init">
-    <property name="suffix" value="1.9.0.BETA-6"/>
-
-    <property name="build.root" value="/Users/aclement/gits/org.aspectj/aj-build"/>
+    <property name="build.root" value="/Users/aclement/gits/org.aspectj"/>
+    <property name="suffix" value="1.9.7.M1"/>
+       
     <property name="adjusted.release.type" value="milestone"/>
     <property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/>
     <property name="bin.jars.folder" value="${build.root}/dist/tools/lib"/>
     <property name="src.jars.folder" value="${build.root}/src"/>
 
     <!-- ASPECTJRT -->
-    <maven:deploy file="${bin.jars.folder}/aspectjrt.jar">
+    <maven:deploy file="${build.root}/aspectjrt/target/aspectjrt-${suffix}.jar">
       <remoteRepository url="${maven.central.repository}">
         <authentication username="${accessKey}" passphrase="${secretKey}"/>
       </remoteRepository>
       <pom file="usedForMavenUpload_milestone/aspectjrt.pom"/>
-      <attach file="${src.jars.folder}/aspectjrt${suffix}-src.jar" classifier="sources"/>
+      <attach file="${build.root}/aspectjrt/target/aspectjrt-${suffix}-sources.jar" classifier="sources"/>
     </maven:deploy>
 
     <!-- ASPECTJTOOLS -->
-    <maven:deploy file="${bin.jars.folder}/aspectjtools.jar">
+    <maven:deploy file="${build.root}/aspectjtools/target/aspectjtools-${suffix}.jar">
       <remoteRepository url="${maven.central.repository}">
         <authentication username="${accessKey}" passphrase="${secretKey}"/>
       </remoteRepository>
       <pom file="usedForMavenUpload_milestone/aspectjtools.pom"/>
-      <attach file="${src.jars.folder}/aspectjtools${suffix}-src.jar" classifier="sources"/>
+      <attach file="${build.root}/aspectjtools/target/aspectjtools-${suffix}-sources.jar" classifier="sources"/>
     </maven:deploy>
 
     <!-- ASPECTJWEAVER -->
-    <maven:deploy file="${bin.jars.folder}/aspectjweaver.jar">
+    <maven:deploy file="${build.root}/aspectjweaver/target/aspectjweaver-${suffix}.jar">
       <remoteRepository url="${maven.central.repository}">
         <authentication username="${accessKey}" passphrase="${secretKey}"/>
       </remoteRepository>
       <pom file="usedForMavenUpload_milestone/aspectjweaver.pom"/>
-      <attach file="${src.jars.folder}/aspectjweaver${suffix}-src.jar" classifier="sources"/>
+      <attach file="${build.root}/aspectjweaver/target/aspectjweaver-${suffix}-sources.jar" classifier="sources"/>
+    </maven:deploy>
+               
+    <!-- ASPECTJMATCHER -->
+    <maven:deploy file="${build.root}/aspectjmatcher/target/aspectjmatcher-${suffix}.jar">
+      <remoteRepository url="${maven.central.repository}">
+        <authentication username="${accessKey}" passphrase="${secretKey}"/>
+      </remoteRepository>
+      <pom file="usedForMavenUpload_milestone/aspectjmatcher.pom"/>
+      <attach file="${build.root}/aspectjmatcher/target/aspectjmatcher-${suffix}-sources.jar" classifier="sources"/>
     </maven:deploy>
+
   </target>
 
   <target name="publishtomaven_release" depends="maven.init">
index f486bb1d5b76e94a725c46817ac3746c38e732d2..eb7d2d4f4479abf0c2e96b11b100722091cae976 100644 (file)
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-               <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.M1</version>
        </parent>
 
        <artifactId>build</artifactId>
diff --git a/build/usedForMavenUpload_milestone/aspectjmatcher.pom b/build/usedForMavenUpload_milestone/aspectjmatcher.pom
new file mode 100644 (file)
index 0000000..d57047b
--- /dev/null
@@ -0,0 +1,25 @@
+<?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>1.9.7.M1</version>
+  <name>AspectJ matcher</name>
+  <description>The AspectJ matcher can be used for matching pointcuts</description>
+  <url>http://www.aspectj.org</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>
+
+  <scm>
+    <url>http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/?root=Tools_Project</url>
+  </scm>
+
+</project>
index 4fafffc639d311f4362e81324ec27fe008aacb02..79175e87dec36de1c0163f5b15ccf04824a3b151 100644 (file)
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjrt</artifactId>
   <packaging>jar</packaging>
-  <version>1.9.0.RC4</version>
+  <version>1.9.7.M1</version>
   <name>AspectJ runtime</name>
   <description>The runtime needed to execute a program using AspectJ</description>
   <url>http://www.aspectj.org</url>
index 7ad6b32ce540dad0e1ec1c89754554cdb99637f7..d3ade9c4d3c48915aefe582f2d717b83f28a11c8 100644 (file)
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjtools</artifactId>
   <packaging>jar</packaging>
-  <version>1.9.0.RC4</version>
+  <version>1.9.7.M1</version>
   <name>AspectJ tools</name>
   <description>Tools from the AspectJ project</description>
   <url>http://www.aspectj.org</url>
index 9567196ad679b9dc1030079754ec2a6228591e00..5dddf2c9ce9dcf17720d845f528574c0c47d1dc0 100644 (file)
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjweaver</artifactId>
   <packaging>jar</packaging>
-  <version>1.9.0.RC4</version>
+  <version>1.9.7.M1</version>
   <name>AspectJ weaver</name>
   <description>The AspectJ weaver introduces advices to java classes</description>
   <url>http://www.aspectj.org</url>
index 1f707646f12e8edfe619ff8097401ed947c9ddce..c351d817d2ca6ba21c635235b813d302c8c05e5c 100644 (file)
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-               <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.M1</version>
        </parent>
 
        <artifactId>docs</artifactId>
index 527be9ab5a0c1e72eb3ade2c400e412c73cdb585..3aaa0d481c1605cf995b8e758466355040906093 100644 (file)
@@ -7,7 +7,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-               <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.M1</version>
        </parent>
 
        <artifactId>installer</artifactId>
index 91a850ef7e93455617e411ad84f48f74e774d5c3..54afbbdf9076e391f4c41b667dee5fc83d08c4a9 100644 (file)
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-               <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.M1</version>
        </parent>
 
        <artifactId>loadtime</artifactId>
index ec800b1dab0a5a2c0f7a397fbfd9640dfe5df28a..259891766b81882e364cc0d319d3f2cac51cfc71 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>org.aspectj.ajdt.core</artifactId>
index 2af08194935cb14505142b53c0d40f969e4f177e..3b1e535302b5fbafaa3e709ebbb6fbe158ead47a 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>org.aspectj.matcher</artifactId>
index f6cae4e570c46b217240ab29326110873f720e65..64139af824beb4156a6fc2eadd50b8bbd72a6131 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>org.eclipse.jdt.core</artifactId>
diff --git a/pom.xml b/pom.xml
index e73828d2cb81082f1ac4eafae3de36543665655c..5221c8037a66f9d4b3dd0d46e0a9c444e46b18f2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,14 +5,14 @@
        <modelVersion>4.0.0</modelVersion>
 
        <properties>
-               <revision>1.9.6</revision>
+               <revision>1.9.7.M1</revision>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
 
        <groupId>org.aspectj</groupId>
        <artifactId>aspectj-parent</artifactId>
        <packaging>pom</packaging>
-       <version>1.9.7.BUILD-SNAPSHOT</version>
+       <version>1.9.7.M1</version>
        <name>AspectJ Parent Project</name>
 
        <modules>
index 97347e3eb8846c4758411577c84ad2deadec1483..c560ab9d8ad94b24318fbaea3ccc7c260014de3a 100644 (file)
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-               <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.M1</version>
        </parent>
 
        <artifactId>run-all-junit-tests</artifactId>
index 554f74a627c7b47341ed30aa813b6b815ab3dd79..9de47a14fa411ce4cd1f137ce19b7cc606683a45 100644 (file)
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-               <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.M1</version>
        </parent>
 
        <artifactId>runtime</artifactId>
index b686fa663e763503ee258f7b3e0b42d283150273..b9da0a520bd341d0c9d37ea50d9c656ce6d4e275 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>taskdefs</artifactId>
index 0409be08bf4d068064dd8cacc0a61cc138a817a2..40f22ef47b8e18e8c29a1b0571c8082cd1c056b3 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>testing-client</artifactId>
index d5542cca2a5ce68e6ffbdb46e0b64f5fe4da37a4..7ce84cd0075ef353a3ea4623e9f60ccdafd570b8 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>testing-drivers</artifactId>
index 8e5262fd6024c9e16c6e0b5ccdce7a51834e129f..c76e5ea99c0fc966579509f4932d6a77a4253513 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>testing-util</artifactId>
index d0c20be2471dd8f45b8005e91fb42fa01e5a7238..5108c6365ed9b4d072d319b0fcfd9f7a4ad08ba2 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>testing</artifactId>
index 9b59abd2e75c42b39343cd1fcb8c4d4149fc7607..4c09f056dd97267c70593f8e06d29a16142e8bde 100644 (file)
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.aspectj</groupId>
                <artifactId>aspectj-parent</artifactId>
-               <version>1.9.7.BUILD-SNAPSHOT</version>
+               <version>1.9.7.M1</version>
        </parent>
 
        <artifactId>tests</artifactId>
index 1b92b298b25cc1deae4b1f92c6b43ed3787d0f97..55d5182291763a0b31c5a57f771ef2d627115a11 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>util</artifactId>
index 4cc59bdfb0a3cf5523548eadd57f46250423af59..d18205878d0ead1cd1db50e5e937b9fd8476c0f5 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.aspectj</groupId>
     <artifactId>aspectj-parent</artifactId>
-    <version>1.9.7.BUILD-SNAPSHOT</version>
+    <version>1.9.7.M1</version>
   </parent>
 
   <artifactId>weaver</artifactId>