From 2cca2d1377acf07bd6248b95ac9d1f8f22be58ea Mon Sep 17 00:00:00 2001 From: Christian Stein Date: Sat, 7 Dec 2024 09:12:14 +0100 Subject: [PATCH 1/4] Add JRE.JAVA_25 Add `JRE.JAVA_25` constant and JDK 25 CI build Closes #4177 --- .github/workflows/cross-version.yml | 2 ++ gradle/base/code-generator-model/src/main/resources/jre.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml index d303d359437c..364a04fae552 100644 --- a/.github/workflows/cross-version.yml +++ b/.github/workflows/cross-version.yml @@ -31,6 +31,8 @@ jobs: - version: 24 type: ea release: leyden + - version: 25 + type: ea name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }})" runs-on: ubuntu-latest steps: diff --git a/gradle/base/code-generator-model/src/main/resources/jre.yaml b/gradle/base/code-generator-model/src/main/resources/jre.yaml index ed1bdd3d59fc..c23d9f11e9d0 100644 --- a/gradle/base/code-generator-model/src/main/resources/jre.yaml +++ b/gradle/base/code-generator-model/src/main/resources/jre.yaml @@ -28,3 +28,5 @@ since: '5.11' - version: 24 since: '5.11' +- version: 25 + since: '5.12' From c72f0e5dc320ef55b26d7540990601cf6cf0aad6 Mon Sep 17 00:00:00 2001 From: Christian Stein Date: Sun, 8 Dec 2024 14:41:33 +0100 Subject: [PATCH 2/4] Update gradle/base/code-generator-model/src/main/resources/jre.yaml [skip ci] Co-authored-by: Marc Philipp --- gradle/base/code-generator-model/src/main/resources/jre.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/base/code-generator-model/src/main/resources/jre.yaml b/gradle/base/code-generator-model/src/main/resources/jre.yaml index c23d9f11e9d0..1747ffa12dd6 100644 --- a/gradle/base/code-generator-model/src/main/resources/jre.yaml +++ b/gradle/base/code-generator-model/src/main/resources/jre.yaml @@ -29,4 +29,4 @@ - version: 24 since: '5.11' - version: 25 - since: '5.12' + since: '5.11.4' From aa820b0bcb2b8d6d181f03c5501dd2fd552749aa Mon Sep 17 00:00:00 2001 From: Christian Stein Date: Sun, 8 Dec 2024 14:44:42 +0100 Subject: [PATCH 3/4] Update release notes --- .../src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc | 2 +- .../docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc index ee08a53eed41..dcf2bba66bbf 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc +++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc @@ -45,7 +45,7 @@ JUnit repository on GitHub. [[release-notes-5.11.4-junit-jupiter-new-features-and-improvements]] ==== New Features and Improvements -* ❓ +* JAVA_25 has been added to the JRE enum for use with JRE-based execution conditions. [[release-notes-5.11.4-junit-vintage]] diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc index 41eeda5831b1..5b8c6cca112f 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc +++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc @@ -118,7 +118,7 @@ JUnit repository on GitHub. thread dump to `System.out` prior to interrupting a test thread due to a timeout. * `TestReporter` now allows publishing files for a test method or test class which can be used to include them in test reports, such as the Open Test Reporting format. - +* JAVA_25 has been added to the JRE enum for use with JRE-based execution conditions. [[release-notes-5.12.0-M1-junit-vintage]] === JUnit Vintage From 63e4abbb800e49050aecc75ebd9aadf3540e54b4 Mon Sep 17 00:00:00 2001 From: Christian Stein Date: Mon, 9 Dec 2024 11:10:10 +0100 Subject: [PATCH 4/4] Apply suggestions from code review [skip ci] --- .../src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc | 2 +- .../docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc index dcf2bba66bbf..ed1b63eaa2a4 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc +++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.4.adoc @@ -45,7 +45,7 @@ JUnit repository on GitHub. [[release-notes-5.11.4-junit-jupiter-new-features-and-improvements]] ==== New Features and Improvements -* JAVA_25 has been added to the JRE enum for use with JRE-based execution conditions. +* `JAVA_25` has been added to the `JRE` enum for use with JRE-based execution conditions. [[release-notes-5.11.4-junit-vintage]] diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc index 5b8c6cca112f..6794f04a77c5 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc +++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc @@ -118,7 +118,7 @@ JUnit repository on GitHub. thread dump to `System.out` prior to interrupting a test thread due to a timeout. * `TestReporter` now allows publishing files for a test method or test class which can be used to include them in test reports, such as the Open Test Reporting format. -* JAVA_25 has been added to the JRE enum for use with JRE-based execution conditions. +* `JAVA_25` has been added to the `JRE` enum for use with JRE-based execution conditions. [[release-notes-5.12.0-M1-junit-vintage]] === JUnit Vintage