You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2022/04/02 22:50:16 UTC
[maven-surefire] branch release/2.22.3 updated: a probable root cause extractExternalJavaVersion
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch release/2.22.3
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/release/2.22.3 by this push:
new d82a089 a probable root cause extractExternalJavaVersion
d82a089 is described below
commit d82a089e8e02bafa1a9311c4609c48b79bbd74b7
Author: tibordigana <ti...@apache.org>
AuthorDate: Sun Apr 3 00:49:59 2022 +0200
a probable root cause extractExternalJavaVersion
---
.../java/org/apache/maven/surefire/its/AbstractJigsawIT.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
index 797212b..8910796 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
@@ -51,7 +51,7 @@ public abstract class AbstractJigsawIT
protected SurefireLauncher assumeJigsaw() throws IOException
{
assumeTrue( "There's no JDK 9 provided.",
- isJavaVersion9AtLeast() || EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() );
+ isJavaVersion9AtLeast() || EXT_JDK_HOME != null && isExtJavaVersion9AtLeast() );
// fail( EXT_JDK_HOME_KEY + " was provided with value " + EXT_JDK_HOME + " but it is not Jigsaw Java 9." );
SurefireLauncher launcher = unpack();
@@ -61,7 +61,7 @@ public abstract class AbstractJigsawIT
protected SurefireLauncher assumeJava9Property() throws IOException
{
- assumeTrue( "There's no JDK 9 provided.", EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() );
+ assumeTrue( "There's no JDK 9 provided.", EXT_JDK_HOME != null && isExtJavaVersion9AtLeast() );
return unpack();
}
@@ -84,7 +84,9 @@ public abstract class AbstractJigsawIT
}
else if ( versions.countTokens() >= 2 )
{
- javaVersion = versions.nextToken() + "." + versions.nextToken();
+ String v1 = versions.nextToken();
+ String v2 = versions.nextToken();
+ javaVersion = v1.equals( "1" ) ? v1 + "." + v2 : v1;
}
else
{
@@ -103,10 +105,10 @@ public abstract class AbstractJigsawIT
return parseDouble( System.getProperty( "java.specification.version" ) ) >= JIGSAW_JAVA_VERSION;
}
- private static boolean isExtJavaVerion9AtLeast() throws IOException
+ private static boolean isExtJavaVersion9AtLeast() throws IOException
{
String javaVersion = extractExternalJavaVersion();
- return Double.valueOf( javaVersion ) >= JIGSAW_JAVA_VERSION;
+ return parseDouble( javaVersion ) >= JIGSAW_JAVA_VERSION;
}
}