From d1efcdaee4fc1a448deeb93c13f8f8fdd1428fcb Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Wed, 25 Oct 2023 23:07:03 +0200
Subject: [PATCH] [MASSEMBLY-1000] ITs - cleanups, refresh plugins versions

---
 src/it/it-project-parent/pom.xml                          | 4 ++--
 .../src/main/assembly/myassembly.xml                      | 2 +-
 .../src/main/assembly/myassembly.xml                      | 2 +-
 .../bugs/massembly-285/massembly-285-assembly/pom.xml     | 8 ++++----
 .../depMgmt-override/child/src/assembly/bundle.xml        | 1 -
 .../projects/multimodule/massembly-474/descriptor/pom.xml | 2 +-
 .../projects/multimodule/massembly-619/descriptor/pom.xml | 2 +-
 src/it/projects/reproducible/pom.xml                      | 3 ++-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/it/it-project-parent/pom.xml b/src/it/it-project-parent/pom.xml
index 45731dbcf..5d7157a63 100644
--- a/src/it/it-project-parent/pom.xml
+++ b/src/it/it-project-parent/pom.xml
@@ -36,12 +36,12 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>@version.maven-jar-plugin@</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.1</version>
+          <version>@version.maven-surefire@</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/assembly/myassembly.xml b/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/assembly/myassembly.xml
index 14863424d..db6c81d1a 100644
--- a/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/assembly/myassembly.xml
+++ b/src/it/projects/basic-features/massembly-256-pomPropertiesInterp/src/main/assembly/myassembly.xml
@@ -35,7 +35,7 @@ under the License.
         </fileSet>
         <fileSet>
             <directory>src/main/files</directory>
-            <outputDirectory>${pom.properties.fileLocation2}</outputDirectory>
+            <outputDirectory>${project.properties.fileLocation2}</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>src/main/files</directory>
diff --git a/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml b/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml
index c798ed3a5..b31859a42 100644
--- a/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml
+++ b/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml
@@ -40,7 +40,7 @@ under the License.
             <directory>src/main/files</directory>
             <outputDirectory>files</outputDirectory>
             <includes>
-              <include>${pom.artifactId}2.file</include>
+              <include>${project.artifactId}2.file</include>
             </includes>
         </fileSet>
         <fileSet>
diff --git a/src/it/projects/bugs/massembly-285/massembly-285-assembly/pom.xml b/src/it/projects/bugs/massembly-285/massembly-285-assembly/pom.xml
index ca6e16b18..acc1750f1 100644
--- a/src/it/projects/bugs/massembly-285/massembly-285-assembly/pom.xml
+++ b/src/it/projects/bugs/massembly-285/massembly-285-assembly/pom.xml
@@ -32,13 +32,13 @@ under the License.
   
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>${pom.parent.artifactId}-mod1</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>${project.parent.artifactId}-mod1</artifactId>
       <version>1</version>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>${pom.parent.artifactId}-mod2</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>${project.parent.artifactId}-mod2</artifactId>
       <version>1</version>
     </dependency>
   </dependencies>
diff --git a/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml b/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml
index 7ab391b44..03612616c 100644
--- a/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml
+++ b/src/it/projects/dependency-sets/depMgmt-override/child/src/assembly/bundle.xml
@@ -19,7 +19,6 @@ under the License.
 -->
 
 <assembly>
-  <!-- TODO: Change ${pom.*} references to ${project.*} once maven-assembly-plugin 2.2-beta-3 is available -->
   <includeBaseDirectory>false</includeBaseDirectory>
   <id>bundle</id>
   <formats>
diff --git a/src/it/projects/multimodule/massembly-474/descriptor/pom.xml b/src/it/projects/multimodule/massembly-474/descriptor/pom.xml
index 2acabeced..fa031c2d0 100644
--- a/src/it/projects/multimodule/massembly-474/descriptor/pom.xml
+++ b/src/it/projects/multimodule/massembly-474/descriptor/pom.xml
@@ -52,7 +52,7 @@ under the License.
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>1.0.1</version>
+				<version>@version.maven-enforcer-plugin@</version>
 				<executions>
 					<execution>
 						<id>enforce-dont-exist</id>
diff --git a/src/it/projects/multimodule/massembly-619/descriptor/pom.xml b/src/it/projects/multimodule/massembly-619/descriptor/pom.xml
index 11ddf284b..01a2695fe 100644
--- a/src/it/projects/multimodule/massembly-619/descriptor/pom.xml
+++ b/src/it/projects/multimodule/massembly-619/descriptor/pom.xml
@@ -50,7 +50,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.0.1</version>
+        <version>@version.maven-enforcer-plugin@</version>
         <executions>
           <execution>
             <id>enforce-dont-exist</id>
diff --git a/src/it/projects/reproducible/pom.xml b/src/it/projects/reproducible/pom.xml
index 4595ec0d1..c00140f94 100644
--- a/src/it/projects/reproducible/pom.xml
+++ b/src/it/projects/reproducible/pom.xml
@@ -31,6 +31,7 @@
   <groupId>org.apache.maven.its</groupId>
   <artifactId>reproducible</artifactId>
   <version>1.0</version>
+  <packaging>pom</packaging>
 
   <name>Test for reproducibility of assembly archives</name>
 
@@ -59,7 +60,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.8.2</version>
+        <version>@version.maven-deploy-plugin@</version>
         <configuration>
           <!-- Deployments will be written to ${basedir}/target -->
           <altDeploymentRepository>mine::default::file://${basedir}/target/repo</altDeploymentRepository>