From a1a934845e6086d43c87af993d4d99d55c974298 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Wed, 27 Jul 2016 10:32:53 -0700
Subject: [PATCH] infra changes for 1.9 builds

---
 build/build.xml                                      | 8 ++++++--
 build/usedForMavenUpload/aspectjrt.pom               | 2 +-
 build/usedForMavenUpload/aspectjtools.pom            | 2 +-
 build/usedForMavenUpload/aspectjweaver.pom           | 2 +-
 build/usedForMavenUpload_milestone/aspectjrt.pom     | 2 +-
 build/usedForMavenUpload_milestone/aspectjtools.pom  | 2 +-
 build/usedForMavenUpload_milestone/aspectjweaver.pom | 2 +-
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index bde450e4c..53816d6d6 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -275,7 +275,7 @@
 
   <target name="maven.init" >
     <property name="org.apache.maven.ant.version" value="2.0.10"/>
-<property name="org.springframework.build.aws.maven.version" value="2.0.0.RELEASE"/>
+    <property name="org.springframework.build.aws.maven.version" value="2.0.0.RELEASE"/>
 <!--
     <ivy:cachepath resolveId="maven.ant.tasks.classpath" pathid="maven.ant.tasks.classpath"
        organisation="org.apache.maven" module="com.springsource.org.apache.maven.ant"
@@ -287,6 +287,10 @@
 -->
           <maven:install-provider groupId="org.springframework.build.aws" artifactId="org.springframework.build.aws.maven"
                            version="${org.springframework.build.aws.maven.version}"/>
+<!--
+          <maven:install-provider groupId="org.springframework.build" artifactId="aws.maven"
+                           version="${org.springframework.build.aws.maven.version}"/>
+-->
   </target>
 
 
@@ -836,7 +840,7 @@ ant -propertyfile XXX publishtomaven
 
 
   <target name="publishtomaven_milestone" depends="maven.init">
-    <property name="suffix" value="1.8.0.M1"/>
+    <property name="suffix" value="1.9.0.BETA-5"/>
 
     <property name="build.root" value="/Users/aclement/gits/org.aspectj/aj-build"/>
     <property name="adjusted.release.type" value="milestone"/>
diff --git a/build/usedForMavenUpload/aspectjrt.pom b/build/usedForMavenUpload/aspectjrt.pom
index f468c4f5a..f6648dc5d 100644
--- a/build/usedForMavenUpload/aspectjrt.pom
+++ b/build/usedForMavenUpload/aspectjrt.pom
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjrt</artifactId>
   <packaging>jar</packaging>
-  <version>1.9.0.BETA-1</version>
+  <version>1.9.0.BUILD-SNAPSHOT</version>
   <name>AspectJ runtime</name>
   <description>The runtime needed to execute a program using AspectJ</description>
   <url>http://www.aspectj.org</url>
diff --git a/build/usedForMavenUpload/aspectjtools.pom b/build/usedForMavenUpload/aspectjtools.pom
index 0a7eca459..7fac698ff 100644
--- a/build/usedForMavenUpload/aspectjtools.pom
+++ b/build/usedForMavenUpload/aspectjtools.pom
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjtools</artifactId>
   <packaging>jar</packaging>
-  <version>1.9.0.BETA-1</version>
+  <version>1.9.0.BUILD-SNAPSHOT</version>
   <name>AspectJ tools</name>
   <description>Tools from the AspectJ project</description>
   <url>http://www.aspectj.org</url>
diff --git a/build/usedForMavenUpload/aspectjweaver.pom b/build/usedForMavenUpload/aspectjweaver.pom
index 391bc4d44..bf649072c 100644
--- a/build/usedForMavenUpload/aspectjweaver.pom
+++ b/build/usedForMavenUpload/aspectjweaver.pom
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjweaver</artifactId>
   <packaging>jar</packaging>
-  <version>1.9.0.BETA-1</version>
+  <version>1.9.0.BUILD-SNAPSHOT</version>
   <name>AspectJ weaver</name>
   <description>The AspectJ weaver introduces advices to java classes</description>
   <url>http://www.aspectj.org</url>
diff --git a/build/usedForMavenUpload_milestone/aspectjrt.pom b/build/usedForMavenUpload_milestone/aspectjrt.pom
index dc8bc04a8..84d7841b0 100644
--- a/build/usedForMavenUpload_milestone/aspectjrt.pom
+++ b/build/usedForMavenUpload_milestone/aspectjrt.pom
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjrt</artifactId>
   <packaging>jar</packaging>
-  <version>1.9.0.BETA-3</version>
+  <version>1.9.0.BETA-5</version>
   <name>AspectJ runtime</name>
   <description>The runtime needed to execute a program using AspectJ</description>
   <url>http://www.aspectj.org</url>
diff --git a/build/usedForMavenUpload_milestone/aspectjtools.pom b/build/usedForMavenUpload_milestone/aspectjtools.pom
index 7ba026bdc..e9c76db2c 100644
--- a/build/usedForMavenUpload_milestone/aspectjtools.pom
+++ b/build/usedForMavenUpload_milestone/aspectjtools.pom
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjtools</artifactId>
   <packaging>jar</packaging>
-  <version>1.9.0.BETA-3</version>
+  <version>1.9.0.BETA-5</version>
   <name>AspectJ tools</name>
   <description>Tools from the AspectJ project</description>
   <url>http://www.aspectj.org</url>
diff --git a/build/usedForMavenUpload_milestone/aspectjweaver.pom b/build/usedForMavenUpload_milestone/aspectjweaver.pom
index de30cbd93..2f0291de9 100644
--- a/build/usedForMavenUpload_milestone/aspectjweaver.pom
+++ b/build/usedForMavenUpload_milestone/aspectjweaver.pom
@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjweaver</artifactId>
   <packaging>jar</packaging>
-  <version>1.9.0.BETA-3</version>
+  <version>1.9.0.BETA-5</version>
   <name>AspectJ weaver</name>
   <description>The AspectJ weaver introduces advices to java classes</description>
   <url>http://www.aspectj.org</url>
-- 
2.39.5