From ceab880293d218fdfd21a2d9e444b941578754e5 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Sat, 19 Mar 2022 23:29:46 +0100
Subject: [PATCH] Require Maven 3.2.5+

---
 pom.xml                        | 39 ++++-----------
 src/it/jdepend-01/pom.xml      |  2 +-
 src/it/jdepend-02/pom.xml      |  2 +-
 src/it/jdepend-03/pom.xml      |  2 +-
 src/it/jdepend-04/pom.xml      |  2 +-
 src/it/jdepend-05/pom.xml      |  2 +-
 src/it/jdepend-example/pom.xml |  2 +-
 src/it/setup/pom.xml           | 89 +++++++++++++---------------------
 8 files changed, 49 insertions(+), 91 deletions(-)

diff --git a/pom.xml b/pom.xml
index 852aeae..a62450d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
   </ciManagement>
 
   <properties>
-    <mavenVersion>2.2.1</mavenVersion>
+    <mavenVersion>3.2.5</mavenVersion>
     <jdependVersion>2.9.1</jdependVersion>
     <mojo.java.target>1.8</mojo.java.target>
     <scmpublish.content>target/staging/${project.artifactId}</scmpublish.content>
@@ -88,23 +88,28 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>${mavenVersion}</version>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>2.3</version>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.4.1</version>
     </dependency>
     <dependency>
       <groupId>jdepend</groupId>
       <artifactId>jdepend</artifactId>
       <version>${jdependVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -161,28 +166,6 @@
     </plugins>
   </build>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changes-plugin</artifactId>
-        <version>2.9</version>
-        <configuration>
-          <onlyCurrentVersion>true</onlyCurrentVersion>
-          <columnNames>Type,Key,Summary,Status,Resolution,Assignee</columnNames>
-          <sortColumnNames>Type,Key</sortColumnNames>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>jira-report</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
-
   <profiles>
     <profile>
       <id>run-its</id>
@@ -191,7 +174,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>1.9</version>
+            <version>3.2.2</version>
             <configuration>
               <addTestClassPath>true</addTestClassPath>
               <debug>true</debug>
@@ -250,8 +233,6 @@
                     <extraArtifact>org.apache.maven.plugins:maven-pmd-plugin:3.0.1:maven-plugin</extraArtifact>
                     <extraArtifact>org.apache.maven.plugins:maven-surefire-report-plugin:2.16:maven-plugin</extraArtifact>
                     <extraArtifact>org.codehaus.mojo:taglist-maven-plugin:2.4:maven-plugin</extraArtifact>
-                     <!-- I don't know why i need to define them separately. I assumed it will be downloaded by javadoc plugin as transitive dependencies -->
-                    <extraArtifact>org.apache.maven.plugin-tools:maven-plugin-tools-javadoc:3.2:jar</extraArtifact>
                     <extraArtifact>org.codehaus.plexus:plexus-component-javadoc:1.5.5:jar</extraArtifact>
                   </extraArtifacts>
                 </configuration>
diff --git a/src/it/jdepend-01/pom.xml b/src/it/jdepend-01/pom.xml
index ead9e63..351dfa8 100644
--- a/src/it/jdepend-01/pom.xml
+++ b/src/it/jdepend-01/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/it/jdepend-02/pom.xml b/src/it/jdepend-02/pom.xml
index 51656bd..4cacc1d 100644
--- a/src/it/jdepend-02/pom.xml
+++ b/src/it/jdepend-02/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/it/jdepend-03/pom.xml b/src/it/jdepend-03/pom.xml
index a50bfb4..9e3578f 100644
--- a/src/it/jdepend-03/pom.xml
+++ b/src/it/jdepend-03/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/it/jdepend-04/pom.xml b/src/it/jdepend-04/pom.xml
index 6ba7498..d2c799f 100644
--- a/src/it/jdepend-04/pom.xml
+++ b/src/it/jdepend-04/pom.xml
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/it/jdepend-05/pom.xml b/src/it/jdepend-05/pom.xml
index 7749b44..f5a14ba 100644
--- a/src/it/jdepend-05/pom.xml
+++ b/src/it/jdepend-05/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/it/jdepend-example/pom.xml b/src/it/jdepend-example/pom.xml
index 0ea6a87..20e95f8 100644
--- a/src/it/jdepend-example/pom.xml
+++ b/src/it/jdepend-example/pom.xml
@@ -36,7 +36,7 @@
   <name>JDepend Example Report</name>
   <url>http://mojo.codehaus.org</url>
   <properties>
-    <mavenVersion>2.2.1</mavenVersion>
+    <mavenVersion>3.2.5</mavenVersion>
   </properties>
   <reporting>
     <plugins>
diff --git a/src/it/setup/pom.xml b/src/it/setup/pom.xml
index 66a80a0..f54b7f9 100644
--- a/src/it/setup/pom.xml
+++ b/src/it/setup/pom.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  #%L
-  JDepend Maven Plugin
-  %%
-  Copyright (C) 2006 - 2014 Codehaus
-  %%
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  #L%
-  -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  #%L
+  JDepend Maven Plugin
+  %%
+  Copyright (C) 2006 - 2014 Codehaus
+  %%
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  #L%
+  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -71,7 +71,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>2.4</version>
+          <version>3.3</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -86,7 +86,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>2.5</version>
+          <version>3.1.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -118,41 +118,18 @@
           <artifactId>maven-project-info-reports-plugin</artifactId>
           <version>2.7</version>
         </plugin>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>attach-descriptor</id>
+              <goals>
+                <goal>attach-descriptor</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
-  <profiles>
-    <profile>
-      <id>maven-3</id>
-      <activation>
-        <file>
-          <exists>${basedir}</exists>
-        </file>
-      </activation>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-site-plugin</artifactId>
-              <version>3.3</version>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-        <plugins>
-          <plugin>
-            <artifactId>maven-site-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-descriptor</id>
-                <goals>
-                  <goal>attach-descriptor</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>