[maven-integration-testing] branch MNG-6714 updated: Replace usage environment variables

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MNG-6714
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git


The following commit(s) were added to refs/heads/MNG-6714 by this push:
     new 5672348  Replace usage environment variables
5672348 is described below

commit 56723488f3f85ede92028a61f411174a9bb6c252
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sat Jul 27 17:44:17 2019 +0200

    Replace usage environment variables
---
 .../maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java    | 2 +-
 .../org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java   | 3 ++-
 core-it-suite/src/test/resources/mng-4747/.mvn/jvm.config              | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

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/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
index 21d8eb8..1a48100 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/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java
@@ -52,7 +52,7 @@ public class MavenITmng4590ImportedPomUsesSystemPropertiesTest
         verifier.deleteDirectory( "target" );
         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.file", "pom.xml" );
         verifier.setSystemProperty( "test.dir", testDir.getAbsolutePath() );
         verifier.addCliOption( "--settings" );
         verifier.addCliOption( "settings.xml" );
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
index 1c3e067..906bb32 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java
@@ -53,6 +53,8 @@ public class MavenITmng4747JavaAgentUsedByPluginTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
+        
+        // Used for M3.3.1-, otherwise .mvn/jvm.config is used
         verifier.setEnvironmentVariable( "MAVEN_OPTS", "-javaagent:agent.jar" 
);
         verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
@@ -63,5 +65,4 @@ public class MavenITmng4747JavaAgentUsedByPluginTest
         assertNotNull( props1.get( "Mng4747Agent" ) );
         assertEquals( props1.get( "Mng4747Agent" ), props2.get( "Mng4747Agent" 
) );
     }
-
 }
diff --git a/core-it-suite/src/test/resources/mng-4747/.mvn/jvm.config 
b/core-it-suite/src/test/resources/mng-4747/.mvn/jvm.config
new file mode 100644
index 0000000..ab3fa03
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-4747/.mvn/jvm.config
@@ -0,0 +1 @@
+-javaagent:agent.jar
\ No newline at end of file