diff --git a/make-release.sh b/make-release.sh index 4b4c45c50e..e4515acf25 100755 --- a/make-release.sh +++ b/make-release.sh @@ -373,12 +373,20 @@ bumpVersion() { if [[ $RELEASE_CHE_PARENT = "true" ]]; then mvn versions:update-parent -DgenerateBackupPoms=false -DallowSnapshots=true -DparentVersion=[${VERSION_CHE_PARENT}] fi + + # compute current version of root pom + current_root_pom_version=$(grep "" pom.xml | sed -r -e "s#.+([^<>]+).*#\1#") + mvn versions:set -DgenerateBackupPoms=false -DallowSnapshots=true -DnewVersion=$1 sed -i -e "s#.*<\/che.version>#$1<\/che.version>#" pom.xml pushd typescript-dto >/dev/null sed -i -e "s#.*<\/che.version>#${1}<\/che.version>#" dto-pom.xml sed -i -e "/org.eclipse.che.parent<\/groupId>/ { n; s#.*<\/version>#${VERSION_CHE_PARENT}<\/version>#}" dto-pom.xml popd >/dev/null + + # update integration tests to new root pom version + find . -name "pom.xml" -exec sed -i {} -r -e "s@${current_root_pom_version}@$1@g" \; + # run mvn license format, in case some files that have old license headers have been updated mvn license:format commitChangeOrCreatePR $1 $2 "pr-${2}-to-${1}" diff --git a/wsmaster/integration-tests/cascade-removal/pom.xml b/wsmaster/integration-tests/cascade-removal/pom.xml index 80396313d1..c9f470d5c4 100644 --- a/wsmaster/integration-tests/cascade-removal/pom.xml +++ b/wsmaster/integration-tests/cascade-removal/pom.xml @@ -17,7 +17,7 @@ integration-tests-parent org.eclipse.che.core - 7.58.0-SNAPSHOT + 7.59.0-SNAPSHOT cascade-removal Integration Tests :: Cascade Removal diff --git a/wsmaster/integration-tests/mysql-tck/pom.xml b/wsmaster/integration-tests/mysql-tck/pom.xml index 72811a9490..834927017a 100644 --- a/wsmaster/integration-tests/mysql-tck/pom.xml +++ b/wsmaster/integration-tests/mysql-tck/pom.xml @@ -17,7 +17,7 @@ integration-tests-parent org.eclipse.che.core - 7.58.0-SNAPSHOT + 7.59.0-SNAPSHOT mysql-tck jar diff --git a/wsmaster/integration-tests/pom.xml b/wsmaster/integration-tests/pom.xml index 74ff295f97..9bd1e6390a 100644 --- a/wsmaster/integration-tests/pom.xml +++ b/wsmaster/integration-tests/pom.xml @@ -17,7 +17,7 @@ che-master-parent org.eclipse.che.core - 7.58.0-SNAPSHOT + 7.59.0-SNAPSHOT ../pom.xml integration-tests-parent diff --git a/wsmaster/integration-tests/postgresql-tck/pom.xml b/wsmaster/integration-tests/postgresql-tck/pom.xml index 3fab3479a9..ff97c38198 100644 --- a/wsmaster/integration-tests/postgresql-tck/pom.xml +++ b/wsmaster/integration-tests/postgresql-tck/pom.xml @@ -17,7 +17,7 @@ integration-tests-parent org.eclipse.che.core - 7.58.0-SNAPSHOT + 7.59.0-SNAPSHOT postgresql-tck jar