akomakom commented on pull request #285:
URL: https://github.com/apache/maven-surefire/pull/285#issuecomment-619952659
> How the second fix would look like?
I'd still do it this way (below), but I'm open to suggestions. What's the
concern with using DefaultJavaToolchain?
```java
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 8a0cd0aac..ee3106a67 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -89,6 +89,7 @@
import org.apache.maven.toolchain.DefaultToolchain;
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
+import org.apache.maven.toolchain.java.DefaultJavaToolChain;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.languages.java.jpms.LocationManager;
import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest;
@@ -2555,6 +2556,15 @@ private JdkAttributes getEffectiveJvm() throws
MojoFailureException
||
defaultToolchain.matchesRequirements( JAVA_9_MATCHER_OLD_NOTATION );
}
+ if ( toolchain instanceof DefaultJavaToolChain )
+ {
+ DefaultJavaToolChain defaultJavaToolChain =
(DefaultJavaToolChain) toolchain;
+ if ( !environmentVariables.containsKey( "JAVA_HOME" ) )
+ {
+ environmentVariables.put( "JAVA_HOME",
defaultJavaToolChain.getJavaHome() );
+ }
+ }
+
if ( !javaVersion9 )
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
