This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 2ccba31 [SUREFIRE-1531] Option to disable Java 9 modules
2ccba31 is described below
commit 2ccba319efc4248197ce307515540f1c56faa9c5
Author: Tibor17 <tibordig...@apache.org>
AuthorDate: Sat Nov 17 19:48:51 2018 +0100
[SUREFIRE-1531] Option to disable Java 9 modules
---
.../apache/maven/plugin/failsafe/IntegrationTestMojo.java | 14 +++++++-------
.../apache/maven/plugin/surefire/AbstractSurefireMojo.java | 14 +++++++-------
.../plugin/surefire/AbstractSurefireMojoJava7PlusTest.java | 4 ++--
.../maven/plugin/surefire/AbstractSurefireMojoTest.java | 4 ++--
.../org/apache/maven/plugin/surefire/MojoMocklessTest.java | 4 ++--
.../org/apache/maven/plugin/surefire/SurefirePlugin.java | 14 +++++++-------
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 42b4cc6..edc95c4 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -371,15 +371,15 @@ public class IntegrationTestMojo
private String shutdown;
/**
- * Disables Jigsaw (Java 9) modular path even if <i>module-info.java</i>
is used in project.
+ * Disables modular path (aka Jigsaw project since of Java 9) even if
<i>module-info.java</i> is used in project.
* <br>
* Enabled by default.
* If enabled, <i>module-info.java</i> exists and executes with JDK 9+,
modular path is used.
*
* @since 3.0.0-M2
*/
- @Parameter( property = "failsafe.useJigsawModules", defaultValue = "true" )
- private boolean useJigsawModules;
+ @Parameter( property = "failsafe.useModulePath", defaultValue = "true" )
+ private boolean useModulePath;
@Override
protected int getRerunFailingTestsCount()
@@ -812,15 +812,15 @@ public class IntegrationTestMojo
}
@Override
- protected boolean useJigsawModules()
+ protected boolean useModulePath()
{
- return useJigsawModules;
+ return useModulePath;
}
@Override
- protected void setUseJigsawModules( boolean useJigsawModules )
+ protected void setUseModulePath( boolean useModulePath )
{
- this.useJigsawModules = useJigsawModules;
+ this.useModulePath = useModulePath;
}
@Override
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 4a1a213..b6ae1bb 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
@@ -791,9 +791,9 @@ public abstract class AbstractSurefireMojo
protected abstract String getReportSchemaLocation();
- protected abstract boolean useJigsawModules();
+ protected abstract boolean useModulePath();
- protected abstract void setUseJigsawModules( boolean useJigsawModules );
+ protected abstract void setUseModulePath( boolean useModulePath );
/**
* This plugin MOJO artifact.
@@ -1240,9 +1240,9 @@ public abstract class AbstractSurefireMojo
return new File( getClassesDirectory(), "module-info.class" );
}
- private boolean canExecuteProviderWithJigsaw( Platform platform )
+ private boolean canExecuteProviderWithModularPath( Platform platform )
{
- return useJigsawModules()
+ return useModulePath()
&& platform.getJdkExecAttributesForTests().isJava9AtLeast()
&& existsModuleDescriptor();
}
@@ -1707,7 +1707,7 @@ public abstract class AbstractSurefireMojo
{
Set<Artifact> providerArtifacts = provider.getProviderClasspath();
String providerName = provider.getProviderName();
- if ( canExecuteProviderWithJigsaw( platform ) && !isInprocess )
+ if ( canExecuteProviderWithModularPath( platform ) && !isInprocess
)
{
return newStartupConfigWithModularPath(
classLoaderConfiguration, providerArtifacts, providerName,
getModuleDescriptor(), scanResult );
@@ -2160,7 +2160,7 @@ public abstract class AbstractSurefireMojo
Classpath bootClasspath = getArtifactClasspath( shadeFire != null ?
shadeFire : surefireBooterArtifact );
- if ( canExecuteProviderWithJigsaw( platform ) )
+ if ( canExecuteProviderWithModularPath( platform ) )
{
return new ModularClasspathForkConfiguration( bootClasspath,
tmpDir,
@@ -2429,7 +2429,7 @@ public abstract class AbstractSurefireMojo
checksum.add( getForkedProcessExitTimeoutInSeconds() );
checksum.add( getRerunFailingTestsCount() );
checksum.add( getTempDir() );
- checksum.add( useJigsawModules() );
+ checksum.add( useModulePath() );
addPluginSpecificChecksumItems( checksum );
return checksum.getSha1();
}
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
index b3dc339..6903995 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
@@ -560,13 +560,13 @@ public class AbstractSurefireMojoJava7PlusTest
}
@Override
- protected boolean useJigsawModules()
+ protected boolean useModulePath()
{
return false;
}
@Override
- protected void setUseJigsawModules( boolean useJigsawModules )
+ protected void setUseModulePath( boolean useModulePath )
{
}
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
index 8514269..4ec49f4 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
@@ -705,13 +705,13 @@ public class AbstractSurefireMojoTest
}
@Override
- protected boolean useJigsawModules()
+ protected boolean useModulePath()
{
return false;
}
@Override
- protected void setUseJigsawModules( boolean useJigsawModules )
+ protected void setUseModulePath( boolean useModulePath )
{
}
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
index e555b00..f8ba15f 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
@@ -612,13 +612,13 @@ public class MojoMocklessTest
}
@Override
- protected boolean useJigsawModules()
+ protected boolean useModulePath()
{
return false;
}
@Override
- protected void setUseJigsawModules( boolean useJigsawModules )
+ protected void setUseModulePath( boolean useModulePath )
{
}
diff --git
a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
index 7fbbe20..6c86801 100644
---
a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
+++
b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
@@ -350,15 +350,15 @@ public class SurefirePlugin
private String shutdown;
/**
- * Disables Jigsaw (Java 9) modular path even if <i>module-info.java</i>
is used in project.
+ * Disables modular path (aka Jigsaw project since of Java 9) even if
<i>module-info.java</i> is used in project.
* <br>
* Enabled by default.
* If enabled, <i>module-info.java</i> exists and executes with JDK 9+,
modular path is used.
*
* @since 3.0.0-M2
*/
- @Parameter( property = "surefire.useJigsawModules", defaultValue = "true" )
- private boolean useJigsawModules;
+ @Parameter( property = "surefire.useModulePath", defaultValue = "true" )
+ private boolean useModulePath;
@Override
protected int getRerunFailingTestsCount()
@@ -714,15 +714,15 @@ public class SurefirePlugin
}
@Override
- protected boolean useJigsawModules()
+ protected boolean useModulePath()
{
- return useJigsawModules;
+ return useModulePath;
}
@Override
- protected void setUseJigsawModules( boolean useJigsawModules )
+ protected void setUseModulePath( boolean useModulePath )
{
- this.useJigsawModules = useJigsawModules;
+ this.useModulePath = useModulePath;
}
@Override
