Skip to content

Commit e344935

Browse files
committed
Exclude lower build numbers, less than 25
1 parent c47cc87 commit e344935

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenEnvVars.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@ static Map<String, String> forJre(JRE jre) {
3030
var list = new ArrayList<String>();
3131
if (jre.compareTo(JRE.JAVA_24) >= 0)
3232
list.addAll(FOR_JDK24_AND_LATER);
33-
if (jre.compareTo(JRE.JAVA_26) >= 0)
34-
list.addAll(FOR_JDK26_AND_LATER);
33+
if (jre.compareTo(JRE.JAVA_26) >= 0) {
34+
// exclude "leyden" and "valhalla" builds
35+
if (Runtime.version().build().orElse(0) >= 25) {
36+
list.addAll(FOR_JDK26_AND_LATER);
37+
}
38+
}
3539
return list.isEmpty() ? Map.of() : Map.of("MAVEN_OPTS", String.join(" ", list));
3640
}
3741

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/UnalignedClasspathTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ void verifyErrorMessageForUnalignedClasspath(JRE jre, Path javaHome, @TempDir Pa
5151
.workingDir(copyToWorkspace(Projects.JUPITER_STARTER, workspace)) //
5252
.addArguments(localMavenRepo.toCliArgument(), "-Dmaven.repo=" + MavenRepo.dir()) //
5353
.addArguments("-Dsnapshot.repo.url=" + mavenRepoProxy.getBaseUri()) //
54-
.addArguments("-Djunit.platform.commons.version=1.11.4").addArguments("--update-snapshots",
55-
"--batch-mode", "verify") //
54+
.addArguments("-Djunit.platform.commons.version=1.11.4") //
55+
.addArguments("--update-snapshots", "--batch-mode", "verify") //
5656
.putEnvironment(MavenEnvVars.forJre(jre)) //
5757
.redirectOutput(outputFiles);
5858
var result = starter.startAndWait();

0 commit comments

Comments
 (0)