1 files changed, 23 insertions, 8 deletions
diff --git a/build/build.xml b/build/build.xml
index eeb019c33..573908871 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -797,40 +797,55 @@ To use testing client jar in tests,
 ant -propertyfile XXX publishtomaven
 -->
   <target name="publishtomaven_snapshot" depends="maven.init">
-    <property name="build.root" value="/Users/aclement/gits/org.aspectj/aj-build"/>
+    <property name="build.root" value="/Users/aclement/gits/org.aspectj"/>
+
 
     <property name="adjusted.release.type" value="snapshot"/>
     <property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/>
+<!--
+    <property name="maven.central.repository" value="https://repo.spring.io/libs-snapshot-local/org/aspectj/aspectjweaver"/>
+-->
+
+<!-- aspectjtools/target/aspectjtools-1.9.6.BUILD-SNAPSHOT.jar -->
 
     <property name="bin.jars.folder" value="${build.root}/dist/tools/lib"/>
     <property name="src.jars.folder" value="${build.root}/src"/>
-    <property name="suffix" value="DEVELOPMENT"/>
+    <property name="suffix" value="1.9.6.BUILD-SNAPSHOT"/>
 
     <!-- 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/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/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/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/aspectjmatcher.pom"/>
+      <attach file="${build.root}/aspectjmatcher/target/aspectjmatcher-${suffix}-sources.jar" classifier="sources"/>
     </maven:deploy>
 
   </target>