From 99f1df6dc8cd4ecbe99bb7950cac570d6efe025c Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Sat, 20 Nov 2021 14:17:47 +0100
Subject: [PATCH] Minor 1.9.7 to 1.9.8 version bumps in docs and Ant script

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---
 build/build.xml           |  7 +++----
 docs/developer/RELEASE.md | 16 ++++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 1ea2f5aa7..f5a6eef8f 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -806,11 +806,11 @@ ant -propertyfile XXX publishtomaven
     <property name="maven.central.repository" value="https://repo.spring.io/libs-snapshot-local/org/aspectj/aspectjweaver"/>
 -->
 
-<!-- aspectjtools/target/aspectjtools-1.9.7-SNAPSHOT.jar -->
+<!-- aspectjtools/target/aspectjtools-1.9.8-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="1.9.7-SNAPSHOT"/>
+    <property name="suffix" value="1.9.8-SNAPSHOT"/>
 
     <!-- ASPECTJRT -->
     <maven:deploy file="${build.root}/aspectjrt/target/aspectjrt-${suffix}.jar">
@@ -856,7 +856,7 @@ ant -propertyfile XXX publishtomaven
 
   <target name="publishtomaven_milestone" depends="maven.init">
     <property name="build.root" value="/Users/aclement/gits/org.aspectj"/>
-    <property name="suffix" value="1.9.7.M1"/>
+    <property name="suffix" value="1.9.8.M1"/>
 
     <property name="adjusted.release.type" value="milestone"/>
     <property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/>
@@ -985,4 +985,3 @@ ant -propertyfile XXX publishtomaven
 
 
 </project>
-
diff --git a/docs/developer/RELEASE.md b/docs/developer/RELEASE.md
index 7c8b04d9f..ed06f6932 100644
--- a/docs/developer/RELEASE.md
+++ b/docs/developer/RELEASE.md
@@ -27,7 +27,7 @@ To publish a snapshot, set up your credentials in `~/.m2/settings.xml` something
 </settings>
 ```
 
-Assuming that you are currently working on version 1.9.7-SNAPSHOT, you simply call:
+Assuming that you are currently working on version 1.9.8-SNAPSHOT, you simply call:
 
 ```shell
 mvn clean deploy 
@@ -86,7 +86,7 @@ java -version
 git status
 
 # Set release version in all POMs
-mvn versions:set -DnewVersion=1.9.7.M2
+mvn versions:set -DnewVersion=1.9.8.M2
 
 # Verify if the POM changes are OK, then remove the POM backup files
 mvn versions:commit
@@ -118,19 +118,19 @@ Before we release the staging repository though, we want to commit and tag the r
 ```shell
 # Commit the release POMs to Git (better do this from your IDE, verifying the
 # changes before staging them for Git commit)
-git commit -am "Set version to 1.9.7.M2"
+git commit -am "Set version to 1.9.8.M2"
 
 # Tag release
 git tag V1_9_7_M2
 
 # Set new snapshot version, increasing the version number after a final release
-mvn versions:set -DnewVersion=1.9.7-SNAPSHOT
+mvn versions:set -DnewVersion=1.9.8-SNAPSHOT
 
 # Verify if the POM changes are OK, then remove the POM backup files
 mvn versions:commit
 
 # Commit the snapshot POMs to Git
-git commit -am "Set version to 1.9.7-SNAPSHOT"
+git commit -am "Set version to 1.9.8-SNAPSHOT"
 
 # Push the previous commits to GitHub
 git push origin
@@ -156,7 +156,7 @@ to Maven Central:
 # repositories there are.
 mvn nexus-staging:rc-list
 # [INFO] ID                   State    Description
-# [INFO] orgaspectj-1106      CLOSED   org.aspectj:aspectjrt:1.9.7.M2
+# [INFO] orgaspectj-1106      CLOSED   org.aspectj:aspectjrt:1.9.8.M2
 
 # Use the ID of the corresponding CLOSED staging repository for releasing to
 # Maven Central
@@ -164,8 +164,8 @@ mvn nexus-staging:rc-release -DstagingRepositoryId=orgaspectj-1106
 ```
 
 Tadaa! We have performed an AspectJ release. In a few minutes, the artifacts should appear on Maven Central somewhere
-under https://repo1.maven.org/maven2/org/aspectj/, e.g. AspectJ Tools 1.9.7.M2 would appear under
-https://repo1.maven.org/maven2/org/aspectj/aspectjtools/1.9.7.M2/. As soon as you see the artifacts there instead of
+under https://repo1.maven.org/maven2/org/aspectj/, e.g. AspectJ Tools 1.9.8.M2 would appear under
+https://repo1.maven.org/maven2/org/aspectj/aspectjtools/1.9.8.M2/. As soon as you see the artifacts there instead of
 "404 not found", you can announce release availability on the AspectJ mailing list and wherever else appropriate.
 
 Finally, you probably want to publish the AspectJ installer (`installer/target/aspectj-[VERSION].jar`), e.g. by creating a
-- 
2.39.5