From ac5063efe9dd524a610a3483330837366cb29b95 Mon Sep 17 00:00:00 2001
From: Ladislav Thon <lthon@redhat.com>
Date: Thu, 12 May 2022 17:17:14 +0200
Subject: [PATCH] improve invoker tests to use Maven plugin versions managed by
 the main build

---
 maven-plugin/src/it/defaultFileset/pom.xml  | 8 +++++++-
 maven-plugin/src/it/dependencies/pom.xml    | 6 ++++++
 maven-plugin/src/it/filesets/pom.xml        | 8 +++++++-
 maven-plugin/src/it/jar/pom.xml             | 8 +++++++-
 maven-plugin/src/it/multipleIndices/pom.xml | 8 +++++++-
 maven-plugin/src/it/noFileset/pom.xml       | 6 ++++++
 maven-plugin/src/it/smoketest/pom.xml       | 6 ++++++
 pom.xml                                     | 2 ++
 8 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/maven-plugin/src/it/defaultFileset/pom.xml b/maven-plugin/src/it/defaultFileset/pom.xml
index 9413fbd1..0e4f1db8 100644
--- a/maven-plugin/src/it/defaultFileset/pom.xml
+++ b/maven-plugin/src/it/defaultFileset/pom.xml
@@ -15,10 +15,16 @@
 
   <build>
     <plugins>
+      <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-dependency-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>@version.maven-dependency-plugin@</version>
         <executions>
           <execution>
             <id>unpack-dependency</id>
diff --git a/maven-plugin/src/it/dependencies/pom.xml b/maven-plugin/src/it/dependencies/pom.xml
index 96f553b2..468f626b 100644
--- a/maven-plugin/src/it/dependencies/pom.xml
+++ b/maven-plugin/src/it/dependencies/pom.xml
@@ -29,6 +29,12 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>@version.maven-compiler-plugin@</version>
+      </plugin>
+
       <plugin>
         <groupId>@project.groupId@</groupId>
         <artifactId>@project.artifactId@</artifactId>
diff --git a/maven-plugin/src/it/filesets/pom.xml b/maven-plugin/src/it/filesets/pom.xml
index 678ad7a7..aef72188 100644
--- a/maven-plugin/src/it/filesets/pom.xml
+++ b/maven-plugin/src/it/filesets/pom.xml
@@ -15,10 +15,16 @@
 
   <build>
     <plugins>
+      <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-dependency-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>@version.maven-dependency-plugin@</version>
         <executions>
           <execution>
             <id>unpack-dependency</id>
diff --git a/maven-plugin/src/it/jar/pom.xml b/maven-plugin/src/it/jar/pom.xml
index a65e6536..4f39ba31 100644
--- a/maven-plugin/src/it/jar/pom.xml
+++ b/maven-plugin/src/it/jar/pom.xml
@@ -29,10 +29,16 @@
 
   <build>
     <plugins>
+      <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-shade-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>@version.maven-shade-plugin@</version>
         <executions>
           <execution>
             <id>uberjar</id>
diff --git a/maven-plugin/src/it/multipleIndices/pom.xml b/maven-plugin/src/it/multipleIndices/pom.xml
index 4f81e95c..c924f011 100644
--- a/maven-plugin/src/it/multipleIndices/pom.xml
+++ b/maven-plugin/src/it/multipleIndices/pom.xml
@@ -15,10 +15,16 @@
 
   <build>
     <plugins>
+      <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-dependency-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>@version.maven-dependency-plugin@</version>
         <executions>
           <execution>
             <id>unpack-dependency</id>
diff --git a/maven-plugin/src/it/noFileset/pom.xml b/maven-plugin/src/it/noFileset/pom.xml
index 1da9269a..b4cffa71 100644
--- a/maven-plugin/src/it/noFileset/pom.xml
+++ b/maven-plugin/src/it/noFileset/pom.xml
@@ -15,6 +15,12 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>@version.maven-compiler-plugin@</version>
+      </plugin>
+
       <plugin>
         <groupId>@project.groupId@</groupId>
         <artifactId>@project.artifactId@</artifactId>
diff --git a/maven-plugin/src/it/smoketest/pom.xml b/maven-plugin/src/it/smoketest/pom.xml
index 95c9f989..15cbe242 100644
--- a/maven-plugin/src/it/smoketest/pom.xml
+++ b/maven-plugin/src/it/smoketest/pom.xml
@@ -15,6 +15,12 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>@version.maven-compiler-plugin@</version>
+      </plugin>
+
       <plugin>
         <groupId>@project.groupId@</groupId>
         <artifactId>@project.artifactId@</artifactId>
diff --git a/pom.xml b/pom.xml
index b926e14c..c8bd3b08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,8 +30,10 @@
         <version.maven>3.8.1</version.maven>
         <version.maven-bundle-plugin>5.1.2</version.maven-bundle-plugin>
         <version.maven-compiler-plugin>3.10.1</version.maven-compiler-plugin>
+        <version.maven-dependency-plugin>3.3.0</version.maven-dependency-plugin>
         <version.maven-invoker-plugin>3.2.2</version.maven-invoker-plugin>
         <version.maven-plugin-tools>3.6.1</version.maven-plugin-tools>
+        <version.maven-shade-plugin>3.3.0</version.maven-shade-plugin>
         <version.mvn-jlink-wrapper>1.1.0</version.mvn-jlink-wrapper>
         <version.plexus-compiler-eclipse>2.11.1</version.plexus-compiler-eclipse>
         <version.plexus-utils>3.4.1</version.plexus-utils>