From 2749becd6c1e3977ffae25afe2dca142a3d0b2d8 Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <corneil.du-plessis@broadcom.com>
Date: Wed, 27 Nov 2024 15:34:02 +0200
Subject: [PATCH] Ensure release train version is applied correctly in update.

---
 .../stream-applications-descriptor/pom.xml        |  2 --
 .../stream-applications-docs/pom.xml              |  2 --
 update-project-version.sh                         | 15 +++++++--------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/stream-applications-release-train/stream-applications-descriptor/pom.xml b/stream-applications-release-train/stream-applications-descriptor/pom.xml
index 98bb74a2..f039fea6 100644
--- a/stream-applications-release-train/stream-applications-descriptor/pom.xml
+++ b/stream-applications-release-train/stream-applications-descriptor/pom.xml
@@ -8,10 +8,8 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>stream-applications-descriptor</artifactId>
     <name>stream-applications-descriptor</name>
-    <version>2022.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
         <uniqueVersion>false</uniqueVersion>
diff --git a/stream-applications-release-train/stream-applications-docs/pom.xml b/stream-applications-release-train/stream-applications-docs/pom.xml
index 15562d29..de622a48 100644
--- a/stream-applications-release-train/stream-applications-docs/pom.xml
+++ b/stream-applications-release-train/stream-applications-docs/pom.xml
@@ -2,7 +2,6 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
         <artifactId>stream-applications-release-train</artifactId>
@@ -12,7 +11,6 @@
     <artifactId>stream-applications-docs</artifactId>
     <name>stream-applications-docs</name>
     <description>Stream Apps Docs</description>
-    <version>2022.0.1-SNAPSHOT</version>
     <properties>
         <docs.resources.version>0.2.5</docs.resources.version>
         <rootDir>${basedir}/../..</rootDir>
diff --git a/update-project-version.sh b/update-project-version.sh
index 73177deb..a7d0bf20 100755
--- a/update-project-version.sh
+++ b/update-project-version.sh
@@ -11,8 +11,8 @@ function find_version() {
     done
     echo $VER
 }
-./mvnw clean install -DskipTests -T 1C
-./mvnw clean -T 1C
+./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true -T 1C -ntp
+./mvnw clean -T 1C -ntp
 NEW_VERSION=$1
 RELEASE_TRAIN_VERSION=$2
 OLD_VERSION=$($SCDIR/mvnw help:evaluate -Dexpression=project.version -q -DforceStdout 2> /dev/null)
@@ -31,9 +31,6 @@ $SCDIR/mvnw versions:set -f stream-applications-build \
   -DoldVersion="$OLD_VERSION" -DnewVersion="$NEW_VERSION" -DprocessAllModules=false
 $SCDIR/mvnw install -DskipResolution=true -pl :stream-applications-build -DskipTests -T 1C
 
-$SCDIR/mvnw versions:set -f functions/function-dependencies \
-  -s .settings.xml -DgenerateBackupPoms=false -Dartifactory.publish.artifacts=false -B $VERBOSE \
-  -DoldVersion="$OLD_VERSION" -DnewVersion="$NEW_VERSION" -DprocessAllModules=false
 $SCDIR/mvnw install -DskipResolution=true -pl :function-dependencies -DskipTests -T 1C
 
 $SCDIR/mvnw versions:set \
@@ -56,10 +53,12 @@ OLD_RT_VERSION=$($SCDIR/mvnw help:evaluate -DskipResolution=true  -Dexpression=p
 OLD_RT_VERSION=$(find_version "$OLD_RT_VERSION")
 echo "Release Train Version: [$OLD_RT_VERSION] -> [$RELEASE_TRAIN_VERSION]"
 echo "Update versions for stream-applications-release-train -> $RELEASE_TRAIN_VERSION"
-$SCDIR/mvnw versions:set -f ./stream-applications-release-train \
-  -DskipResolution=true  -s .settings.xml -DgenerateBackupPoms=false -Dartifactory.publish.artifacts=false -B $VERBOSE \
+
+$SCDIR/mvnw versions:set -pl ":stream-applications-release-train,:stream-applications-descriptor,:stream-applications-docs" \
+  -s .settings.xml -DgenerateBackupPoms=false -Dartifactory.publish.artifacts=false -B $VERBOSE \
   -DoldVersion="$OLD_RT_VERSION" -DnewVersion="$RELEASE_TRAIN_VERSION"
 
+
 FOUND_VERSION=$($SCDIR/mvnw help:evaluate -Dexpression=project.version -q -DforceStdout 2> /dev/null)
 FOUND_VERSION=$(find_version "$FOUND_VERSION")
 if [ "$NEW_VERSION" != "$FOUND_VERSION" ]; then
@@ -69,7 +68,7 @@ fi
 echo "Version updated: stream-applications: $FOUND_VERSION"
 PROJECTS="stream-applications-release-train stream-applications-descriptor stream-applications-docs"
 for proj in $PROJECTS; do
-  NEW_RT_VERSION=$($SCDIR/mvnw help:evaluate -Dexpression=project.version -q -DforceStdout -pl :$proj 2> /dev/null)
+  NEW_RT_VERSION=$($SCDIR/mvnw help:evaluate -Dexpression=project.version -q -DforceStdout -pl ":$proj" 2> /dev/null)
   NEW_RT_VERSION=$(find_version "$NEW_RT_VERSION")
   if [ "$NEW_RT_VERSION" != "$RELEASE_TRAIN_VERSION" ]; then
     echo "Expected $proj version to be $RELEASE_TRAIN_VERSION not $NEW_RT_VERSION"