From 3dc61c840e0f6652faef73126e9983a3c2c821ce Mon Sep 17 00:00:00 2001
From: twogee <g.grigelionis@gmail.com>
Date: Sun, 11 Dec 2022 23:01:29 +0100
Subject: [PATCH] Update Maven plugins

---
 .gitignore                                    |  1 +
 japicmp-maven-plugin/pom.xml                  |  9 +--
 .../japicmp-test-maven-plugin/pom.xml         |  3 -
 .../japicmp-test-vx-client/pom.xml            | 10 +--
 japicmp-testbase/japicmp-test/pom.xml         |  3 -
 japicmp/pom.xml                               | 11 ---
 pom.xml                                       | 76 +++++++------------
 7 files changed, 34 insertions(+), 79 deletions(-)

diff --git a/.gitignore b/.gitignore
index 74b4486c4..928e2cebf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 target
+.fleet
 .idea
 httpclient*.jar
 *.iml
diff --git a/japicmp-maven-plugin/pom.xml b/japicmp-maven-plugin/pom.xml
index 9047da136..c60c6a602 100644
--- a/japicmp-maven-plugin/pom.xml
+++ b/japicmp-maven-plugin/pom.xml
@@ -24,12 +24,6 @@
 		</license>
 	</licenses>
 
-	<properties>
-		<mavenVersion>3.8.1</mavenVersion> <!-- maven.version property is reserved! -->
-		<resolver.version>1.4.1</resolver.version> <!-- keep in sync with maven version -->
-		<maven-plugin.version>3.6.4</maven-plugin.version>
-	</properties>
-
 	<prerequisites>
 		<maven>${maven-api.version}</maven>
 	</prerequisites>
@@ -103,7 +97,6 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-plugin-plugin</artifactId>
 				<version>${plugin-annotation.version}</version>
 				<executions>
@@ -172,8 +165,8 @@
 				<artifactId>maven-checkstyle-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-plugin-plugin</artifactId>
+				<version>${plugin-annotation.version}</version>
 				<reportSets>
 					<reportSet>
 						<reports>
diff --git a/japicmp-testbase/japicmp-test-maven-plugin/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin/pom.xml
index c4abde2a5..93268117d 100644
--- a/japicmp-testbase/japicmp-test-maven-plugin/pom.xml
+++ b/japicmp-testbase/japicmp-test-maven-plugin/pom.xml
@@ -690,9 +690,7 @@
 			<!-- run site plugin to build reports during 'pre-integration-test' phase
 			this allows integrations tests to verify site report generation -->
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>3.7</version>
 				<executions>
 					<execution>
 						<id>build-site-to-test</id>
@@ -707,7 +705,6 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
 				<executions>
 					<execution>
diff --git a/japicmp-testbase/japicmp-test-vx-client/pom.xml b/japicmp-testbase/japicmp-test-vx-client/pom.xml
index dbbcb8740..02d590a5c 100644
--- a/japicmp-testbase/japicmp-test-vx-client/pom.xml
+++ b/japicmp-testbase/japicmp-test-vx-client/pom.xml
@@ -77,7 +77,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.2.0</version>
 				<executions>
 					<execution>
 						<id>withOldVersion</id>
@@ -86,9 +86,9 @@
 							<executable>java</executable>
 							<arguments>
 								<argument>-classpath</argument>
-								<argumnet>
+								<argument>
 									${project.build.directory}/${project.artifactId}-${project.version}.jar${path.separator}${project.build.directory}/japicmp-test-v1.jar
-								</argumnet>
+								</argument>
 								<argument>japicmp.test.client.JApiCmpClient</argument>
 							</arguments>
 						</configuration>
@@ -103,9 +103,9 @@
 							<executable>java</executable>
 							<arguments>
 								<argument>-classpath</argument>
-								<argumnet>
+								<argument>
 									${project.build.directory}/${project.artifactId}-${project.version}.jar${path.separator}${project.build.directory}/japicmp-test-v2.jar
-								</argumnet>
+								</argument>
 								<argument>japicmp.test.client.JApiCmpClient</argument>
 							</arguments>
 						</configuration>
diff --git a/japicmp-testbase/japicmp-test/pom.xml b/japicmp-testbase/japicmp-test/pom.xml
index 30616995e..00edc8351 100644
--- a/japicmp-testbase/japicmp-test/pom.xml
+++ b/japicmp-testbase/japicmp-test/pom.xml
@@ -122,7 +122,6 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
 						<configuration>
 							<argLine>
@@ -132,7 +131,6 @@
 						</configuration>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-failsafe-plugin</artifactId>
 						<configuration>
 							<argLine>
@@ -142,7 +140,6 @@
 						</configuration>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
 						<configuration>
 							<additionalJOption>
diff --git a/japicmp/pom.xml b/japicmp/pom.xml
index 648c2538d..216797755 100644
--- a/japicmp/pom.xml
+++ b/japicmp/pom.xml
@@ -80,7 +80,6 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.8</version>
 				<executions>
 					<execution>
 						<id>default-prepare-agent</id>
@@ -105,7 +104,6 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
 					<argLine>
@@ -138,13 +136,6 @@
 					<parameter>
 						<oldVersionPattern>\d+\.\d+\.\d+</oldVersionPattern>
 						<onlyModified>true</onlyModified>
-						<excludes>
-							<exclude>japicmp.*#__cobertura*()</exclude>
-							<exclude>
-								japicmp.*#__cobertura*(net.sourceforge.cobertura.coveragedata.LightClassmapListener)
-							</exclude>
-							<exclude>japicmp.*#__cobertura*</exclude>
-						</excludes>
 					</parameter>
 					<skip>false</skip>
 				</configuration>
@@ -179,7 +170,6 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
 						<configuration>
 							<forkCount>3</forkCount>
@@ -198,7 +188,6 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
 						<configuration>
 							<argLine>
diff --git a/pom.xml b/pom.xml
index 6e2534511..9cd067f13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,8 +143,8 @@
 		<maven-api.version>3.6.3</maven-api.version>
 		<resolver.version>1.4.1</resolver.version> <!-- keep in sync with maven api version -->
 		<reporting.version>3.1.0</reporting.version>
-		<plugin-annotation.version>3.6.4</plugin-annotation.version>
-		<surefireVersion>3.0.0-M7</surefireVersion>
+		<plugin-annotation.version>3.7.1</plugin-annotation.version>
+		<surefireVersion>3.2.5</surefireVersion>
 		<javassist.version>3.30.2-GA</javassist.version>
 		<guava.version>33.0.0-jre</guava.version>
 		<jaxb.version>2.3.2</jaxb.version>
@@ -158,14 +158,14 @@
 		<module>japicmp-ant-task</module>
 	</modules>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.13.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
 			<version>4.3.1</version>
@@ -222,7 +222,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.2.1</version>
+				<version>3.4.1</version>
 				<executions>
 					<execution>
 						<id>enforce-versions</id>
@@ -247,14 +247,12 @@
 		<pluginManagement>
 			<plugins>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.10.1</version>
+					<version>3.13.0</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>3.0.0-M6</version>
+					<version>3.0.1</version>
 					<configuration>
 						<autoVersionSubmodules>true</autoVersionSubmodules>
 						<useReleaseProfile>false</useReleaseProfile>
@@ -265,9 +263,8 @@
 					</configuration>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.4.1</version>
+					<version>3.6.3</version>
 					<configuration>
 						<quiet>true</quiet>
 					</configuration>
@@ -281,9 +278,8 @@
 					</executions>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.2.1</version>
+					<version>3.3.1</version>
 					<executions>
 						<execution>
 							<id>attach-sources</id>
@@ -295,9 +291,8 @@
 				</plugin>
 				<plugin>
 					<!-- explicitly define maven-deploy-plugin after other to force exec order -->
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-deploy-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>3.1.2</version>
 					<executions>
 						<execution>
 							<id>deploy</id>
@@ -309,69 +304,59 @@
 					</executions>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>${surefireVersion}</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-failsafe-plugin</artifactId>
 					<version>${surefireVersion}</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.4.2</version>
+					<version>3.7.1</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.4.1</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-war-plugin</artifactId>
-					<version>3.3.2</version>
+					<version>3.4.0</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
 					<version>3.12.0</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-gpg-plugin</artifactId>
-					<version>3.0.1</version>
+					<version>3.2.4</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>5.1.8</version>
+					<version>5.1.9</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.6.1</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-checkstyle-plugin</artifactId>
-					<version>3.2.0</version>
+					<version>3.3.1</version>
 				</plugin>
 				<plugin>
 					<groupId>com.github.spotbugs</groupId>
 					<artifactId>spotbugs-maven-plugin</artifactId>
-					<version>4.7.2.0</version>
+					<version>4.8.4.0</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>3.4.1</version>
+					<version>3.5.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.jacoco</groupId>
 					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>0.8.8</version>
+					<version>0.8.12</version>
 					<executions>
 						<execution>
 							<id>default-prepare-agent</id>
@@ -398,7 +383,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-scm-publish-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>3.2.1</version>
 					<configuration>
 						<scmBranch>gh-pages</scmBranch>
 					</configuration>
@@ -440,7 +425,6 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
 						<configuration>
 							<source>8</source>
@@ -457,7 +441,6 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
 						<configuration>
 							<argLine>
@@ -466,7 +449,6 @@
 						</configuration>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-failsafe-plugin</artifactId>
 						<configuration>
 							<argLine>
@@ -475,7 +457,6 @@
 						</configuration>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
 						<configuration>
 							<additionalJOption>
@@ -490,7 +471,6 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
 						<executions>
 							<execution>
@@ -502,7 +482,6 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
 						<executions>
 							<execution>
@@ -514,7 +493,6 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
 						<executions>
 							<execution>