Save previous version and use in migration tool (#6057)

Author: davidh44

buildspecs/update-master-from-release.yml

@@ -20,6 +20,7 @@ phases:
     - echo 'For debugging, running version command without -q'
     - mvn -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec
     - RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
+    - PREVIOUS_VERSION=$(mvn help:evaluate -Dexpression=awsjavasdk.previous.version -q -DforceStdout)
     - echo "Release version - $RELEASE_VERSION"
     -
     - MAJOR=$(echo $RELEASE_VERSION | cut -d'.' -f1)
@@ -39,6 +40,7 @@ phases:
 
         mvn versions:set -DnewVersion=$NEW_VERSION_SNAPSHOT -DgenerateBackupPoms=false -DprocessAllModules=true || { echo "Failed to update POMs to next snapshot version"; exit 1; }
         sed -i -E "s/(<version>).+(<\/version>)/\1$RELEASE_VERSION\2/" README.md
+        sed -i -E "s/(<awsjavasdk.previous-previous.version>).+(<\/awsjavasdk.previous-previous.version>)/\1$PREVIOUS_VERSION\2/" pom.xml
         sed -i -E "s/(<awsjavasdk.previous.version>).+(<\/awsjavasdk.previous.version>)/\1$RELEASE_VERSION\2/" pom.xml
       
         git commit -am "Update to next snapshot version: $NEW_VERSION_SNAPSHOT"

pom.xml

@@ -102,6 +102,7 @@
     <properties>
         <awsjavasdk.version>${project.version}</awsjavasdk.version>
         <awsjavasdk.previous.version>2.31.29</awsjavasdk.previous.version>
+        <awsjavasdk.previous-previous.version>2.31.28</awsjavasdk.previous-previous.version>
         <jackson.version>2.15.2</jackson.version>
         <jackson.databind.version>2.15.2</jackson.databind.version>
         <jacksonjr.version>2.17.3</jacksonjr.version>

test/test-utils/src/main/java/software/amazon/awssdk/testutils/SdkVersionUtils.java

@@ -33,14 +33,14 @@ private SdkVersionUtils() {
     public static String getSdkPreviousReleaseVersion(Path pomFile) throws IOException {
         Optional<String> versionString =
             Files.readAllLines(pomFile)
-                 .stream().filter(l -> l.contains("<awsjavasdk.previous.version>")).findFirst();
+                 .stream().filter(l -> l.contains("<awsjavasdk.previous-previous.version>")).findFirst();
 
         if (!versionString.isPresent()) {
             throw new AssertionError("No version is found");
         }
 
         String string = versionString.get().trim();
-        String substring = string.substring(29, string.indexOf('/') - 1);
+        String substring = string.substring(38, string.indexOf('/') - 1);
         return substring;
     }
 

v2-migration/pom.xml

@@ -312,7 +312,7 @@
                     <velocitySources>src/main/resources/recipe-vm-templates</velocitySources>
                     <resourcesOutputDirectory>${project.build.directory}/classes/META-INF/rewrite</resourcesOutputDirectory>
                     <properties>
-                        <sdkVersion>${awsjavasdk.previous.version}</sdkVersion>
+                        <sdkVersion>${awsjavasdk.previous-previous.version}</sdkVersion>
                     </properties>
                 </configuration>
             </plugin>

v2-migration/src/main/resources/scripts/utils.py

@@ -23,10 +23,10 @@
 
 def find_sdk_version():
     pom = open(os.path.join(PROJECT_DIR, "pom.xml"), 'r')
-    reg = re.compile("<awsjavasdk.previous.version>.+")
+    reg = re.compile("<awsjavasdk.previous-previous.version>.+")
     version = re.search(reg, pom.read())
     versionStr = version.group(0)
-    return versionStr[29:-30]
+    return versionStr[38:-39]
 
 
 def load_module_mappings(filename):

v2-migration/src/test/java/software/amazon/awssdk/v2migration/UpgradeSdkDependenciesTest.java

@@ -79,14 +79,14 @@ private static String getVersion() throws IOException {
         Path pomFile = root.resolve("pom.xml");
         Optional<String> versionString =
             Files.readAllLines(pomFile)
-                 .stream().filter(l -> l.contains("<awsjavasdk.previous.version>")).findFirst();
+                 .stream().filter(l -> l.contains("<awsjavasdk.previous-previous.version>")).findFirst();
 
         if (!versionString.isPresent()) {
             throw new AssertionError("No version is found");
         }
 
         String string = versionString.get().trim();
-        String substring = string.substring(29, string.indexOf('/') - 1);
+        String substring = string.substring(38, string.indexOf('/') - 1);
         return substring;
     }