From ebbd3b4b48c597f9f50820d7fd810c875253d8be Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Thu, 22 Dec 2022 19:11:10 +0100
Subject: [PATCH] Project dependencies maintenance - move versions to
 dependencyManagement

---
 pom.xml                       | 62 ++++++++++++++++++++++++++++++-----
 versions-common/pom.xml       | 11 -------
 versions-enforcer/pom.xml     |  2 --
 versions-maven-plugin/pom.xml | 34 +++++++------------
 versions-model-report/pom.xml |  1 -
 versions-model/pom.xml        |  1 -
 versions-test/pom.xml         |  2 --
 7 files changed, 66 insertions(+), 47 deletions(-)

diff --git a/pom.xml b/pom.xml
index 785e8942b..ee425565a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,18 +142,49 @@
 
   <dependencyManagement>
     <dependencies>
+      <!-- maven core -->
       <dependency>
-        <groupId>org.apache.maven.enforcer</groupId>
-        <artifactId>enforcer-api</artifactId>
-        <version>3.1.0</version>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-api</artifactId>
+        <version>${mavenVersion}</version>
+        <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.junit</groupId>
-        <artifactId>junit-bom</artifactId>
-        <version>${junitBomVersion}</version>
-        <type>pom</type>
-        <scope>import</scope>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact</artifactId>
+        <version>${mavenVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-core</artifactId>
+        <version>${mavenVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-model</artifactId>
+        <version>${mavenVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-settings</artifactId>
+        <version>${mavenVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-compat</artifactId>
+        <version>${mavenVersion}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.maven.enforcer</groupId>
+        <artifactId>enforcer-api</artifactId>
+        <version>${maven-enforcer-plugin.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.maven.reporting</groupId>
         <artifactId>maven-reporting-api</artifactId>
@@ -209,6 +240,21 @@
         <artifactId>commons-text</artifactId>
         <version>1.10.0</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
+        <version>3.5.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>${junitBomVersion}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 
diff --git a/versions-common/pom.xml b/versions-common/pom.xml
index f2b96ca2f..beed2b949 100644
--- a/versions-common/pom.xml
+++ b/versions-common/pom.xml
@@ -27,15 +27,11 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
@@ -45,20 +41,14 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
     </dependency>
     <!-- woodstox only used for unit tests -->
     <dependency>
@@ -111,7 +101,6 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-compat</artifactId>
-      <version>${mavenVersion}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/versions-enforcer/pom.xml b/versions-enforcer/pom.xml
index 373b5fdcc..f25315731 100644
--- a/versions-enforcer/pom.xml
+++ b/versions-enforcer/pom.xml
@@ -40,8 +40,6 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
diff --git a/versions-maven-plugin/pom.xml b/versions-maven-plugin/pom.xml
index 0fcf7a9c0..afb68d063 100644
--- a/versions-maven-plugin/pom.xml
+++ b/versions-maven-plugin/pom.xml
@@ -20,71 +20,61 @@
   </prerequisites>
 
   <dependencies>
+    <!-- project dependencies -->
     <dependency>
       <groupId>org.codehaus.mojo.versions</groupId>
       <artifactId>versions-model</artifactId>
       <version>${project.version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.codehaus.mojo.versions</groupId>
       <artifactId>versions-model-report</artifactId>
       <version>${project.version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.codehaus.mojo.versions</groupId>
-      <artifactId>versions-test</artifactId>
+      <artifactId>versions-common</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.codehaus.mojo.versions</groupId>
-      <artifactId>versions-common</artifactId>
+      <artifactId>versions-test</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
 
+    <!-- maven core dependencies -->
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
+      <artifactId>maven-plugin-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
+      <artifactId>maven-artifact</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
+      <artifactId>maven-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
+      <artifactId>maven-model</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-common-artifact-filters</artifactId>
@@ -124,6 +114,7 @@
       <artifactId>commons-lang3</artifactId>
     </dependency>
 
+    <!-- testing -->
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
@@ -164,7 +155,6 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-compat</artifactId>
-      <version>${mavenVersion}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/versions-model-report/pom.xml b/versions-model-report/pom.xml
index b627dbf17..a3460242b 100644
--- a/versions-model-report/pom.xml
+++ b/versions-model-report/pom.xml
@@ -16,7 +16,6 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.5.0</version>
     </dependency>
   </dependencies>
 
diff --git a/versions-model/pom.xml b/versions-model/pom.xml
index 48217ef61..105e9fc7e 100644
--- a/versions-model/pom.xml
+++ b/versions-model/pom.xml
@@ -16,7 +16,6 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.5.0</version>
     </dependency>
   </dependencies>
 
diff --git a/versions-test/pom.xml b/versions-test/pom.xml
index 56dc6e8bf..7c6a23669 100644
--- a/versions-test/pom.xml
+++ b/versions-test/pom.xml
@@ -34,8 +34,6 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.aether</groupId>