You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/03/14 22:04:45 UTC

[maven-verifier] branch test-m-home created (now e9eb127)

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

sjaranowski pushed a change to branch test-m-home
in repository https://gitbox.apache.org/repos/asf/maven-verifier.git.


      at e9eb127  Test Embedded3xLauncher with Maven Home

This branch includes the following new commits:

     new e9eb127  Test Embedded3xLauncher with Maven Home

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


[maven-verifier] 01/01: Test Embedded3xLauncher with Maven Home

Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a commit to branch test-m-home
in repository https://gitbox.apache.org/repos/asf/maven-verifier.git

commit e9eb1275963e6a2789276a35516309fcb32905ae
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Mon Mar 14 23:04:25 2022 +0100

    Test Embedded3xLauncher with Maven Home
---
 pom.xml                                            |  9 +++++
 src/site/markdown/getting-started.md               | 39 ++++++++++++++++------
 .../apache/maven/it/Embedded3xLauncherTest.java    | 22 +++++++++---
 3 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index b45c088..46cd5dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,15 @@
             </excludes>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+            <systemPropertyVariables>
+              <maven.home>${maven.home}</maven.home>
+            </systemPropertyVariables>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
diff --git a/src/site/markdown/getting-started.md b/src/site/markdown/getting-started.md
index 6290c35..fc1f620 100644
--- a/src/site/markdown/getting-started.md
+++ b/src/site/markdown/getting-started.md
@@ -63,9 +63,35 @@ The following mechanism determines the binary which is used for executing Maven.
 
 Whether the embedded or the forked launcher are used depends on the field `forkJvm` set through the constructor or `setForkJvm` or as fallback on the value of system property `verifier.forkMode`.
 
+### Determining Maven Home Directory
+
+The following directories are considered as potential Maven home directory (relevant for both forked launcher and embedded launcher with  [Plexus Classworlds Loader][plexus-classwords]). The first existing directory from the list is used.
+
+1. Maven Home path given in the constructor
+2. System property `maven.home`
+3. Environment variable `M2_HOME`
+4. System property `user.home` suffixed with `/m2` (only considered if it contains `bin/mvn`)
+
+### Setting Maven Home for Embedded Launcher
+
+In order to pass `Maven Home` used for executing project itself to tests execution, `maven-surefire` can be configured like:
+
+```
+  <plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-surefire-plugin</artifactId>
+    <configuration>
+      <systemPropertyVariables>
+        <maven.home>${maven.home}</maven.home>
+      </systemPropertyVariables>
+    </configuration>
+  </plugin>
+```
+
 ### Class Path For Embedded Launcher
 
-To use the embedded launcher it is important that some artifacts are in the class path. For the Context Class Loader case this would mean the following dependencies are needed at least (for Maven 3.8.4):
+In case when `Maven Home Directory` can not be determined, to use the embedded launcher it is important that some artifacts are in the class path. 
+For the Context Class Loader case this would mean the following dependencies are needed at least (for Maven 3.8.4):
 
 ```
 <!-- embedder for testing Embedded3xLauncher with classpath -->
@@ -103,15 +129,6 @@ To use the embedded launcher it is important that some artifacts are in the clas
 </dependency>
 ```
 
-### Determining Maven Home Directory
-
-The following directories are considered as potential Maven home directory (relevant for both forked launcher and embedded launcher with  [Plexus Classworlds Loader][plexus-classwords]). The first existing directory from the list is used. 
-
-1. Maven Home path given in the constructor
-2. System property `maven.home`
-3. Environment variable `M2_HOME`
-4. System property `user.home` suffixed with `/m2` (only considered if it contains `bin/mvn`)
-
 ## Run
 
 Calling `executeGoals` runs Maven with the given goals or phases and optionally some additional environment variables. It throws a `VerificationException` in case the execution is not successful (e.g. binary not found or exit code > 0). It is either using a forked JVM or is executed in the same JVM depending on the configuration.
@@ -130,4 +147,4 @@ The main method `verify(boolean)` takes into consideration a file named `expecte
 verifier.verify( true ); // if true, throws an exception in case of errors in the build log
 ```
 
-[plexus-classwords]: https://codehaus-plexus.github.io/plexus-classworlds/launcher.html
\ No newline at end of file
+[plexus-classwords]: https://codehaus-plexus.github.io/plexus-classworlds/launcher.html
diff --git a/src/test/java/org/apache/maven/it/Embedded3xLauncherTest.java b/src/test/java/org/apache/maven/it/Embedded3xLauncherTest.java
index af99d9d..334e51d 100644
--- a/src/test/java/org/apache/maven/it/Embedded3xLauncherTest.java
+++ b/src/test/java/org/apache/maven/it/Embedded3xLauncherTest.java
@@ -19,9 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -31,19 +28,34 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
 public class Embedded3xLauncherTest
 {
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-    private Embedded3xLauncher launcher;
 
     private final String workingDir = Paths.get( "src/test/resources" ).toAbsolutePath().toString();
 
     @Test
     public void testWithClasspath() throws Exception
     {
-        launcher = Embedded3xLauncher.createFromClasspath();
+        MavenLauncher launcher = Embedded3xLauncher.createFromClasspath();
+        runLauncher( launcher );
+    }
+
+    @Test
+    public void testWithMavenHome() throws Exception
+    {
+        MavenLauncher launcher = Embedded3xLauncher.createFromMavenHome(
+            System.getProperty( "maven.home" ), null, null );
+        runLauncher( launcher );
+    }
+
+    private void runLauncher(MavenLauncher launcher) throws Exception
+    {
         File logFile = temporaryFolder.newFile( "build.log" );
 
         int exitCode = launcher.run( new String[] {"clean"}, new Properties(), workingDir, logFile );