Upgrade release tool gradle to run on jdk-21

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
adoptium · Feb 12, 2024 · 4173f1a · 4173f1a
1 parent 37ac254
commit 4173f1a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/adopt-github-release/build.gradle b/adopt-github-release/build.gradle
@@ -11,6 +11,7 @@ repositories {
 }
 application {
     mainClassName = 'net.adoptium.release.UploadFiles'
+    applicationDefaultJvmArgs = ['-Xmx1g']
 }
 
 dependencies {

diff --git a/adopt-github-release/gradlew b/adopt-github-release/gradlew
@@ -44,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx256m" "-Xms256m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -185,7 +185,4 @@ if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-echo "JAVA_OPTS=${JAVA_OPTS}"
-echo "GRADLE_OPTS=${GRADLE_OPTS}"
-echo "$JAVACMD" "$@"
 exec "$JAVACMD" "$@"
diff --git a/sbin/Release.sh b/sbin/Release.sh
@@ -170,8 +170,6 @@ fi
 if [ "$DRY_RUN" == "false" ]; then
     cd adopt-github-release || exit 1
     chmod +x gradlew
-    export JAVA_OPTS="-Xmx1g"
-    export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1g'"
     GRADLE_USER_HOME=./gradle-cache ./gradlew --no-daemon run --args="--version \"${VERSION}\" --tag \"${TAG}\" --description \"${description}\" ${server} ${org} $RELEASE_OPTION $files"
     # Run releaseCheck.sh to check that the correct number of artifacts are live
     if [ -z "$TIMESTAMP" -a "$UPLOAD_TESTRESULTS_ONLY" = "false" ]; then