This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new fc1d6682ea chore: use Java 21 for building the sources
fc1d6682ea is described below
commit fc1d6682eae9ef73f3e0ae8da347439a34be48cd
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Thu Oct 30 16:08:26 2025 +0300
chore: use Java 21 for building the sources
---
.github/workflows/main.yml | 14 +++++++-------
.github/workflows/matrix.js | 5 +++--
build-logic-commons/gradle-plugin/build.gradle.kts | 4 ++--
.../kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts | 4 ++--
build-logic/build-parameters/build.gradle.kts | 2 +-
.../jvm/src/main/kotlin/build-logic.java.gradle.kts | 4 ++--
.../apache/jmeter/gui/action/HtmlReportGeneratorTest.kt | 13 -------------
7 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c47b1883e6..b645c63dae 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -52,13 +52,13 @@ jobs:
with:
website: ${{ matrix.oracle_java_website }}
release: ${{ matrix.java_version }}
- - name: Set up Java 17 and ${{ matrix.non_ea_java_version }}, ${{
matrix.java_distribution }}
+ - name: Set up Java 21 and ${{ matrix.non_ea_java_version }}, ${{
matrix.java_distribution }}
uses: actions/setup-java@v5
with:
- # The latest one will be the default, so we use Java 17 for launching
Gradle
+ # The latest one will be the default, so we use Java 21 for launching
Gradle
java-version: |
${{ matrix.non_ea_java_version }}
- 17
+ 21
distribution: ${{ matrix.java_distribution }}
architecture: x64
- name: Steps to reproduce
@@ -77,7 +77,7 @@ jobs:
properties: |
testExtraJvmArgs=${{ matrix.testExtraJvmArgs }}
testDisableCaching=${{ matrix.testDisableCaching }}
- jdkBuildVersion=17
+ jdkBuildVersion=21
jdkTestVersion=${{ matrix.java_version }}
jdkTestVendor=${{ matrix.java_vendor }}
# We have a separate job with Errorprone verifications, so avoid
duplicate warnings
@@ -89,14 +89,14 @@ jobs:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
errorprone:
- name: 'Error Prone (JDK 17)'
+ name: 'Error Prone (JDK 21)'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- - name: 'Set up JDK 17'
+ - name: 'Set up JDK 21'
uses: actions/setup-java@v5
with:
- java-version: 17
+ java-version: 21
distribution: 'zulu'
- uses: burrunan/gradle-cache-action@v3
name: Test
diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
index 581855dda0..aad48000fd 100644
--- a/.github/workflows/matrix.js
+++ b/.github/workflows/matrix.js
@@ -28,6 +28,7 @@ matrix.addAxis({
values: [
'17',
'21',
+ '25',
eaJava,
]
});
@@ -95,8 +96,8 @@ matrix.generateRow({os: 'windows-latest'});
// matrix.generateRow({os: 'ubuntu-latest'});
// Ensure there will be at least one job with Java 17
matrix.generateRow({java_version: "17"});
-// Ensure there will be at least one job with Java 21
-matrix.generateRow({java_version: "21"});
+// Ensure there will be at least one job with Java 25
+matrix.generateRow({java_version: "25"});
// Ensure there will be at least one job with Java EA
// matrix.generateRow({java_version: eaJava});
const include = matrix.generateRows(process.env.MATRIX_JOBS || 5);
diff --git a/build-logic-commons/gradle-plugin/build.gradle.kts
b/build-logic-commons/gradle-plugin/build.gradle.kts
index 97cd2f00d9..dbc4a4fbb8 100644
--- a/build-logic-commons/gradle-plugin/build.gradle.kts
+++ b/build-logic-commons/gradle-plugin/build.gradle.kts
@@ -32,8 +32,8 @@ dependencies {
}
// We need to figure out a version that is supported by the current JVM, and
by the Kotlin Gradle plugin
-// So we settle on 17 or 11 if the current JVM supports it
-listOf(17, 11)
+// So we settle on 21, 17, or 11 if the current JVM supports it
+listOf(21, 17, 11)
.firstOrNull { JavaVersion.toVersion(it) <= JavaVersion.current() }
?.let { buildScriptJvmTarget ->
java {
diff --git
a/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
b/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
index f5e6975251..3d13b5c219 100644
---
a/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
+++
b/build-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts
@@ -26,8 +26,8 @@ tasks.validatePlugins {
}
// We need to figure out a version that is supported by the current JVM, and
by the Kotlin Gradle plugin
-// So we settle on 17 or 11 if the current JVM supports it
-listOf(17, 11)
+// So we settle on 21, 17, or 11 if the current JVM supports it
+listOf(21, 17, 11)
.firstOrNull { JavaVersion.toVersion(it) <= JavaVersion.current() }
?.let { buildScriptJvmTarget ->
java {
diff --git a/build-logic/build-parameters/build.gradle.kts
b/build-logic/build-parameters/build.gradle.kts
index a97941ef67..945caebbc5 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -43,7 +43,7 @@ buildParameters {
description.set("Java version for source and target compatibility")
}
integer("jdkBuildVersion") {
- defaultValue.set(17)
+ defaultValue.set(21)
mandatory.set(true)
description.set("JDK version to use for building JMeter. If the value
is 0, then the current Java is used. (see
https://docs.gradle.org/8.0/userguide/toolchains.html#sec:consuming)")
}
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
index b4bf3a0697..f29bcff1fe 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts
@@ -131,14 +131,14 @@ tasks.configureEach<Javadoc> {
docTitle = "Apache JMeter ${project.name} API"
windowTitle = "Apache JMeter ${project.name} API"
header = "<b>Apache JMeter</b>"
- addStringOption("source", "17")
+ addStringOption("source", "21")
addStringOption("Xmaxwarns", "10")
addBooleanOption("Xdoclint:all,-missing", true)
val lastEditYear: String by rootProject.extra
bottom =
"Copyright © 1998-$lastEditYear Apache Software Foundation.
All Rights Reserved."
addBooleanOption("html5", true)
- links("https://docs.oracle.com/en/java/javase/17/docs/api/";)
+ links("https://docs.oracle.com/en/java/javase/21/docs/api/";)
}
}
diff --git
a/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
index 3b8104bcdb..77ed5decec 100644
---
a/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
+++
b/src/dist-check/src/test/kotlin/org/apache/jmeter/gui/action/HtmlReportGeneratorTest.kt
@@ -83,19 +83,6 @@ class HtmlReportGeneratorTest : JMeterTestCase() {
)
)
},
- CheckArgumentsCase(
- "",
- "",
- "",
- listOf(
- JMeterUtils.getResString("generate_report_ui.csv_file") +
-
MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.NO_FILE), ""),
-
JMeterUtils.getResString("generate_report_ui.user_properties_file") +
-
MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.NO_FILE), ""),
-
JMeterUtils.getResString("generate_report_ui.output_directory") +
-
MessageFormat.format(JMeterUtils.getResString(HtmlReportGenerator.CANNOT_CREATE_DIRECTORY),
"")
- )
- ),
combine("testfiles", "testReport", "oneLevel", "twolevel").let {
outputDirectoryPath ->
CheckArgumentsCase(
combine("testfiles", "HTMLReportTestFile.csv"),
