Integrate into maven's build

apache · Oct 27, 2024 · 99af354 · 99af354
1 parent 92a08b2
commit 99af354
Show file tree

Hide file tree

Showing 10 changed files with 92 additions and 42 deletions.
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
@@ -353,6 +353,34 @@ under the License.
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>run-its</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>create-distribution-dir</id>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <phase>package</phase>
+                <configuration>
+                  <finalName>./</finalName>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <attach>false</attach>
+                  <outputDirectory>${basedir}/target/maven</outputDirectory>
+                  <descriptors>
+                    <descriptor>src/assembly/dir.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>apache-release</id>
       <build>

diff --git a/its/.mvn/readme.txt b/its/.mvn/readme.txt
diff --git a/its/core-it-suite/pom.xml b/its/core-it-suite/pom.xml
@@ -580,6 +580,13 @@ under the License.
     <profile>
       <id>run-its</id>
       <dependencies>
+        <dependency>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>apache-maven</artifactId>
+          <version>4.0.0-beta-6-SNAPSHOT</version>
+          <classifier>bin</classifier>
+          <type>zip</type>
+        </dependency>
         <!-- not really used but will force download in the local repo used -->
         <dependency>
           <groupId>org.apache.maven.wagon</groupId>

diff --git a/...-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java b/...-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java
@@ -104,6 +104,7 @@ public static void serialize(Properties props, String key, Object value) {
         } else if (value instanceof Map) {
             Map map = (Map) value;
             props.setProperty(key, Integer.toString(map.size()));
+            @SuppressWarnings("checkstyle:UnusedLocalVariable")
             int i = 0;
             for (Iterator it = map.keySet().iterator(); it.hasNext(); i++) {
                 Object k = it.next();

diff --git a/...maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/PropertyUtil.java b/...maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/PropertyUtil.java
@@ -87,6 +87,7 @@ private static void store(Properties props, String key, Object obj, Collection v
             } else if (obj instanceof Map) {
                 Map map = (Map) obj;
                 props.put(key, Integer.toString(map.size()));
+                @SuppressWarnings("checkstyle:UnusedLocalVariable")
                 int index = 0;
                 for (Iterator it = map.entrySet().iterator(); it.hasNext(); index++) {
                     Map.Entry entry = (Map.Entry) it.next();

diff --git a/...aven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java b/...aven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java
@@ -47,6 +47,7 @@ public void execute() throws MojoExecutionException {
             throw new MojoExecutionException(e.getMessage(), e);
         }
         try {
+            @SuppressWarnings("checkstyle:UnusedLocalVariable")
             FileWagon theWagon = (FileWagon) fileWagon;
         } catch (ClassCastException e) {
             getLog().error("", e);
@@ -64,6 +65,7 @@ public void execute() throws MojoExecutionException {
             throw new MojoExecutionException(e.getMessage(), e);
         }
         try {
+            @SuppressWarnings("checkstyle:UnusedLocalVariable")
             ScpWagon theWagon = (ScpWagon) scpWagon;
         } catch (ClassCastException e) {
             getLog().error("", e);

diff --git a/its/core-it-support/core-it-plugins/mng7529-plugin/pom.xml b/its/core-it-support/core-it-plugins/mng7529-plugin/pom.xml
@@ -32,14 +32,14 @@ under the License.
   <name>Maven IT Plugin :: mng-7529 plugin</name>
 
   <properties>
-    <maven-version>3.6.0</maven-version>
+    <maven3-version>3.6.0</maven3-version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>${maven-version}</version>
+      <version>${maven3-version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -50,13 +50,13 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>${maven-version}</version>
+      <version>${maven3-version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>${maven-version}</version>
+      <version>${maven3-version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/...plugins/mng7529-plugin/src/main/java/org/apache/maven/its/mng7529/plugin/ResolveMojo.java b/...plugins/mng7529-plugin/src/main/java/org/apache/maven/its/mng7529/plugin/ResolveMojo.java
@@ -58,6 +58,7 @@ public void execute() throws MojoExecutionException {
             request.setMavenProject(project);
             request.setRepositorySession(buildingRequest.getRepositorySession());
 
+            @SuppressWarnings("checkstyle:UnusedLocalVariable")
             DependencyResolutionResult result = dependencyResolver.resolve(request);
 
             getLog().info("Resolution successful, resolved ok");

diff --git a/its/pom.xml b/its/pom.xml
@@ -22,9 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>41</version>
-    <relativePath />
+    <artifactId>maven</artifactId>
+    <version>4.0.0-beta-6-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.maven.its</groupId>
@@ -71,10 +70,10 @@ under the License.
     <maven.site.path>core-its</maven.site.path>
     <maven.site.cache>${user.home}/maven-sites</maven.site.cache>
     <rat.ignoreErrors>true</rat.ignoreErrors>
-    <maven.compiler.source>8</maven.compiler.source>
-    <maven.compiler.target>8</maven.compiler.target>
+    <!--    <maven.compiler.source>8</maven.compiler.source>-->
+    <!--    <maven.compiler.target>8</maven.compiler.target>-->
 
-    <maven-version>3.8.6</maven-version>
+    <maven-version>4.0.0-beta-6-SNAPSHOT</maven-version>
     <maven-plugin-tools-version>3.6.4</maven-plugin-tools-version>
   </properties>
 

diff --git a/pom.xml b/pom.xml
@@ -170,6 +170,8 @@ under the License.
     <wagonVersion>3.5.3</wagonVersion>
     <woodstoxVersion>7.1.0</woodstoxVersion>
     <xmlunitVersion>2.10.0</xmlunitVersion>
+    <!-- maven.version -->
+    <maven-version>${project.version}</maven-version>
   </properties>
 
   <!--bootstrap-start-comment-->
@@ -181,157 +183,157 @@ under the License.
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-artifact</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-builder-support</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-jline</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-logging</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-core</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-impl</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-embedder</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-cli</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-model</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-api-core</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-api-meta</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-api-model</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-api-settings</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-api-spi</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-api-toolchain</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-api-plugin</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-api-xml</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-api-di</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-api-metadata</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-api-cli</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-di</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-model-builder</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-api</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-repository-metadata</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-resolver-provider</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-settings</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-settings-builder</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-toolchain-model</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-toolchain-builder</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-xml</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-compat</artifactId>
-        <version>${project.version}</version>
+        <version>${maven-version}</version>
       </dependency>
       <!--bootstrap-end-comment-->
       <dependency>
@@ -788,6 +790,7 @@ under the License.</licenseText>
                 <exclude>src/test/resources*/**</exclude>
                 <exclude>src/test/projects/**</exclude>
                 <exclude>src/test/remote-repo/**</exclude>
+                <exclude>its/core-it-suite/src/test/resources/**</exclude>
                 <exclude>**/*.odg</exclude>
                 <exclude>**/*.svg</exclude>
                 <exclude>.asf.yaml</exclude>
@@ -1029,5 +1032,14 @@ under the License.</licenseText>
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>run-its</id>
+      <modules>
+        <module>its</module>
+      </modules>
+      <properties>
+        <mavenDistro>${session.rootDirectory}/apache-maven/target/apache-maven-${project.version}-bin.zip</mavenDistro>
+      </properties>
+    </profile>
   </profiles>
 </project>