[MASSEMBLY-1000] ITs - cleanups

- remove property testVersion - use it-project-parent in all ITs - bind versions for standard plugins in it-project-parent
apache · Nov 12, 2023 · 00a986e · 00a986e
1 parent 52e1fa6
commit 00a986e
Show file tree

Hide file tree

Showing 63 changed files with 261 additions and 143 deletions.
diff --git a/pom.xml b/pom.xml
@@ -365,7 +365,6 @@ under the License.
       <id>run-its</id>
       <properties>
         <test.remote.repo.url>file://${project.build.testOutputDirectory}/remote-repository</test.remote.repo.url>
-        <testVersion>${project.version}</testVersion>
       </properties>
 
       <build>
@@ -374,9 +373,6 @@ under the License.
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
             <configuration>
-              <properties>
-                <testVersion>${testVersion}</testVersion>
-              </properties>
               <showVersion>true</showVersion>
             </configuration>
             <dependencies>

diff --git a/src/it/it-project-parent/pom.xml b/src/it/it-project-parent/pom.xml
@@ -33,11 +33,36 @@ under the License.
           <artifactId>maven-assembly-plugin</artifactId>
           <version>@project.version@</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>@version.maven-clean-plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>@version.maven-compiler-plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>@version.maven-deploy-plugin@</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
           <version>@version.maven-jar-plugin@</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>@version.maven-install-plugin@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>@version.maven-resources-plugin@</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>

diff --git a/src/it/projects/basic-features/add-classpath/invoker.properties b/src/it/projects/basic-features/add-classpath/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/classpath-descriptor/invoker.properties b/src/it/projects/basic-features/classpath-descriptor/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties b/src/it/projects/basic-features/descriptorDirectoryScan/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties b/src/it/projects/basic-features/file-copyIntoTopDir/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/file-sameName/invoker.properties b/src/it/projects/basic-features/file-sameName/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/formats-zstd/invoker.properties b/src/it/projects/basic-features/formats-zstd/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/formats/invoker.properties b/src/it/projects/basic-features/formats/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/local-repo-interp/pom.xml b/src/it/projects/basic-features/local-repo-interp/pom.xml
@@ -29,7 +29,11 @@ under the License.
   <groupId>test</groupId>
   <artifactId>test</artifactId>
   <version>1</version>
-
+
+  <properties>
+    <testVersion>@project.version@</testVersion>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

diff --git a/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties b/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties b/src/it/projects/basic-features/massembly-351-projectPrefixInterp/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties b/src/it/projects/basic-features/outputFileNameMapping-simple/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/.../projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties b/.../projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/bugs/massembly-324/pom.xml b/src/it/projects/bugs/massembly-324/pom.xml
@@ -21,16 +21,22 @@ under the License.
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.maven.plugin.assembly.test</groupId>
+		<artifactId>it-project-parent</artifactId>
+		<version>1</version>
+	</parent>
+
 	<groupId>mygroup</groupId>
 	<artifactId>project2</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-        <packaging>jar</packaging>
+	<packaging>jar</packaging>
 
 	<build>
 		<plugins>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${testVersion}</version>
 				<configuration>
 					<descriptors>
 						<descriptor>assembly.xml</descriptor>

diff --git a/src/it/projects/bugs/massembly-559/pom.xml b/src/it/projects/bugs/massembly-559/pom.xml
@@ -19,6 +19,13 @@ under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.maven.plugin.assembly.test</groupId>
+		<artifactId>it-project-parent</artifactId>
+		<version>1</version>
+	</parent>
+
 	<groupId>test</groupId>
 	<artifactId>test-assembly-transitive-bug</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
@@ -37,7 +44,6 @@ under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${testVersion}</version>
 				<executions>
 					<execution>
 						<id>create-assembly</id>

diff --git a/src/it/projects/bugs/massembly-580/pom.xml b/src/it/projects/bugs/massembly-580/pom.xml
@@ -20,6 +20,12 @@ under the License.
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>org.apache.maven.plugin.assembly.test</groupId>
+        <artifactId>it-project-parent</artifactId>
+        <version>1</version>
+    </parent>
+
     <groupId>com.sulake.maven</groupId>
     <artifactId>directory-mode-ignored</artifactId>
     <version>10-SNAPSHOT</version>
@@ -43,7 +49,6 @@ under the License.
         <plugins>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>${testVersion}</version>
                 <configuration>
                     <finalName>project-deploy</finalName>
                     <appendAssemblyId>false</appendAssemblyId>

diff --git a/src/it/projects/bugs/massembly-583/child1/pom.xml b/src/it/projects/bugs/massembly-583/child1/pom.xml
@@ -21,7 +21,12 @@ under the License.
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>mygroup</groupId>
+	<parent>
+		<groupId>mygroup</groupId>
+		<artifactId>parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+
 	<artifactId>project1</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 

diff --git a/src/it/projects/bugs/massembly-583/child2/pom.xml b/src/it/projects/bugs/massembly-583/child2/pom.xml
@@ -21,7 +21,12 @@ under the License.
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>mygroup</groupId>
+	<parent>
+		<groupId>mygroup</groupId>
+		<artifactId>parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+
 	<artifactId>project2</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 
@@ -45,7 +50,6 @@ under the License.
 		<plugins>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${testVersion}</version>
 				<configuration>
 					<descriptors>
 						<descriptor>src/main/assembly/assembly.xml</descriptor>

diff --git a/src/it/projects/bugs/massembly-583/pom.xml b/src/it/projects/bugs/massembly-583/pom.xml
@@ -20,10 +20,16 @@ under the License.
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-
+
+	<parent>
+		<groupId>org.apache.maven.plugin.assembly.test</groupId>
+		<artifactId>it-project-parent</artifactId>
+		<version>1</version>
+	</parent>
+
 	<groupId>mygroup</groupId>
 	<artifactId>parent</artifactId>
-	<version>0.0.1</version>
+	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>

diff --git a/src/it/projects/bugs/massembly-730/pom.xml b/src/it/projects/bugs/massembly-730/pom.xml
@@ -20,6 +20,12 @@ under the License.
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
+	<parent>
+		<groupId>org.apache.maven.plugin.assembly.test</groupId>
+		<artifactId>it-project-parent</artifactId>
+		<version>1</version>
+	</parent>
+
 	<groupId>fr.husta.test</groupId>
 	<artifactId>issue-mvn-assembly-plugin-730</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
@@ -39,8 +45,6 @@ under the License.
 
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${testVersion}</version>
-				<!-- <version>2.4.1</version> -->
 				<configuration>
 				</configuration>
 				<executions>
@@ -59,15 +63,9 @@ under the License.
 				</executions>
 			</plugin>
 
-			<plugin>
-                        	<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.5.1</version>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.18</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>

diff --git a/src/it/projects/bugs/massembly-731/pom.xml b/src/it/projects/bugs/massembly-731/pom.xml
@@ -21,6 +21,13 @@ under the License.
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.maven.plugin.assembly.test</groupId>
+		<artifactId>it-project-parent</artifactId>
+		<version>1</version>
+	</parent>
+
 	<groupId>mygroup</groupId>
 	<artifactId>project2</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
@@ -29,7 +36,6 @@ under the License.
 		<plugins>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${testVersion}</version>
 				<configuration>
 					<descriptors>
 						<descriptor>assembly.xml</descriptor>

diff --git a/src/it/projects/bugs/massembly-732/pom.xml b/src/it/projects/bugs/massembly-732/pom.xml
@@ -21,16 +21,22 @@ under the License.
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.maven.plugin.assembly.test</groupId>
+		<artifactId>it-project-parent</artifactId>
+		<version>1</version>
+	</parent>
+
 	<groupId>mygroup</groupId>
 	<artifactId>project2</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-        <packaging>jar</packaging>
+	<packaging>jar</packaging>
 
 	<build>
 		<plugins>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${testVersion}</version>
 				<configuration>
 					<descriptors>
 						<descriptor>assembly.xml</descriptor>

diff --git a/src/it/projects/bugs/massembly-733/pom.xml b/src/it/projects/bugs/massembly-733/pom.xml
@@ -20,6 +20,13 @@ under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.plugin.assembly.test</groupId>
+    <artifactId>it-project-parent</artifactId>
+    <version>1</version>
+  </parent>
+
   <groupId>localhost</groupId>
   <artifactId>MASSEMBLY-733</artifactId>
   <version>1.0-SNAPSHOT</version>
@@ -31,7 +38,6 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>${testVersion}</version>
           <executions>
             <execution>
               <phase>package</phase>

diff --git a/src/it/projects/bugs/massembly-737/pom.xml b/src/it/projects/bugs/massembly-737/pom.xml
@@ -29,18 +29,12 @@ under the License.
 	<packaging>war</packaging>
 
 	<build>
-		<defaultGoal>package</defaultGoal>
 		<pluginManagement>
 			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-assembly-plugin</artifactId>
-					<version>${testVersion}</version>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-war-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>@version.maven-war-plugin@</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>

diff --git a/src/it/projects/bugs/massembly-743/invoker.properties b/src/it/projects/bugs/massembly-743/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:single
+invoker.goals=clean org.apache.maven.plugins:maven-assembly-plugin:${project.version}:single
diff --git a/src/it/projects/bugs/massembly-743/pom.xml b/src/it/projects/bugs/massembly-743/pom.xml
@@ -41,7 +41,6 @@ under the License.
 				<inherited>true</inherited>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>${testVersion}</version>
 				<!-- The configuration of the plugin -->
 				<configuration>
 					<!-- Specifies the configuration file of the assembly plugin -->