From 2e452e6f68876839670cbfea9b7935c1f2ee458a Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Sat, 15 Jun 2024 22:32:15 +0200
Subject: [PATCH] Require Maven 3.6.3, dependencies cleanups

- follow hints from dependency:analyze
---
 README.md                                     |  2 +-
 pom.xml                                       | 65 +++++++++---
 versions-api/pom.xml                          |  2 +-
 versions-common/pom.xml                       | 55 +++++++++--
 versions-enforcer/pom.xml                     | 56 ++++++++---
 versions-maven-plugin/pom.xml                 | 99 ++++++++++++++++++-
 .../versions/DisplayParentUpdatesMojo.java    |  2 +-
 .../org/codehaus/mojo/versions/SetMojo.java   |  2 +-
 .../mojo/versions/UpdateParentMojo.java       |  2 +-
 versions-model-report/pom.xml                 |  2 +-
 versions-model/pom.xml                        |  2 +-
 versions-test/pom.xml                         | 33 ++++---
 12 files changed, 270 insertions(+), 52 deletions(-)

diff --git a/README.md b/README.md
index 93b5d63836..0039025e35 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ This is the [versions-maven-plugin](http://www.mojohaus.org/versions-maven-plugi
 
 ## Maintained versions
 
-Versions Maven Plugin requires Maven 3.2.5+ and JDK 1.8+
+Versions Maven Plugin requires Maven 3.6.3+ and JDK 1.8+
 
 However, we maintain the latest Plugin version with the latest Maven.
 
diff --git a/pom.xml b/pom.xml
index e4625c3fea..5532b561b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.codehaus.mojo.versions</groupId>
   <artifactId>versions</artifactId>
-  <version>2.16.3-SNAPSHOT</version>
+  <version>2.17.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Versions</name>
@@ -119,11 +119,10 @@
   </ciManagement>
 
   <properties>
-    <!-- some of plugins requires JDK 11 -->
-    <recommendedJavaBuildVersion>11</recommendedJavaBuildVersion>
-    <maven.version>3.2.5</maven.version>
+    <mavenVersion>3.6.3</mavenVersion>
     <doxiaVersion>1.12.0</doxiaVersion>
     <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
+    <mockitoVersion>4.11.0</mockitoVersion>
     <pluginVersion>${project.version}</pluginVersion>
     <sitePluginVersion>${maven-site-plugin.version}</sitePluginVersion>
     <!-- dotted property can not be used in .vm -->
@@ -135,7 +134,7 @@
     <!-- execute ITS in parallel by default -->
     <invoker.parallelThreads>0.75C</invoker.parallelThreads>
     <!-- mono-module doesn't require site:stage for scm-publish -->
-    <project.build.outputTimestamp>2023-11-17T00:00:27Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-06-15T19:28:12Z</project.build.outputTimestamp>
   </properties>
 
   <dependencyManagement>
@@ -144,37 +143,58 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-api</artifactId>
-        <version>${maven.version}</version>
+        <version>${mavenVersion}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-artifact</artifactId>
-        <version>${maven.version}</version>
+        <version>${mavenVersion}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-core</artifactId>
-        <version>${maven.version}</version>
+        <version>${mavenVersion}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-model</artifactId>
-        <version>${maven.version}</version>
+        <version>${mavenVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-model-builder</artifactId>
+        <version>${mavenVersion}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-settings</artifactId>
-        <version>${maven.version}</version>
+        <version>${mavenVersion}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-compat</artifactId>
-        <version>${maven.version}</version>
+        <version>${mavenVersion}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven.resolver</groupId>
+        <artifactId>maven-resolver-api</artifactId>
+        <!-- use the same version as in Maven core -->
+        <version>1.4.1</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>org.eclipse.sisu.plexus</artifactId>
+        <!-- use the same version as in Maven core -->
+        <version>0.3.4</version>
+        <scope>provided</scope>
       </dependency>
 
       <dependency>
@@ -259,10 +279,15 @@
         <artifactId>maven-plugin-testing-harness</artifactId>
         <version>3.3.0</version>
       </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>${mockitoVersion}</version>
+      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-inline</artifactId>
-        <version>4.11.0</version>
+        <version>${mockitoVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
@@ -322,6 +347,12 @@
         <artifactId>plexus-archiver</artifactId>
         <version>4.9.2</version>
       </dependency>
+      <dependency>
+        <groupId>javax.inject</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1</version>
+        <scope>provided</scope>
+      </dependency>
 
       <!-- JDK 21 support -->
       <dependency>
@@ -334,6 +365,16 @@
         <artifactId>byte-buddy-agent</artifactId>
         <version>${byteBuddyVersion}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-provider-api</artifactId>
+        <version>3.5.3</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.doxia</groupId>
+        <artifactId>doxia-decoration-model</artifactId>
+        <version>1.11.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/versions-api/pom.xml b/versions-api/pom.xml
index d6b90f9703..321aec5304 100644
--- a/versions-api/pom.xml
+++ b/versions-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.mojo.versions</groupId>
     <artifactId>versions</artifactId>
-    <version>2.16.3-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>versions-api</artifactId>
diff --git a/versions-common/pom.xml b/versions-common/pom.xml
index 2415ecee10..6ba27ef79b 100644
--- a/versions-common/pom.xml
+++ b/versions-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.mojo.versions</groupId>
     <artifactId>versions</artifactId>
-    <version>2.16.3-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>versions-common</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>org.codehaus.mojo.versions</groupId>
       <artifactId>versions-api</artifactId>
-      <version>2.16.3-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.mojo.versions</groupId>
@@ -29,6 +29,11 @@
       <artifactId>maven-artifact</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
@@ -36,7 +41,6 @@
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-provider-api</artifactId>
-      <version>3.5.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -44,11 +48,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
+      <artifactId>maven-model-builder</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
+      <artifactId>maven-plugin-api</artifactId>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.woodstox</groupId>
@@ -62,14 +66,46 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-xml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.plexus</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -85,7 +121,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -98,6 +134,11 @@
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
     <!-- Required by Maven Testing Harness -->
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/versions-enforcer/pom.xml b/versions-enforcer/pom.xml
index e38ecf1700..84f619402f 100644
--- a/versions-enforcer/pom.xml
+++ b/versions-enforcer/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.mojo.versions</groupId>
     <artifactId>versions</artifactId>
-    <version>2.16.3-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>versions-enforcer</artifactId>
@@ -24,12 +24,10 @@
       <artifactId>versions-common</artifactId>
       <version>${project.version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.codehaus.mojo.versions</groupId>
-      <artifactId>versions-test</artifactId>
+      <artifactId>versions-model</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
 
     <dependency>
@@ -42,16 +40,46 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-provider-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
 
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
+      <groupId>org.codehaus.mojo.versions</groupId>
+      <artifactId>versions-test</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.plexus</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -62,14 +90,20 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.maven.plugin-testing</groupId>
-      <artifactId>maven-plugin-testing-harness</artifactId>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
 
diff --git a/versions-maven-plugin/pom.xml b/versions-maven-plugin/pom.xml
index 9d1f7509f9..c7a9dee648 100644
--- a/versions-maven-plugin/pom.xml
+++ b/versions-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.mojo.versions</groupId>
     <artifactId>versions</artifactId>
-    <version>2.16.3-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.codehaus.mojo</groupId>
@@ -16,11 +16,16 @@
   <description>The Versions Maven Plugin is used when you want to manage the versions of artifacts in a project's POM.</description>
 
   <prerequisites>
-    <maven>${maven.version}</maven>
+    <maven>${mavenVersion}</maven>
   </prerequisites>
 
   <dependencies>
     <!-- project dependencies -->
+    <dependency>
+      <groupId>org.codehaus.mojo.versions</groupId>
+      <artifactId>versions-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.mojo.versions</groupId>
       <artifactId>versions-model</artifactId>
@@ -65,14 +70,44 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model-builder</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-provider-api</artifactId>
+    </dependency>
 
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-plugin-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -94,6 +129,16 @@
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-site-renderer</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-artifact</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -111,16 +156,57 @@
       <artifactId>commons-lang3</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-xml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
+
     <!-- testing -->
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-xhtml5</artifactId>
+      <version>${doxia-sitetoolsVersion}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-integration-tools</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.junit.vintage</groupId>
@@ -133,6 +219,11 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-inline</artifactId>
diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayParentUpdatesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayParentUpdatesMojo.java
index 3cab99c1f9..bafe124e82 100644
--- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayParentUpdatesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayParentUpdatesMojo.java
@@ -47,7 +47,7 @@
 import org.codehaus.mojo.versions.utils.DependencyBuilder;
 import org.codehaus.mojo.versions.utils.SegmentUtils;
 
-import static org.apache.maven.shared.utils.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isBlank;
 
 /**
  * Displays any updates of the project's parent project
diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetMojo.java
index f2ed13bca5..57a0371e93 100644
--- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetMojo.java
@@ -65,7 +65,7 @@
 import org.codehaus.plexus.components.interactivity.Prompter;
 import org.codehaus.plexus.components.interactivity.PrompterException;
 
-import static org.apache.commons.lang.StringUtils.isEmpty;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 
 /**
  * Sets the current project's version and based on that change propagates that change onto any child modules as
diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java
index 02ecb55799..fd2e5fa935 100644
--- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java
@@ -47,7 +47,7 @@
 import org.codehaus.mojo.versions.utils.DependencyBuilder;
 import org.codehaus.mojo.versions.utils.SegmentUtils;
 
-import static org.apache.maven.shared.utils.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isBlank;
 
 /**
  * Sets the parent version to the latest parent version.
diff --git a/versions-model-report/pom.xml b/versions-model-report/pom.xml
index 6d880acf5c..770aac412e 100644
--- a/versions-model-report/pom.xml
+++ b/versions-model-report/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.mojo.versions</groupId>
     <artifactId>versions</artifactId>
-    <version>2.16.3-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>versions-model-report</artifactId>
diff --git a/versions-model/pom.xml b/versions-model/pom.xml
index d90796add8..cd14752e1c 100644
--- a/versions-model/pom.xml
+++ b/versions-model/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.mojo.versions</groupId>
     <artifactId>versions</artifactId>
-    <version>2.16.3-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>versions-model</artifactId>
diff --git a/versions-test/pom.xml b/versions-test/pom.xml
index b0c1e0b98e..ab4a0619a0 100644
--- a/versions-test/pom.xml
+++ b/versions-test/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.codehaus.mojo.versions</groupId>
     <artifactId>versions</artifactId>
-    <version>2.16.3-SNAPSHOT</version>
+    <version>2.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>versions-test</artifactId>
@@ -31,14 +31,26 @@
   <description>Internal test utilities used in project</description>
 
   <dependencies>
+    <dependency>
+      <groupId>org.codehaus.mojo.versions</groupId>
+      <artifactId>versions-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-api</artifactId>
-      <version>1.1.0</version>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
@@ -46,20 +58,19 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-site-renderer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.mojo.versions</groupId>
-      <artifactId>versions-common</artifactId>
-      <version>${project.version}</version>
+      <artifactId>doxia-decoration-model</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-text</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
+      <artifactId>mockito-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>