Skip to content

Commit fdace89

Browse files
committed
Address review comments
1 parent 0686562 commit fdace89

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

dd-java-agent/instrumentation/java-concurrent/src/test/groovy/QueueTimingForkedTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ class QueueTimingForkedTest extends AgentTestRunner {
7777
@Override
7878
void run() {}
7979
}
80-
}
80+
}

dd-smoke-tests/log-injection/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins {
77
apply from: "$rootDir/gradle/java.gradle"
88
description = 'Log injection Smoke Tests.'
99

10+
// Java 24 requires at least groovy v3.0.24
1011
configurations.all {
1112
resolutionStrategy {
1213
force 'org.codehaus.groovy:groovy-all:3.0.24'

gradle/java_no_deps.gradle

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,20 +151,14 @@ project.afterEvaluate {
151151
def testJvm = gradle.startParameter.projectProperties["testJvm"]
152152
def javaTestLauncher = null as Provider<JavaLauncher>
153153
if (testJvm == "stable") {
154-
def javaHomeVersions = System.getenv().findAll { it.key =~ /^JAVA_[0-9]+_HOME$/ }
155-
if (javaHomeVersions.isEmpty()) {
156-
throw new GradleException("No JAVA_X_HOME environment variables found.")
157-
}
158-
def javaVersions = javaHomeVersions.keySet().collect { key ->
159-
def matcher = key =~ /JAVA_([0-9]+)_HOME/
160-
if (!matcher.matches()) {
161-
return null
162-
}
163-
matcher.group(1) as Integer
164-
}.findAll { it != null }
154+
def javaVersions = System.getenv()
155+
.findAll { it.key =~ /^JAVA_[0-9]+_HOME$/ }
156+
.collect { (it.key =~ /^JAVA_(\d+)_HOME$/)[0][1] as Integer }
157+
165158
if (javaVersions.isEmpty()) {
166-
throw new GradleException("No Java versions found from JAVA_X_HOME environment variables.")
159+
throw new GradleException("No valid JAVA_X_HOME environment variables found.")
167160
}
161+
168162
testJvm = javaVersions.max().toString()
169163
}
170164
if (testJvm) {

0 commit comments

Comments
 (0)