You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/01/26 19:25:48 UTC
[maven-integration-testing] branch MNG-5669 updated: [MNG-5669]
Path to javaagent jar fixed by filtering in test
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-5669
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/MNG-5669 by this push:
new a724040 [MNG-5669] Path to javaagent jar fixed by filtering in test
a724040 is described below
commit a724040ffb3087c69ef252dcfc27290f61fab017
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Jan 26 19:28:08 2020 +0100
[MNG-5669] Path to javaagent jar fixed by filtering in test
---
.gitignore | 2 +-
.../java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java | 10 ++++++++--
.../src/test/resources/mng-5669-read-poms-once/.mvn/jvm.config | 2 +-
run-its.bat | 5 ++---
run-its.sh | 5 ++---
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index a8e3944..c00d32a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
.svn
target
-/.repository
+/repo
.project
.classpath
.settings
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
index 24b9147..8353d3a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
@@ -21,8 +21,10 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.maven.it.util.ResourceExtractor;
@@ -46,10 +48,14 @@ public class MavenITmng5669ReadPomsOnce
public void test()
throws Exception
{
- // prepare JAvaAgent
+ // prepare JavaAgent
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5669-read-poms-once" );
-
Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
+ Map<String, String> filterProperties =
+ Collections.singletonMap( "${javaAgentJar}",
+ verifier.getArtifactPath( "mng-coreit", "javaagent", "1.0-SNAPSHOT", "jar" ) );
+ verifier.filterFile( ".mvn/jvm.config", ".mvn/jvm.config", null, filterProperties );
+
verifier.setForkJvm( true ); // pick up agent
verifier.setMavenDebug( false );
verifier.setAutoclean( false );
diff --git a/core-it-suite/src/test/resources/mng-5669-read-poms-once/.mvn/jvm.config b/core-it-suite/src/test/resources/mng-5669-read-poms-once/.mvn/jvm.config
index 1c01bbe..faba2c1 100644
--- a/core-it-suite/src/test/resources/mng-5669-read-poms-once/.mvn/jvm.config
+++ b/core-it-suite/src/test/resources/mng-5669-read-poms-once/.mvn/jvm.config
@@ -1 +1 @@
--javaagent:../../../../.repository/mng-coreit/javaagent/1.0-SNAPSHOT/javaagent-1.0-SNAPSHOT.jar
\ No newline at end of file
+-javaagent:${javaAgentJar}
\ No newline at end of file
diff --git a/run-its.bat b/run-its.bat
index 773af99..7fbbbb3 100644
--- a/run-its.bat
+++ b/run-its.bat
@@ -18,10 +18,9 @@
@REM
@REM How JvZ runs the ITs from a clean slate if it would be on Windows
-@REM maven.repo.local should match mavenLocalRepo in maven/Jenkinsfile
-mvn clean install -Prun-its,embedded -Dmaven.repo.local=%cd%\.repository
+mvn clean install -Prun-its,embedded -Dmaven.repo.local=%cd%\repo
@REM If behind a proxy try this..
-@REM mvn clean install -Prun-its,embedded -Dmaven.repo.local=%cd%\.repository -Dproxy.host=<host> -Dproxy.port=<port> -Dproxy.user= -Dproxy.pass= -Dproxy.nonProxyHosts=<hosts>
+@REM mvn clean install -Prun-its,embedded -Dmaven.repo.local=%cd%\repo -Dproxy.host=<host> -Dproxy.port=<port> -Dproxy.user= -Dproxy.pass= -Dproxy.nonProxyHosts=<hosts>
diff --git a/run-its.sh b/run-its.sh
index f6fc095..d13fce6 100755
--- a/run-its.sh
+++ b/run-its.sh
@@ -20,10 +20,9 @@
#
# How I run the ITs from a clean slate. Though I do this with a primed Nexus instance. JvZ.
-# maven.repo.local should match mavenLocalRepo in maven/Jenkinsfile
-mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/.repository
+mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo
# If behind a proxy try this
-# mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/.repository -Dproxy.host=<host> -Dproxy.port=<port> -Dproxy.user= -Dproxy.pass= -Dproxy.nonProxyHosts=<hosts>
+# mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo -Dproxy.host=<host> -Dproxy.port=<port> -Dproxy.user= -Dproxy.pass= -Dproxy.nonProxyHosts=<hosts>