diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac5e0d86be2..922fa654441 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ variables: GRADLE_VERSION: "8.5" # must match gradle-wrapper.properties MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/" GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/" - 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-") + BUILDER_IMAGE_VERSION_PREFIX: "113_merge-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-") REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations" DEFAULT_TEST_JVMS: /^(8|11|17|21|stable)$/ PROFILE_TESTS: diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy index 7683bd644f7..775246eea66 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy +++ b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy @@ -16,6 +16,7 @@ class RuntimeCallSiteTest extends AgentTestRunner { def 'test exec with command string'() { setup: + System.out.println(System.getProperty("java.version")) final runtime = Mock(Runtime) CommandInjectionModule iastModule = Mock(CommandInjectionModule) final command = 'ls' diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle index 895ff430627..d82cf079c94 100644 --- a/gradle/java_no_deps.gradle +++ b/gradle/java_no_deps.gradle @@ -154,6 +154,7 @@ project.afterEvaluate { def javaVersions = System.getenv() .findAll { it.key =~ /^JAVA_[0-9]+_HOME$/ } .collect { (it.key =~ /^JAVA_(\d+)_HOME$/)[0][1] as Integer } + .findAll { it != 25 } // Exclude LTS JDK v25 (early access) if (javaVersions.isEmpty()) { throw new GradleException("No valid JAVA_X_HOME environment variables found.")