[MCHECKSTYLE-428] Upgrade parent POM to version 39

This closes #116
apache · May 14, 2023 · d96baba · d96baba
1 parent e3894a0
commit d96baba
Show file tree

Hide file tree

Showing 38 changed files with 2,408 additions and 3,291 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -18,14 +17,13 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>37</version>
+    <artifactId>maven-plugins</artifactId>
+    <version>39</version>
     <relativePath />
   </parent>
 
@@ -37,15 +35,27 @@ under the License.
   <description>Generates a report on violations of code style and optionally fails the build if violations are detected.</description>
   <inceptionYear>2005</inceptionYear>
 
+  <contributors>
+    <contributor>
+      <name>Baron Roberts</name>
+    </contributor>
+    <contributor>
+      <name>Benson Margulies</name>
+    </contributor>
+    <contributor>
+      <name>Csaba Kozák</name>
+    </contributor>
+  </contributors>
+
   <prerequisites>
     <maven>${mavenVersion}</maven>
   </prerequisites>
 
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git</developerConnection>
-    <url>https://github.com/apache/maven-checkstyle-plugin/tree/${project.scm.tag}</url>
     <tag>maven-checkstyle-plugin-3.2.2</tag>
+    <url>https://github.com/apache/maven-checkstyle-plugin/tree/${project.scm.tag}</url>
   </scm>
   <issueManagement>
     <system>JIRA</system>
@@ -74,18 +84,6 @@ under the License.
     <project.build.outputTimestamp>2023-04-18T14:54:00Z</project.build.outputTimestamp>
   </properties>
 
-  <contributors>
-    <contributor>
-      <name>Baron Roberts</name>
-    </contributor>
-    <contributor>
-      <name>Benson Margulies</name>
-    </contributor>
-    <contributor>
-      <name>Csaba Kozák</name>
-    </contributor>
-  </contributors>
-
   <dependencies>
     <!-- maven -->
     <dependency>
@@ -117,6 +115,11 @@ under the License.
       <artifactId>maven-plugin-annotations</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.plexus</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- shared -->
     <dependency>
@@ -151,15 +154,16 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-component-annotations</artifactId>
+      <version>2.1.1</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-resources</artifactId>
       <version>1.1.0</version>
       <exclusions>
         <exclusion>
-          <artifactId>plexus-container-default</artifactId>
           <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -194,6 +198,11 @@ under the License.
       <artifactId>checkstyle</artifactId>
       <version>${checkstyleVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+    </dependency>
 
     <!-- misc -->
     <dependency>
@@ -294,23 +303,6 @@ under the License.
             </excludes>
           </configuration>
         </plugin>
-        <plugin>
-          <!-- check with parent pom upgrade -->
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>3.1.1</version>
-          <dependencies>
-            <dependency>
-              <groupId>com.puppycrawl.tools</groupId>
-              <artifactId>checkstyle</artifactId>
-              <version>${checkstyleVersion}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.maven.shared</groupId>
-              <artifactId>maven-shared-resources</artifactId>
-              <version>4</version>
-            </dependency>
-          </dependencies>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -350,10 +342,10 @@ under the License.
         <executions>
           <execution>
             <id>check-java-compatibility</id>
-            <phase>process-classes</phase>
             <goals>
               <goal>check</goal>
             </goals>
+            <phase>process-classes</phase>
           </execution>
         </executions>
       </plugin>
@@ -427,6 +419,13 @@ under the License.
       <activation>
         <jdk>[9,)</jdk>
       </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+          <version>2.3.1</version>
+        </dependency>
+      </dependencies>
       <build>
         <plugins>
           <plugin>
@@ -449,13 +448,6 @@ under the License.
           </plugin>
         </plugins>
       </build>
-      <dependencies>
-        <dependency>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-          <version>2.3.1</version>
-        </dependency>
-      </dependencies>
     </profile>
   </profiles>