From 4d00da2df73b4d0b8c8f0c7367ddea39bff9936a Mon Sep 17 00:00:00 2001 From: Pedro Igor Date: Thu, 15 Dec 2022 16:20:30 -0300 Subject: [PATCH] Use git checkout to rever changes Closes #15644 --- quarkus/set-quarkus-version.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/quarkus/set-quarkus-version.sh b/quarkus/set-quarkus-version.sh index 5b92a50792..20640edbfc 100755 --- a/quarkus/set-quarkus-version.sh +++ b/quarkus/set-quarkus-version.sh @@ -15,12 +15,22 @@ # limitations under the License. # +function revertChanges() { + echo "Reverting version changes." + git checkout ../. +} + if [ "$1" == "-h" ]; then echo "Change the Quarkus version to a specific version." echo "Usage: set-quarkus-version " exit fi +if [ "$1" == "--revert" ]; then + revertChanges + exit +fi + DEFAULT_QUARKUS_VERSION="999-SNAPSHOT" QUARKUS_VERSION=${1:-"$DEFAULT_QUARKUS_VERSION"} QUARKUS_BRANCH="$QUARKUS_VERSION" @@ -39,7 +49,6 @@ fi QUARKUS_BOM=$(curl -s "$QUARKUS_BOM_URL") echo "Setting Quarkus version: $QUARKUS_VERSION" -$(mvn -f ../pom.xml versions:revert 1> /dev/null) $(mvn versions:set-property -f ../pom.xml -Dproperty=quarkus.version -DnewVersion="$QUARKUS_VERSION" 1> /dev/null) DEPENDENCIES_LIST="resteasy jackson-bom hibernate-orm mysql-jdbc postgresql-jdbc microprofile-metrics-api wildfly-common wildfly-elytron" @@ -54,7 +63,8 @@ for dependency in $DEPENDENCIES_LIST; do exit 1 fi echo "Setting $VERSION to $dependency" - $(mvn versions:set-property -pl . -Dproperty="$dependency".version -DnewVersion="$VERSION" 1> /dev/null) + mvn versions:set-property -f ../pom.xml -Dproperty="$dependency".version -DnewVersion="$VERSION" 1> /dev/null + mvn versions:set-property -f ./pom.xml -Dproperty="$dependency".version -DnewVersion="$VERSION" 1> /dev/null done echo ""