Skip to content

Commit 90924e2

Browse files
sarahchen6mhlidd
authored andcommitted
Update builder image for JDK 25 EA (#9096)
* Update builder image prefix for JDK 25 EA * Exclude 25 from stable jvm calculation
1 parent ee2eb03 commit 90924e2

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ variables:
2828
GRADLE_VERSION: "8.14.3" # must match gradle-wrapper.properties
2929
MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/"
3030
GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/"
31-
BUILDER_IMAGE_VERSION_PREFIX: "v25.06-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
31+
BUILDER_IMAGE_VERSION_PREFIX: "v25.07-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
3232
REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
3333
DEFAULT_TEST_JVMS: /^(8|11|17|21|stable)$/
3434
PROFILE_TESTS:

gradle/java_no_deps.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ project.afterEvaluate {
155155
def javaVersions = System.getenv()
156156
.findAll { it.key =~ /^JAVA_[0-9]+_HOME$/ }
157157
.collect { (it.key =~ /^JAVA_(\d+)_HOME$/)[0][1] as Integer }
158+
.findAll { it != 25 } // Exclude LTS JDK v25 (early access)
158159

159160
if (javaVersions.isEmpty()) {
160161
throw new GradleException("No valid JAVA_X_HOME environment variables found.")

0 commit comments

Comments
 (0)