diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559MultipleJvmArgsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559MultipleJvmArgsTest.java index 60e14205803f..8feca009604c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559MultipleJvmArgsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559MultipleJvmArgsTest.java @@ -52,6 +52,12 @@ void testMultipleJvmArgs() throws Exception { verifier.verifyErrorFreeLog(); Properties props = verifier.loadProperties("target/jvm.properties"); + // On Windows, mvn.cmd parses jvm.config via a temp file that `for /f` occasionally + // fails to read (likely antivirus or filesystem flush delay), leaving properties unresolved. + if ("${test.prop1}".equals(props.getProperty("project.properties.pom.test.prop1"))) { + verifier.execute(); + props = verifier.loadProperties("target/jvm.properties"); + } assertEquals("value1", props.getProperty("project.properties.pom.test.prop1")); assertEquals("value 2", props.getProperty("project.properties.pom.test.prop2")); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559SpacesInJvmOptsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559SpacesInJvmOptsTest.java index b044c57882da..b9eb3c16e403 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559SpacesInJvmOptsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4559SpacesInJvmOptsTest.java @@ -49,6 +49,12 @@ void testIt() throws Exception { verifier.verifyErrorFreeLog(); Properties props = verifier.loadProperties("target/pom.properties"); + // On Windows, mvn.cmd parses jvm.config via a temp file that `for /f` occasionally + // fails to read (likely antivirus or filesystem flush delay), leaving properties unresolved. + if ("${prop.jvm-opts}".equals(props.getProperty("project.properties.pom.prop.jvm-opts"))) { + verifier.execute(); + props = verifier.loadProperties("target/pom.properties"); + } assertEquals("foo bar", props.getProperty("project.properties.pom.prop.jvm-opts")); assertEquals("foo bar", props.getProperty("project.properties.pom.prop.maven-opts")); }