Include maven on test artifact

jenkins-infra · Jun 22, 2024 · 1d85a7e · 1d85a7e
1 parent 7ee6417
commit 1d85a7e
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 1 deletion.
diff --git a/plugin-modernizer-cli/pom.xml b/plugin-modernizer-cli/pom.xml
@@ -12,7 +12,6 @@
     <artifactId>plugin-modernizer-cli</artifactId>
     <name>Plugin Modernizer CLI Interface</name>
 
-
     <dependencies>
         <dependency>
             <groupId>io.jenkins.plugin-modernizer</groupId>
@@ -44,10 +43,54 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>apache-maven</artifactId>
+            <scope>test</scope>
+            <classifier>bin</classifier>
+            <type>zip</type>
+            <version>${maven.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <environmentVariables>
+                        <MAVEN_HOME>${project.build.directory}/apache-maven-${maven.version}</MAVEN_HOME>
+                        <M2_HOME>${project.build.directory}/apache-maven-${maven.version}</M2_HOME>
+                    </environmentVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <phase>process-test-resources</phase>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.maven</groupId>
+                                    <artifactId>apache-maven</artifactId>
+                                    <classifier>bin</classifier>
+                                    <type>zip</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <!-- version specified in parent pom -->

diff --git a/...modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/config/Settings.java b/...modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/config/Settings.java
@@ -31,6 +31,9 @@ private static Path getDefaultMavenHome() {
         if (mavenHome == null) {
             mavenHome = System.getenv("M2_HOME");
         }
+        if (mavenHome == null) {
+            return null;
+        }
         return Path.of(mavenHome);
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -52,6 +52,7 @@
         <asm.version>9.7</asm.version>
         <gson.version>2.11.0</gson.version>
         <dataformat.version>2.16.1</dataformat.version>
+        <maven.version>3.9.8</maven.version>
     </properties>
 
     <repositories>