You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2025/09/16 19:32:50 UTC
(groovy) branch java25 updated (f39b2bf054 -> 366fc41330)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch java25
in repository https://gitbox.apache.org/repos/asf/groovy.git
discard f39b2bf054 GROOVY-11732: Gradle 9.0.0 and Java 25 is LTS now (not EA)
new 366fc41330 GROOVY-11732: Gradle 9.0.0 and Java 25 is LTS now (not EA)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f39b2bf054)
\
N -- N -- N refs/heads/java25 (366fc41330)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build-logic/src/main/groovy/org.apache.groovy-tested.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(groovy) 01/01: GROOVY-11732: Gradle 9.0.0 and Java 25 is LTS now (not EA)
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch java25
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 366fc413303d8f85beff5715813aee1e33bbef94
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Sep 16 13:14:41 2025 -0500
GROOVY-11732: Gradle 9.0.0 and Java 25 is LTS now (not EA)
---
.github/workflows/groovy-build-test.yml | 51 ++++-----------------
.../main/groovy/org.apache.groovy-tested.gradle | 2 +-
gradle.properties | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 43583 -> 45457 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 11 ++---
gradlew.bat | 6 +--
versions.properties | 2 +-
8 files changed, 21 insertions(+), 55 deletions(-)
diff --git a/.github/workflows/groovy-build-test.yml b/.github/workflows/groovy-build-test.yml
index e30c47ade5..bc6b44a8b5 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -28,19 +28,20 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: [ubuntu-latest]
- java: [17, 21]
- runs-on: ${{ matrix.os }}
+ java: [17, 21, 25]
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
with:
- distribution: 'zulu'
- java-version: ${{ matrix.java }}
check-latest: true
+ distribution: 'zulu'
+ java-version: |
+ ${{ matrix.java }}
+ 17
- uses: gradle/actions/setup-gradle@v4
- name: Test with Gradle
- run: ./gradlew test
+ run: ./gradlew test -Ptarget.java.home="$JAVA_HOME_${{ matrix.java }}_x64"
timeout-minutes: 60
- name: Upload reports
uses: actions/upload-artifact@v4
@@ -50,53 +51,19 @@ jobs:
path: '**/build/reports/'
additional:
- #if: github.event_name == 'push'
strategy:
fail-fast: false
matrix:
- os: [ubuntu-latest]
java: [18, 19, 20, 22, 23, 24]
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
with:
+ check-latest: true
distribution: 'zulu'
java-version: ${{ matrix.java }}
- check-latest: true
- uses: gradle/actions/setup-gradle@v4
- name: Test with Gradle
run: ./gradlew test
timeout-minutes: 60
-
- ea:
- #if: github.event_name == 'push'
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-latest]
- # The jdk links of "install-jdk.sh" are sometimes outdated, so we have to download openjdk releases from https://jdk.java.net/ by ourselves.
- jdk:
- - "https://download.java.net/java/early_access/jdk25/15/GPL/openjdk-25-ea+15_linux-x64_bin.tar.gz"
- runs-on: ${{ matrix.os }}
- steps:
- - name: Download JDK ${{ matrix.jdk }}
- run: wget -c ${{ matrix.jdk }} -O /tmp/openjdk.tar.gz
- - name: Set up JDK ${{ matrix.jdk }}
- run: mkdir -p /home/runner/openjdk && tar -xvf /tmp/openjdk.tar.gz -C /home/runner/openjdk && chmod -R 755 /home/runner/openjdk && mv /home/runner/openjdk/jdk*/* /home/runner/openjdk/
- - uses: actions/checkout@v5
- - uses: actions/setup-java@v5
- with:
- distribution: 'zulu'
- java-version: 21
- check-latest: true
- - uses: gradle/actions/setup-gradle@v4
- - name: Test with Gradle
- run: ./gradlew test -Ptarget.java.home=/home/runner/openjdk
- timeout-minutes: 60
- - name: Upload reports
- uses: actions/upload-artifact@v4
- if: always()
- with:
- name: build-reports-ea
- path: '**/build/reports/'
diff --git a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
index 92d8005352..b5aee9fa4a 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
@@ -73,8 +73,8 @@ tasks.withType(Test).configureEach {
if (rootProject.hasProperty('target.java.home')) {
String targetJavaHome = rootProject.property('target.java.home')?.trim()
if (targetJavaHome) {
+ logger.info("Using ${executable} to run tests")
executable = "${targetJavaHome}/bin/java"
- println "Using ${executable} to run tests"
}
}
diff --git a/gradle.properties b/gradle.properties
index 642556138c..96aee2c7fd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ groovyTargetBytecodeVersion=17
targetJavaVersion=17
binaryCompatibilityBaseline=5.0.0
-gradle_version=8.14.3
+gradle_version=9.0.0
groovyJUnit_ms=512m
groovyJUnit_mx=2g
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a4b76b9530..8bdaf60c75 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d4081da476..2a84e188b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d6b..2152a776c4 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2025 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
@@ -206,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
-# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
+ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 9d21a21834..90d0b0f8e6 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,5 +1,5 @@
@rem
-@rem Copyright 2015 the original author or authors.
+@rem Copyright 2015-2025 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@@ -70,11 +70,11 @@ goto fail
:execute
@rem Setup the command line
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/versions.properties b/versions.properties
index 4e6ba199eb..acd4671778 100644
--- a/versions.properties
+++ b/versions.properties
@@ -22,7 +22,7 @@ asciidoctorPdf=2.3.19
asciidoctorj=2.5.11
asm=9.8
bridger=1.6.Final
-checkstyle=10.26.1
+checkstyle=11.0.1
cobertura=1.9.4.1
codenarc=3.6.0
commonsCli=1.10.0