This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_5_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_5_0_X by this push:
new 9fec955497 Java 25 is LTS now (not EA)
9fec955497 is described below
commit 9fec95549785bd5c7951be970fe65ac8b9b685f5
Author: Eric Milles <[email protected]>
AuthorDate: Thu Sep 18 08:37:59 2025 -0500
Java 25 is LTS now (not EA)
---
.github/workflows/groovy-build-test.yml | 55 +++++-----------------
.../groovy/tools/groovydoc/GroovyDocTest.java | 20 ++++----
.../test/resources/groovydoc/groovyDocTests.xml | 9 ++--
.../tools/groovydoc/testfiles/records/Record.java | 0
4 files changed, 27 insertions(+), 57 deletions(-)
diff --git a/.github/workflows/groovy-build-test.yml
b/.github/workflows/groovy-build-test.yml
index 4320bf9f10..46f64b2e17 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: [11, 17, 21]
- runs-on: ${{ matrix.os }}
+ java: [11, 17, 21, 25]
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v4
with:
- distribution: 'zulu'
- java-version: ${{ matrix.java }}
check-latest: true
+ distribution: 'zulu'
+ java-version: |
+ ${{ matrix.java }}
+ 21
- 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,21 @@ jobs:
path: '**/build/reports/'
additional:
- #if: github.event_name == 'push'
strategy:
fail-fast: false
matrix:
- os: [ubuntu-latest]
java: [12, 13, 14, 15, 16, 18, 19, 20, 22, 23, 24]
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v4
with:
- 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@v4
- with:
distribution: 'zulu'
- java-version: 21
- check-latest: true
+ java-version: |
+ ${{ matrix.java }}
+ 21
- uses: gradle/actions/setup-gradle@v4
- name: Test with Gradle
- run: ./gradlew test -Ptarget.java.home=/home/runner/openjdk
+ run: ./gradlew test -Ptarget.java.home="$JAVA_HOME_${{ matrix.java
}}_X64"
timeout-minutes: 60
- - name: Upload reports
- uses: actions/upload-artifact@v4
- if: always()
- with:
- name: build-reports-ea
- path: '**/build/reports/'
diff --git
a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocTest.java
b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocTest.java
index ae6e5e44bf..93d1c7166a 100644
---
a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocTest.java
+++
b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocTest.java
@@ -73,8 +73,8 @@ public class GroovyDocTest {
public void testCustomClassTemplate() throws Exception {
rule.executeTarget("testCustomClassTemplate");
- final File testfilesPackageDir = new File(tmpDir,
"org/codehaus/groovy/tools/groovydoc/testfiles");
- final String[] list = testfilesPackageDir.list((file, name) ->
name.equals("DocumentedClass.html"));
+ File testfilesPackageDir = new File(tmpDir,
"org/codehaus/groovy/tools/groovydoc/testfiles");
+ String[] list = testfilesPackageDir.list((file, name) ->
name.equals("DocumentedClass.html"));
assertNotNull("Dir not found: " +
testfilesPackageDir.getAbsolutePath(), list);
assertEquals(1, list.length);
@@ -89,8 +89,8 @@ public class GroovyDocTest {
public void testSupportedJavadocVersion() throws Exception {
rule.executeTarget("supportedGroovyDocJava");
- final File testfilesPackageDir = new File(tmpDir,
"org/codehaus/groovy/tools/groovydoc/testfiles/generics");
- final String[] list = testfilesPackageDir.list((file, name) ->
name.equals("Java.html"));
+ File testfilesPackageDir = new File(tmpDir,
"org/codehaus/groovy/tools/groovydoc/testfiles/generics");
+ String[] list = testfilesPackageDir.list((file, name) ->
name.equals("Java.html"));
assertNotNull("Dir not found: " +
testfilesPackageDir.getAbsolutePath(), list);
assertEquals(1, list.length);
@@ -105,8 +105,8 @@ public class GroovyDocTest {
public void testUnsupportedJavadocVersion() {
rule.executeTarget("unsupportedGroovyDocJava");
- final File testfilesPackageDir = new File(tmpDir,
"org/codehaus/groovy/tools/groovydoc/testfiles/generics");
- final String[] list = testfilesPackageDir.list((file, name) ->
name.equals("Java.html"));
+ File testfilesPackageDir = new File(tmpDir,
"org/codehaus/groovy/tools/groovydoc/testfiles/generics");
+ String[] list = testfilesPackageDir.list((file, name) ->
name.equals("Java.html"));
assertNotNull("Dir not found: " +
testfilesPackageDir.getAbsolutePath(), list);
assertEquals("Files unexpectedly found when not expecting to parse",0,
list.length);
@@ -126,8 +126,8 @@ public class GroovyDocTest {
public void testFileEncoding() throws Exception {
rule.executeTarget("testFileEncoding");
- final File testfilesPackageDir = new File(tmpDir,
"org/codehaus/groovy/tools/groovydoc/testfiles");
- final String[] list = testfilesPackageDir.list((file, name) ->
name.equals("DocumentedClass.html"));
+ File testfilesPackageDir = new File(tmpDir,
"org/codehaus/groovy/tools/groovydoc/testfiles");
+ String[] list = testfilesPackageDir.list((file, name) ->
name.equals("DocumentedClass.html"));
File documentedClassHtmlDoc = new File(testfilesPackageDir, list[0]);
CharsetToolkit charsetToolkit = new
CharsetToolkit(documentedClassHtmlDoc);
@@ -139,8 +139,8 @@ public class GroovyDocTest {
public void testJavadocForRecords() throws Exception {
rule.executeTarget("testJavadocForRecords");
- final File testfilesPackageDir = new File(tmpDir,
"org/codehaus/groovy/tools/groovydoc/testfiles/records");
- final String[] list = testfilesPackageDir.list((file, name) ->
name.equals("Record.html"));
+ File testfilesPackageDir = new File(tmpDir,
"org/codehaus/groovy/tools/groovydoc/testfiles/records");
+ String[] list = testfilesPackageDir.list((file, name) ->
name.equals("Record.html"));
assertNotNull("Dir not found: " +
testfilesPackageDir.getAbsolutePath(), list);
assertEquals(1, list.length);
diff --git
a/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
b/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
index 508ecee600..02a4a96de4 100644
---
a/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
+++
b/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
@@ -98,10 +98,11 @@
</target>
<target name="testJavadocForRecords">
- <groovydoc destdir="${tmpdir}" sourcepath="${test}"
-
packagenames="org/codehaus/groovy/tools/groovydoc/testfiles/**.*"
- use="true" windowtitle="GroovyDoc" private="false"
javaVersion="JAVA_21">
- <link packages="java.,org.groovy.xml.,javax.,org.groovy.w3c."
href="http://docs.oracle.com/javase/7/docs/api/"/>
+ <property name="rsrc" location="src/test/resources"/>
+ <groovydoc destdir="${tmpdir}" sourcepath="${rsrc}"
+
packagenames="org/codehaus/groovy/tools/groovydoc/testfiles/**"
+ use="true" windowtitle="GroovyDoc" private="false"
javaVersion="JAVA_17">
+ <link packages="java.,org.groovy.xml.,javax.,org.groovy.w3c."
href="https://docs.oracle.com/en/java/javase/17/docs/api/"/>
<link packages="org.apache.tools.ant."
href="http://docs.groovy-lang.org/docs/ant/api/"/>
<link packages="org.junit.,junit.framework."
href="http://junit.org/junit4/javadoc/latest/"/>
<link packages="groovy.,org.codehaus.groovy."
href="http://groovy.codehaus.org/api/"/>
diff --git
a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/records/Record.java
b/subprojects/groovy-groovydoc/src/test/resources/org/codehaus/groovy/tools/groovydoc/testfiles/records/Record.java
similarity index 100%
rename from
subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/testfiles/records/Record.java
rename to
subprojects/groovy-groovydoc/src/test/resources/org/codehaus/groovy/tools/groovydoc/testfiles/records/Record.java
