diff --git a/applications/stream-applications-build/pom.xml b/applications/stream-applications-build/pom.xml
index f70ff5d1..32435eeb 100644
--- a/applications/stream-applications-build/pom.xml
+++ b/applications/stream-applications-build/pom.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
stream-applications-build
- 2020.0.0-SNAPSHOT
+ 2020.0.0-M1
pom
@@ -19,55 +19,56 @@
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
- 3.0.0-SNAPSHOT
+ 3.0.0-M1
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
+ ${apps.version}
diff --git a/applications/stream-applications-build/stream-applications-descriptor/pom.xml b/applications/stream-applications-build/stream-applications-descriptor/pom.xml
index e9cf5a6d..5e2847f7 100644
--- a/applications/stream-applications-build/stream-applications-descriptor/pom.xml
+++ b/applications/stream-applications-build/stream-applications-descriptor/pom.xml
@@ -3,7 +3,7 @@
stream-applications-build
org.springframework.cloud.stream.app
- 2020.0.0-SNAPSHOT
+ 2020.0.0-M1
4.0.0
diff --git a/applications/stream-applications-build/stream-applications-docs/pom.xml b/applications/stream-applications-build/stream-applications-docs/pom.xml
index 174c04a1..6688915b 100644
--- a/applications/stream-applications-build/stream-applications-docs/pom.xml
+++ b/applications/stream-applications-build/stream-applications-docs/pom.xml
@@ -7,7 +7,7 @@
org.springframework.cloud.stream.app
stream-applications-build
- 2020.0.0-SNAPSHOT
+ 2020.0.0-M1
diff --git a/etc/release-tools/aggregate-upgrade-dryrun.sh b/etc/release-tools/aggregate-upgrade-dryrun.sh
index a59e2095..3f0903c1 100755
--- a/etc/release-tools/aggregate-upgrade-dryrun.sh
+++ b/etc/release-tools/aggregate-upgrade-dryrun.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-if [ "$#" -ne 2 ]; then
- echo "Please specify the release and core parent versions"
+if [ "$#" -ne 3 ]; then
+ echo "Please specify the release, core parent and apps versions"
exit
fi
@@ -11,6 +11,10 @@ VERSION=$1
./mvnw -f applications/stream-applications-build versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false
./mvnw -f applications/stream-applications-build versions:update-parent -DparentVersion=$2 -Pspring -DgenerateBackupPoms=false
+cd applications/stream-applications-build
+sed -i '' 's/.*/'"$2"'<\/apps.version>/g' pom.xml
+cd -
+
if [[ $VERSION =~ M[0-9]|RC[0-9] ]]; then
lines=$(find applications/stream-applications-build -type f -name pom.xml | xargs grep SNAPSHOT | grep -v ".contains(" | grep -v regex | wc -l)
if [ $lines -eq 0 ]; then
diff --git a/etc/release-tools/aggregate-upgrade.sh b/etc/release-tools/aggregate-upgrade.sh
index 1d1782d3..fb11c375 100755
--- a/etc/release-tools/aggregate-upgrade.sh
+++ b/etc/release-tools/aggregate-upgrade.sh
@@ -1,19 +1,25 @@
#!/bin/bash
-if [ "$#" -ne 2 ]; then
- echo "Please specify the release and core parent versions"
+if [ "$#" -ne 3 ]; then
+ echo "Please specify the release, core parent and apps versions"
exit
fi
+VERSION=$1
+
function git_commit_push {
echo "in git commit"
- git commit -am"Aggregating docs/descriptors : Release - $1"
- git push origin master
+ git commit -am"Aggregating docs/descriptors : Release - $VERSION"
+ git push origin master && git push upstream master
}
pushd ../..
-VERSION=$1
+
+cd applications/stream-applications-build
+sed -i '' 's/.*/'"$2"'<\/apps.version>/g' pom.xml
+cd -
+
./mvnw -f applications/stream-applications-build versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false
./mvnw -f applications/stream-applications-build versions:update-parent -DparentVersion=$2 -Pspring -DgenerateBackupPoms=false