You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/12/26 22:12:20 UTC
[maven-integration-testing] 01/01: [MNG-7640] Investigate which ITs really need to set system properties
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7640
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 73d1f446c229b1126b4ed546f81eaaf09b7ecf73
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Dec 26 23:12:08 2022 +0100
[MNG-7640] Investigate which ITs really need to set system properties
---
.../MavenITmng0294MergeGlobalAndUserSettingsTest.java | 17 +++--------------
.../it/MavenITmng0377PluginLookupFromPrefixTest.java | 2 +-
.../maven/it/MavenITmng0786ProfileAwareReactorTest.java | 4 ++--
...ITmng0848UserPropertyOverridesDefaultValueTest.java} | 6 +++---
.../it/MavenITmng2136ActiveByDefaultProfileTest.java | 4 ++--
.../maven/it/MavenITmng2305MultipleProxiesTest.java | 2 +-
.../it/MavenITmng2577SettingsXmlInterpolationTest.java | 4 ++--
...Tmng3004ReactorFailureBehaviorMultithreadedTest.java | 10 +++++-----
.../it/MavenITmng3379ParallelArtifactDownloadsTest.java | 2 +-
...ITmng4452ResolutionOfSnapshotWithClassifierTest.java | 12 ++++++------
...Tmng4469AuthenticatedDeploymentToCustomRepoTest.java | 12 ++++++------
...4590ImportedPomUsesSystemAndUserPropertiesTest.java} | 8 ++++----
...venITmng4615ValidateRequiredPluginParameterTest.java | 4 ++--
...ng4625SettingsXmlInterpolationWithXmlMarkupTest.java | 4 ++--
.../it/MavenITmng4765LocalPomProjectBuilderTest.java | 2 +-
...ConfigureCollectionArrayFromUserPropertiesTest.java} | 12 ++++++------
.../java/org/apache/maven/it/TestSuiteOrdering.java | 8 ++++----
core-it-suite/src/test/resources/mng-0848/pom.xml | 2 +-
core-it-suite/src/test/resources/mng-4590/pom.xml | 2 +-
.../apache/maven/its/mng4590/import/0.1/import-0.1.pom | 2 +-
.../src/test/resources/mng-4615/test-1/pom.xml | 2 +-
21 files changed, 55 insertions(+), 66 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
index 470b719ee..4c098b8e5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
@@ -57,20 +57,9 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "user-settings.xml" );
- if ( matchesVersionRange( "[2.1.0-M2,)" ) )
- {
- // dedicated CLI option only available since MNG-3914
- verifier.addCliOption( "--global-settings" );
- verifier.addCliOption( "global-settings.xml" );
- }
- else
- {
- verifier.setSystemProperty( "org.apache.maven.global-settings", "global-settings.xml" );
- }
- if ( matchesVersionRange( "(3.2.5,)" ) )
- {
- verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() );
- }
+ // dedicated CLI option only available since MNG-3914
+ verifier.addCliOption( "--global-settings" );
+ verifier.addCliOption( "global-settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
index b8060f153..7b4ad8c63 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
@@ -59,7 +59,7 @@ public class MavenITmng0377PluginLookupFromPrefixTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.setSystemProperty( "touch.outputFile", "target/file.txt" );
+ verifier.addCliArgument( "-Dtouch.outputFile=target/file.txt" );
verifier.executeGoal( "itprefix:touch" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
index be2f344fd..6e3a3e07d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
@@ -56,8 +56,8 @@ public class MavenITmng0786ProfileAwareReactorTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "sub1/target" );
verifier.deleteDirectory( "sub2/target" );
- verifier.setSystemProperty( "expression.outputFile", "target/expression.properties" );
- verifier.setSystemProperty( "activate", "anything" );
+ verifier.addCliArgument( "-Dexpression.outputFile=target/expression.properties" );
+ verifier.addCliArgument( "-Dactivate=anything" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.verifyFilePresent( "sub1/target/expression.properties" );
verifier.verifyFilePresent( "sub2/target/expression.properties" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
similarity index 91%
rename from core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java
rename to core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
index d4e4b9d07..d4295cef9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
@@ -33,11 +33,11 @@ import org.junit.jupiter.api.Test;
* @author Benjamin Bentmann
*
*/
-public class MavenITmng0848SystemPropOverridesDefaultValueTest
+public class MavenITmng0848UserPropertyOverridesDefaultValueTest
extends AbstractMavenIntegrationTestCase
{
- public MavenITmng0848SystemPropOverridesDefaultValueTest()
+ public MavenITmng0848UserPropertyOverridesDefaultValueTest()
{
super( ALL_MAVEN_VERSIONS );
}
@@ -56,7 +56,7 @@ public class MavenITmng0848SystemPropOverridesDefaultValueTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.setSystemProperty( "config.aliasDefaultExpressionParam", "PASSED" );
+ verifier.addCliArgument( "-Dconfig.aliasDefaultExpressionParam=PASSED" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
index 4319788d8..ef288952c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
@@ -56,8 +56,8 @@ public class MavenITmng2136ActiveByDefaultProfileTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.setSystemProperty( "expression.outputFile", new File( testDir, "target/expression.properties" ).getPath() );
- verifier.setSystemProperty( "expression.expressions", "project/properties" );
+ verifier.addCliArgument( "-Dexpression.outputFile=" + new File( testDir, "target/expression.properties" ).getPath() );
+ verifier.addCliArgument( "-Dexpression.expressions=project/properties" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
index 180c658a1..52e0b2210 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
@@ -114,7 +114,7 @@ public class MavenITmng2305MultipleProxiesTest
verifier.setSystemProperty( "javax.net.ssl.trustStore", storePath );
verifier.setSystemProperty( "javax.net.ssl.trustStorePassword", storePwd );
// disable concurrent downloading as not all wagons (e.g. wagon-lightweight-http) are thread-safe regarding proxy settings
- verifier.setSystemProperty( "maven.artifact.threads", "1" );
+ verifier.addCliArgument( "-Dmaven.artifact.threads=1" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java
index 5abfd7e17..fa8c397df 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java
@@ -68,7 +68,7 @@ public class MavenITmng2577SettingsXmlInterpolationTest
}
/**
- * Verify that the settings.xml can be interpolated using system properties.
+ * Verify that the settings.xml can be interpolated using user properties.
*
* @throws Exception in case of failure
*/
@@ -85,7 +85,7 @@ public class MavenITmng2577SettingsXmlInterpolationTest
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings-sys.xml" );
- verifier.setSystemProperty( "usr.MNGIT", "usr-prop-test" );
+ verifier.addCliArgument( "-Dusr.MNGIT=usr-prop-test" );
verifier.setLogFileName( "log-sys.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
index b1e7afdc8..fea6cdfff 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
@@ -61,7 +61,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.deleteDirectory( "subproject3/target" );
verifier.addCliOption( "--fail-fast" );
verifier.setLogFileName( "log-ff-mt1.txt" );
- verifier.setSystemProperty( "maven.threads.experimental", "1" );
+ verifier.addCliArgument( "-Dmaven.threads.experimental=1" );
try
{
@@ -100,7 +100,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.deleteDirectory( "subproject3/target" );
verifier.addCliOption( "--fail-never" );
verifier.setLogFileName( "log-fn-mt1.txt" );
- verifier.setSystemProperty( "maven.threads.experimental", "1" );
+ verifier.addCliArgument( "-Dmaven.threads.experimental=1" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.resetStreams();
@@ -131,7 +131,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.deleteDirectory( "subproject3/target" );
verifier.addCliOption( "--fail-at-end" );
verifier.setLogFileName( "log-fae-mt1.txt" );
- verifier.setSystemProperty( "maven.threads.experimental", "1" );
+ verifier.addCliArgument( "-Dmaven.threads.experimental=1" );
try
{
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
@@ -169,7 +169,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.deleteDirectory( "subproject3/target" );
verifier.addCliOption( "--fail-never" );
verifier.setLogFileName( "log-fn-mt2.txt" );
- verifier.setSystemProperty( "maven.threads.experimental", "2" );
+ verifier.addCliArgument( "-Dmaven.threads.experimental=2" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.resetStreams();
@@ -200,7 +200,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.deleteDirectory( "subproject3/target" );
verifier.addCliOption( "--fail-at-end" );
verifier.setLogFileName( "log-fae-mt2.txt" );
- verifier.setSystemProperty( "maven.threads.experimental", "2" );
+ verifier.addCliArgument( "-Dmaven.threads.experimental=2" );
try
{
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
index a2ebab894..0f8678bf5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
@@ -62,7 +62,7 @@ public class MavenITmng3379ParallelArtifactDownloadsTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.setSystemProperty( "maven.artifact.threads", "16" );
+ verifier.addCliArgument( "-Dmaven.artifact.threads=16" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
index e2ff43298..f37f9b09a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
@@ -59,18 +59,18 @@ public class MavenITmng4452ResolutionOfSnapshotWithClassifierTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4452" );
- verifier.setSystemProperty( "mng4452.type", "jar" );
- verifier.setSystemProperty( "mng4452.classifier", "unix" );
+ verifier.addCliArgument( "-Dmng4452.type=jar" );
+ verifier.addCliArgument( "-Dmng4452.classifier=unix" );
verifier.setLogFileName( "log-1.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.setSystemProperty( "mng4452.type", "jar" );
- verifier.setSystemProperty( "mng4452.classifier", "win" );
+ verifier.addCliArgument( "-Dmng4452.type=jar" );
+ verifier.addCliArgument( "-Dmng4452.classifier=win" );
verifier.setLogFileName( "log-2.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
- verifier.setSystemProperty( "mng4452.type", "war" );
- verifier.setSystemProperty( "mng4452.classifier", "win" );
+ verifier.addCliArgument( "-Dmng4452.type=war" );
+ verifier.addCliArgument( "-Dmng4452.classifier=win" );
verifier.setLogFileName( "log-3.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
index 6dcdd9400..86f8e1246 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
@@ -153,12 +153,12 @@ public class MavenITmng4469AuthenticatedDeploymentToCustomRepoTest
verifier.setAutoclean( false );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
- verifier.setSystemProperty( "file", "settings.xml" );
- verifier.setSystemProperty( "groupId", "org.apache.maven.its.mng4469" );
- verifier.setSystemProperty( "artifactId", "it" );
- verifier.setSystemProperty( "version", "0.1" );
- verifier.setSystemProperty( "repositoryId", "mng4469" );
- verifier.setSystemProperty( "repositoryUrl", "http://localhost:" + port + "/repo" );
+ verifier.addCliArgument( "-Dfile=settings.xml" );
+ verifier.addCliArgument( "-DgroupId=org.apache.maven.its.mng4469" );
+ verifier.addCliArgument( "-DartifactId=it" );
+ verifier.addCliArgument( "-Dversion=0.1" );
+ verifier.addCliArgument( "-DrepositoryId=mng4469" );
+ verifier.addCliArgument( "-DrepositoryUrl=http://localhost:" + port + "/repo" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-artifact:2.1-SNAPSHOT:deploy-file" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
similarity index 88%
rename from core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
rename to core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
index 80fad4085..6172373fe 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
@@ -32,17 +32,17 @@ import org.junit.jupiter.api.Test;
*
* @author Benjamin Bentmann
*/
-public class MavenITmng4590ImportedPomUsesSystemPropertiesTest
+public class MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest
extends AbstractMavenIntegrationTestCase
{
- public MavenITmng4590ImportedPomUsesSystemPropertiesTest()
+ public MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest()
{
super( "[2.0.9,3.0-alpha-1),[3.0-beta-1,)" );
}
/**
- * Verify that imported POMs are processed using the same execution properties as the importing POM.
+ * Verify that imported POMs are processed using the same system/user properties as the importing POM.
*
* @throws Exception in case of failure
*/
@@ -58,7 +58,7 @@ public class MavenITmng4590ImportedPomUsesSystemPropertiesTest
verifier.deleteArtifacts( "org.apache.maven.its.mng4590" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.setEnvironmentVariable( "MAVEN_OPTS", "-Dtest.file=pom.xml" );
- verifier.setSystemProperty( "test.dir", testDir.getAbsolutePath() );
+ verifier.addCliArgument( "-Dtest.dir=" + testDir.getAbsolutePath() );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java
index eaef9219e..0b25aa49e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java
@@ -98,7 +98,7 @@ public class MavenITmng4615ValidateRequiredPluginParameterTest
/**
* Verify that Maven validates required mojo parameters (and doesn't just have the plugins die with NPEs).
- * This scenario checks the case of a parameter having its backing system property set.
+ * This scenario checks the case of a parameter having its backing user property set.
*
* @throws Exception in case of failure
*/
@@ -111,7 +111,7 @@ public class MavenITmng4615ValidateRequiredPluginParameterTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.setSystemProperty( "config.requiredParam", "CLI" );
+ verifier.addCliArgument( "-Dconfig.requiredParam=CLI" );
verifier.setLogFileName( "log-b.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
index 2094c546c..a6274673d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
@@ -63,12 +63,12 @@ public class MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest
// Directly called from commandline succeeds, indirect often fails
if( Os.isFamily( Os.FAMILY_WINDOWS ) && !System.getProperties().contains( "CLASSWORLDS_LAUNCHER" ) )
{
- verifier.setSystemProperty( "test.prop", "\"&x=y<>\"" );
+ verifier.addCliArgument( "-Dtest.prop=\"&x=y<>\"" );
verifier.setForkJvm( true ); // force forked JVM, since the workaround expects forked run
}
else
{
- verifier.setSystemProperty( "test.prop", "&x=y<>" );
+ verifier.addCliArgument( "-Dtest.prop=&x=y<>" );
}
verifier.addCliOption( "--settings" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java
index 23f5685d7..53ef13fbf 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java
@@ -55,7 +55,7 @@ public class MavenITmng4765LocalPomProjectBuilderTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.setSystemProperty( "user.prop", "OK" );
+ verifier.addCliArgument( "-Duser.prop=OK" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java
similarity index 87%
rename from core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java
rename to core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java
index 02bf288de..90e1e3421 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java
@@ -30,17 +30,17 @@ import org.junit.jupiter.api.Test;
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-5011">MNG-5011</a>.
*/
-public class MavenITmng5011ConfigureCollectionArrayFromSystemPropTest
+public class MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest
extends AbstractMavenIntegrationTestCase
{
- public MavenITmng5011ConfigureCollectionArrayFromSystemPropTest()
+ public MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest()
{
super( "[3.0.3,)" );
}
/**
- * Verify that plugin parameters of type array/collection can be configured using system properties from the CLI.
+ * Verify that plugin parameters of type array/collection can be configured using user properties from the CLI.
*
* @throws Exception in case of failure
*/
@@ -53,9 +53,9 @@ public class MavenITmng5011ConfigureCollectionArrayFromSystemPropTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.setSystemProperty( "config.stringParams", "" );
- verifier.setSystemProperty( "config.fileParams", "foo,bar" );
- verifier.setSystemProperty( "config.listParam", ",two,,four," );
+ verifier.addCliArgument( "-Dconfig.stringParams=" );
+ verifier.addCliArgument( "-Dconfig.fileParams=foo,bar" );
+ verifier.addCliArgument( "-Dconfig.listParam=,two,,four," );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
index 24e73640e..26697d9fb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.ClassOrdererContext;
/**
* The Core IT suite.
*/
-public class TestSuiteOrdering implements ClassOrderer
+public class TestSuiteOrdering implements ClassOrderer
{
private static PrintStream out = System.out;
@@ -208,7 +208,7 @@ public class TestSuiteOrdering implements ClassOrderer
suite.addTestSuite( MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.class );
suite.addTestSuite( MavenITmng5013ConfigureParamBeanFromScalarValueTest.class );
suite.addTestSuite( MavenITmng5012CollectionVsArrayParamCoercionTest.class );
- suite.addTestSuite( MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class );
+ suite.addTestSuite( MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.class );
suite.addTestSuite( MavenITmng5009AggregationCycleTest.class );
suite.addTestSuite( MavenITmng5006VersionRangeDependencyParentResolutionTest.class );
suite.addTestSuite( MavenITmng5000ChildPathAwareUrlInheritanceTest.class );
@@ -276,7 +276,7 @@ public class TestSuiteOrdering implements ClassOrderer
suite.addTestSuite( MavenITmng4618AggregatorBuiltAfterModulesTest.class );
suite.addTestSuite( MavenITmng4615ValidateRequiredPluginParameterTest.class );
suite.addTestSuite( MavenITmng4600DependencyOptionalFlagManagementTest.class );
- suite.addTestSuite( MavenITmng4590ImportedPomUsesSystemPropertiesTest.class );
+ suite.addTestSuite( MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.class );
suite.addTestSuite( MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.class );
suite.addTestSuite( MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.class );
suite.addTestSuite( MavenITmng4572ModelVersionSurroundedByWhitespaceTest.class );
@@ -650,7 +650,7 @@ public class TestSuiteOrdering implements ClassOrderer
suite.addTestSuite( MavenITmng0947OptionalDependencyTest.class );
suite.addTestSuite( MavenITmng0870ReactorAwarePluginDiscoveryTest.class );
suite.addTestSuite( MavenITmng0866EvaluateDefaultValueTest.class );
- suite.addTestSuite( MavenITmng0848SystemPropOverridesDefaultValueTest.class );
+ suite.addTestSuite( MavenITmng0848UserPropertyOverridesDefaultValueTest.class );
suite.addTestSuite( MavenITmng0836PluginParentResolutionTest.class );
suite.addTestSuite( MavenITmng0828PluginConfigValuesInDebugTest.class );
suite.addTestSuite( MavenITmng0823MojoContextPassingTest.class );
diff --git a/core-it-suite/src/test/resources/mng-0848/pom.xml b/core-it-suite/src/test/resources/mng-0848/pom.xml
index 62315c8c4..cc202f496 100644
--- a/core-it-suite/src/test/resources/mng-0848/pom.xml
+++ b/core-it-suite/src/test/resources/mng-0848/pom.xml
@@ -28,7 +28,7 @@ under the License.
<name>Maven Integration Test :: MNG-848</name>
<description>
- Test that execution/system properties take precedence over default value of plugin parameters.
+ Test that user properties take precedence over default value of plugin parameters.
</description>
<build>
diff --git a/core-it-suite/src/test/resources/mng-4590/pom.xml b/core-it-suite/src/test/resources/mng-4590/pom.xml
index 53234896c..6300edf08 100644
--- a/core-it-suite/src/test/resources/mng-4590/pom.xml
+++ b/core-it-suite/src/test/resources/mng-4590/pom.xml
@@ -29,7 +29,7 @@ under the License.
<name>Maven Integration Test :: MNG-4590</name>
<description>
- Verify that imported POMs are processed using the same execution properties as the importing POM.
+ Verify that imported POMs are processed using the same system/user properties as the importing POM.
</description>
<dependencyManagement>
diff --git a/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/mng4590/import/0.1/import-0.1.pom b/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/mng4590/import/0.1/import-0.1.pom
index 2e0c7f8cc..3ef19715b 100644
--- a/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/mng4590/import/0.1/import-0.1.pom
+++ b/core-it-suite/src/test/resources/mng-4590/repo/org/apache/maven/its/mng4590/import/0.1/import-0.1.pom
@@ -28,7 +28,7 @@ under the License.
<name>Maven Integration Test :: MNG-4590</name>
<description>
- Verify that imported POMs are processed using the same execution properties as the importing POM.
+ Verify that imported POMs are processed using the same system/user properties as the importing POM.
</description>
<properties>
diff --git a/core-it-suite/src/test/resources/mng-4615/test-1/pom.xml b/core-it-suite/src/test/resources/mng-4615/test-1/pom.xml
index 243a7f621..de026eb0a 100644
--- a/core-it-suite/src/test/resources/mng-4615/test-1/pom.xml
+++ b/core-it-suite/src/test/resources/mng-4615/test-1/pom.xml
@@ -30,7 +30,7 @@ under the License.
<name>Maven Integration Test :: MNG-4615</name>
<description>
Verify that Maven validates required mojo parameters (and doesn't just have the plugins die with NPEs).
- This scenario checks the case of a parameter missing its backing system property.
+ This scenario checks the case of a parameter missing its backing user property.
</description>
<build>