Prepare for Doxia 2.0.0

apache · Mar 20, 2023 · 37abfb6 · 37abfb6
1 parent 0fbd7fd
commit 37abfb6
Show file tree

Hide file tree

Showing 52 changed files with 164 additions and 158 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@ under the License.
   </parent>
 
   <artifactId>maven-pmd-plugin</artifactId>
-  <version>3.21.0-SNAPSHOT</version>
+  <version>4.0.0-M1-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>Apache Maven PMD Plugin</name>
@@ -86,15 +86,15 @@ under the License.
 
   <properties>
     <mavenVersion>3.2.5</mavenVersion>
-    <doxiaVersion>1.12.0</doxiaVersion>
-    <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
+    <doxiaVersion>2.0.0-M6</doxiaVersion>
     <javaVersion>8</javaVersion><!-- Because PMD 6.35.0+ requires Java 8 -->
     <pmdVersion>6.55.0</pmdVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
     <aetherVersion>1.0.0.v20140518</aetherVersion>
-    <sitePluginVersion>3.12.1</sitePluginVersion>
-    <projectInfoReportsPluginVersion>3.4.1</projectInfoReportsPluginVersion>
-    <jxrPluginVersion>3.3.0</jxrPluginVersion>
+    <compilerPluginVersion>3.11.0</compilerPluginVersion>
+    <sitePluginVersion>4.0.0-M6</sitePluginVersion>
+    <projectInfoReportsPluginVersion>4.0.0-M1-SNAPSHOT</projectInfoReportsPluginVersion>
+    <jxrPluginVersion>4.0.0-M1-SNAPSHOT</jxrPluginVersion>
     <project.build.outputTimestamp>2023-01-06T22:00:33Z</project.build.outputTimestamp>
   </properties>
 
@@ -118,6 +118,12 @@ under the License.
       <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
@@ -191,43 +197,12 @@ under the License.
       <artifactId>doxia-sink-api</artifactId>
       <version>${doxiaVersion}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-decoration-model</artifactId>
-      <version>${doxiaSitetoolsVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-site-renderer</artifactId>
-      <version>${doxiaSitetoolsVersion}</version>
-      <!--
-        Note: doxia-site-renderer needs to be defined AFTER pmd:
-        doxia-site-renderer requires transitively dom4j 1.1 which provides a very old version of jaxen (same jar).
-        PMD requires a newer version of jaxen, which is not compatible.
-      -->
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
 
     <!-- shared -->
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-api</artifactId>
-      <version>3.1.1</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>3.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-shared-utils</artifactId>
-      <version>3.3.4</version>
+      <version>4.0.0-M5</version>
     </dependency>
 
     <!-- plexus -->

diff --git a/src/it/MPMD-182/pom.xml b/src/it/MPMD-182/pom.xml
@@ -36,6 +36,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>@compilerPluginVersion@</version>
         <configuration>
           <source>${javaVersion}</source>
           <target>${javaVersion}</target>

diff --git a/src/it/MPMD-205-pmd-js-check/pom.xml b/src/it/MPMD-205-pmd-js-check/pom.xml
@@ -39,7 +39,7 @@ under the License.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.9.1</version>
+        <version>3.3.0</version>
         <executions>
             <execution>
                 <id>add-javascript-source</id>

diff --git a/src/it/MPMD-270-325-JDK11/pom.xml b/src/it/MPMD-270-325-JDK11/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>11</java.version>
+    <javaVersion>11</javaVersion>
   </properties>
 
   <build>
@@ -37,10 +37,10 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>

diff --git a/src/it/MPMD-280-JDK12/pom.xml b/src/it/MPMD-280-JDK12/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>12</java.version>
+    <javaVersion>12</javaVersion>
   </properties>
 
   <build>
@@ -37,10 +37,10 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>

diff --git a/src/it/MPMD-295-JDK13/pom.xml b/src/it/MPMD-295-JDK13/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>14</java.version>
+    <javaVersion>14</javaVersion>
   </properties>
 
   <build>
@@ -37,10 +37,10 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>

diff --git a/src/it/MPMD-302-JDK14/pom.xml b/src/it/MPMD-302-JDK14/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>14</java.version>
+    <javaVersion>14</javaVersion>
   </properties>
 
   <build>
@@ -37,10 +37,10 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>

diff --git a/src/it/MPMD-302-JDK15/pom.xml b/src/it/MPMD-302-JDK15/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>15</java.version>
+    <javaVersion>15</javaVersion>
   </properties>
 
   <build>
@@ -37,10 +37,10 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>

diff --git a/src/it/MPMD-304-toolchain-support/pom.xml b/src/it/MPMD-304-toolchain-support/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>11</java.version>
+    <javaVersion>11</javaVersion>
   </properties>
 
   <build>
@@ -37,10 +37,10 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -53,7 +53,7 @@ under the License.
         <configuration>
           <failOnViolation>false</failOnViolation>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>10</minimumTokens>
         </configuration>
         <executions>
@@ -81,7 +81,7 @@ under the License.
         <configuration>
           <toolchains>
             <jdk>
-              <version>${java.version}</version>
+              <version>${javaVersion}</version>
               <vendor>oracle</vendor>
             </jdk>
           </toolchains>

diff --git a/src/it/MPMD-312-JDK16/pom.xml b/src/it/MPMD-312-JDK16/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>16</java.version>
+    <javaVersion>16</javaVersion>
   </properties>
 
   <build>
@@ -37,10 +37,10 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>

diff --git a/src/it/MPMD-312-JDK17/pom.xml b/src/it/MPMD-312-JDK17/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>17</java.version>
+    <javaVersion>17</javaVersion>
   </properties>
 
   <build>
@@ -37,10 +37,10 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>

diff --git a/src/it/MPMD-323-ruleset-basedir-jgitver/pom.xml b/src/it/MPMD-323-ruleset-basedir-jgitver/pom.xml
@@ -35,7 +35,7 @@ under the License.
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>@compilerPluginVersion@</version>
             </plugin>
             <plugin>
                 <groupId>@project.groupId@</groupId>