From e91c780c185273f9027302b5a2e6d24b43aa475d Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 23 Nov 2022 13:23:10 +0100
Subject: [PATCH] Clean up and upgrade dependencies/plugins versions (#741)

---
 build-plugin/pom.xml |  6 ++---
 daemon/pom.xml       |  7 ------
 pom.xml              | 58 +++++++++++++++++++++++++++-----------------
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/build-plugin/pom.xml b/build-plugin/pom.xml
index afdb47ec..6210e814 100644
--- a/build-plugin/pom.xml
+++ b/build-plugin/pom.xml
@@ -34,9 +34,9 @@
     <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.source>11</maven.compiler.source>
 
-    <roaster.version>2.23.2.Final</roaster.version>
-    <maven.plugin-tools.version>3.6.0</maven.plugin-tools.version>
-    <maven-plugin-plugin.version>${maven.plugin-tools.version}</maven-plugin-plugin.version>
+    <roaster.version>2.28.0.Final</roaster.version>
+    <maven.plugin-tools.version>3.7.0</maven.plugin-tools.version>
+    <maven-plugin-plugin.version>3.7.0</maven-plugin-plugin.version>
   </properties>
 
   <dependencyManagement>
diff --git a/daemon/pom.xml b/daemon/pom.xml
index 9ba4dc07..b35e712c 100644
--- a/daemon/pom.xml
+++ b/daemon/pom.xml
@@ -52,13 +52,6 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-interactivity-api</artifactId>
-      <version>1.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- Logging -->
diff --git a/pom.xml b/pom.xml
index 4cb4da85..ba243977 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,39 +73,42 @@
 
     <!-- dependency versions a..z -->
     <apiguardian-api.version>1.0.0</apiguardian-api.version>
-    <assertj.version>3.16.1</assertj.version>
-    <commons-compress.version>1.21</commons-compress.version>
+    <assertj.version>3.23.1</assertj.version>
+    <commons-compress.version>1.22</commons-compress.version>
     <graalvm.version>22.3.0</graalvm.version>
     <graalvm.plugin.version>0.9.18</graalvm.plugin.version>
     <groovy.version>4.0.6</groovy.version>
     <jakarta.inject.version>1.0</jakarta.inject.version>
     <jansi.version>2.4.0</jansi.version>
     <jline.version>3.21.0</jline.version>
-    <junit.jupiter.version>5.7.2</junit.jupiter.version>
-    <logback.version>1.2.10</logback.version>
+    <junit.jupiter.version>5.9.1</junit.jupiter.version>
+    <logback.version>1.2.11</logback.version>
     <maven.version>4.0.0-alpha-2</maven.version>
     <maven.resolver.version>1.8.2</maven.resolver.version>
     <slf4j.version>1.7.35</slf4j.version>
     <sisu.version>0.3.5</sisu.version>
 
     <!-- plugin versions a..z -->
-    <buildnumber-maven-plugin.version>1.4</buildnumber-maven-plugin.version>
-    <compiler.version>3.8.1</compiler.version>
+    <buildnumber-maven-plugin.version>3.0.0</buildnumber-maven-plugin.version>
+    <compiler.version>3.10.1</compiler.version>
     <groovy-maven-plugin.version>2.1.0</groovy-maven-plugin.version>
-    <license-maven-plugin.version>3.0</license-maven-plugin.version>
-    <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
-    <maven-install-plugin.version>2.4</maven-install-plugin.version>
+    <license-maven-plugin.version>4.2.rc3</license-maven-plugin.version>
+    <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+    <maven-install-plugin.version>3.1.0</maven-install-plugin.version>
     <maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
-    <mrm.version>1.2.0</mrm.version>
-    <surefire.version>3.0.0-M5</surefire.version>
+    <mrm.version>1.4.1</mrm.version>
+    <surefire.version>3.0.0-M7</surefire.version>
     <!-- keep in sync with junit-platform-launcher.version -->
     <junit-platform-launcher.version>1.3.2</junit-platform-launcher.version>
     <!-- keep in sync with surefire.version -->
-    <release.plugin.version>3.0.0-M5</release.plugin.version>
+    <release.plugin.version>3.0.0-M7</release.plugin.version>
     <takari-lifecycle.version>1.13.9</takari-lifecycle.version>
     <takari-provisio.version>1.0.19</takari-provisio.version>
 
-    <javassist.version>3.27.0-GA</javassist.version>
+    <javassist.version>3.29.2-GA</javassist.version>
+    <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
+    <xstream.version>1.4.19</xstream.version>
+    <plexus-interactivity-api.version>1.0</plexus-interactivity-api.version>
   </properties>
 
   <dependencyManagement>
@@ -223,38 +226,38 @@
       <dependency>
         <groupId>org.apache.maven.daemon</groupId>
         <artifactId>mvnd-native</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.daemon</groupId>
         <artifactId>mvnd-agent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.daemon</groupId>
         <artifactId>mvnd-client</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.daemon</groupId>
         <artifactId>mvnd-common</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.daemon</groupId>
         <artifactId>mvnd-dist</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.daemon</groupId>
         <artifactId>mvnd-daemon</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.daemon</groupId>
         <artifactId>mvnd-helper-agent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
 
       <dependency>
@@ -300,6 +303,17 @@
         <artifactId>javassist</artifactId>
         <version>${javassist.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-interactivity-api</artifactId>
+        <version>${plexus-interactivity-api.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
 
     </dependencies>
   </dependencyManagement>
@@ -388,7 +402,7 @@ limitations under the License.</inlineHeader>
             <dependency>
               <groupId>com.thoughtworks.xstream</groupId>
               <artifactId>xstream</artifactId>
-              <version>1.4.19</version>
+              <version>${xstream.version}</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -532,7 +546,7 @@ limitations under the License.</inlineHeader>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>
-            <version>3.3.0</version>
+            <version>${maven-assembly-plugin.version}</version>
             <executions>
               <execution>
                 <id>create-source-distribution</id>