From cfa0ee31d9a9e2e2fe54ba607e193b9e018520d3 Mon Sep 17 00:00:00 2001
From: BJ Hargrave <hargrave@us.ibm.com>
Date: Wed, 28 Aug 2024 08:47:52 -0400
Subject: [PATCH] maven-plugins: Add integration test execution for maven
 target version

For extra coverage, in addition to running integration tests on the
build maven version, we now also run the integration tests on the target
maven version.

Signed-off-by: BJ Hargrave <hargrave@us.ibm.com>
---
 .../pom.xml                                   |  4 +++
 .../transformer-maven-plugin/pom.xml          |  6 +++-
 org.eclipse.transformer.parent/pom.xml        | 36 +++++++++++++++++--
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/bnd-plugins/org.eclipse.transformer.bnd.analyzer/pom.xml b/bnd-plugins/org.eclipse.transformer.bnd.analyzer/pom.xml
index 4d82ad21..fcea3afb 100644
--- a/bnd-plugins/org.eclipse.transformer.bnd.analyzer/pom.xml
+++ b/bnd-plugins/org.eclipse.transformer.bnd.analyzer/pom.xml
@@ -109,6 +109,10 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-invoker-plugin</artifactId>
diff --git a/maven-plugins/transformer-maven-plugin/pom.xml b/maven-plugins/transformer-maven-plugin/pom.xml
index 31f0d617..5c7b3fd9 100644
--- a/maven-plugins/transformer-maven-plugin/pom.xml
+++ b/maven-plugins/transformer-maven-plugin/pom.xml
@@ -159,10 +159,14 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-plugin-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-invoker-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/org.eclipse.transformer.parent/pom.xml b/org.eclipse.transformer.parent/pom.xml
index 3e971086..75de664e 100644
--- a/org.eclipse.transformer.parent/pom.xml
+++ b/org.eclipse.transformer.parent/pom.xml
@@ -180,6 +180,27 @@ SPDX-License-Identifier: ${project.licenses[0].name}
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
 					<version>3.8.0</version>
+					<executions>
+						<execution>
+							<id>maven-target-version</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>unpack</goal>
+							</goals>
+							<configuration>
+								<artifactItems>
+									<artifactItem>
+										<groupId>org.apache.maven</groupId>
+										<artifactId>apache-maven</artifactId>
+										<version>${maven.target.version}</version>
+										<classifier>bin</classifier>
+										<type>zip</type>
+										<outputDirectory>${project.build.directory}/it</outputDirectory>
+									</artifactItem>
+								</artifactItems>
+							</configuration>
+						</execution>
+					</executions>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -213,9 +234,10 @@ SPDX-License-Identifier: ${project.licenses[0].name}
 					<configuration>
 						<projectsDirectory>${basedir}/src/it</projectsDirectory>
 						<settingsFile>${basedir}/src/it/settings.xml</settingsFile>
-						<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
-						<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+						<localRepositoryPath>${project.build.directory}/it/${mojo.executionId}/repo</localRepositoryPath>
+						<cloneProjectsTo>${project.build.directory}/it/${mojo.executionId}/projects</cloneProjectsTo>
 						<cloneClean>true</cloneClean>
+						<reportsDirectory>${project.build.directory}/invoker-reports/${mojo.executionId}</reportsDirectory>
 						<properties>
 							<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
 							<project.reporting.outputEncoding>${project.reporting.outputEncoding}</project.reporting.outputEncoding>
@@ -241,6 +263,16 @@ SPDX-License-Identifier: ${project.licenses[0].name}
 								<goal>run</goal>
 							</goals>
 						</execution>
+						<execution>
+							<id>integration-test-maven-target-version</id>
+							<goals>
+								<goal>install</goal>
+								<goal>run</goal>
+							</goals>
+							<configuration>
+								<mavenHome>${project.build.directory}/it/apache-maven-${maven.target.version}</mavenHome>
+							</configuration>
+						</execution>
 					</executions>
 				</plugin>
 				<plugin>