Skip to content

Commit 59f01bb

Browse files
committed
Fix integration tests running Maven on JDK 24
(cherry picked from commit 52d8176)
1 parent e60653d commit 59f01bb

File tree

3 files changed

+45
-10
lines changed

3 files changed

+45
-10
lines changed

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

+10-6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.nio.file.Path;
2020
import java.util.List;
21+
import java.util.Map;
2122

2223
import de.sormuras.bartholdy.tool.Java;
2324

@@ -36,28 +37,31 @@ class JavaVersionsTests {
3637
void java_8() {
3738
var java8Home = Helper.getJavaHome("8");
3839
assumeTrue(java8Home.isPresent(), "Java 8 installation directory not found!");
39-
var actualLines = execute("8", java8Home.get());
40+
var actualLines = execute("8", java8Home.get(), Map.of());
4041

4142
assertTrue(actualLines.contains("[WARNING] Tests run: 2, Failures: 0, Errors: 0, Skipped: 1"));
4243
}
4344

4445
@Test
4546
void java_default() {
46-
var actualLines = execute("default", new Java().getHome());
47+
var actualLines = execute("default", new Java().getHome(), MavenEnvVars.FOR_JDK24_AND_LATER);
4748

4849
assertTrue(actualLines.contains("[WARNING] Tests run: 2, Failures: 0, Errors: 0, Skipped: 1"));
4950
}
5051

51-
List<String> execute(String version, Path javaHome) {
52-
var result = Request.builder() //
52+
List<String> execute(String version, Path javaHome, Map<String, String> environmentVars) {
53+
var builder = Request.builder() //
5354
.setTool(Request.maven()) //
5455
.setProject("java-versions") //
5556
.setWorkspace("java-versions-" + version) //
5657
.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
5758
.addArguments("--update-snapshots", "--batch-mode", "verify") //
5859
.setTimeout(TOOL_TIMEOUT) //
59-
.setJavaHome(javaHome) //
60-
.build().run();
60+
.setJavaHome(javaHome);
61+
environmentVars.forEach(builder::putEnvironment);
62+
63+
var result = builder.build().run();
64+
6165
assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
6266
assertEquals(0, result.getExitCode());
6367
assertEquals("", result.getOutput("err"));
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright 2015-2024 the original author or authors.
3+
*
4+
* All rights reserved. This program and the accompanying materials are
5+
* made available under the terms of the Eclipse Public License v2.0 which
6+
* accompanies this distribution and is available at
7+
*
8+
* https://www.eclipse.org/legal/epl-v20.html
9+
*/
10+
11+
package platform.tooling.support.tests;
12+
13+
import java.util.Map;
14+
15+
import org.junit.jupiter.api.condition.JRE;
16+
17+
final class MavenEnvVars {
18+
19+
// https://issues.apache.org/jira/browse/MNG-8248
20+
static final Map<String, String> FOR_JDK24_AND_LATER = JRE.currentVersion().compareTo(JRE.JAVA_24) >= 0 //
21+
? Map.of("MAVEN_OPTS", "--enable-native-access=ALL-UNNAMED") //
22+
: Map.of();
23+
24+
private MavenEnvVars() {
25+
}
26+
27+
}

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.nio.file.Files;
2020
import java.nio.file.Path;
2121
import java.util.List;
22+
import java.util.Map;
2223

2324
import de.sormuras.bartholdy.Result;
2425

@@ -80,15 +81,18 @@ void checkDefault() throws Exception {
8081
}
8182

8283
private Result mvn(String variant) {
83-
var result = Request.builder() //
84+
Map<String, String> environmentVars = MavenEnvVars.FOR_JDK24_AND_LATER;
85+
86+
var builder = Request.builder() //
8487
.setTool(Request.maven()) //
8588
.setProject("multi-release-jar") //
8689
.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
8790
.addArguments("--update-snapshots", "--show-version", "--errors", "--batch-mode", "--file", variant,
8891
"test") //
89-
.setTimeout(TOOL_TIMEOUT) //
90-
.build() //
91-
.run();
92+
.setTimeout(TOOL_TIMEOUT);
93+
environmentVars.forEach(builder::putEnvironment);
94+
95+
var result = builder.build().run();
9296

9397
assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
9498

0 commit comments

Comments
 (0)