Author: adangel
Date: Sat Oct 28 08:22:14 2017
New Revision: 1813593

URL: http://svn.apache.org/viewvc?rev=1813593&view=rev
Log:
[MPMD-240] Migrate plugin to Maven 3.0

Upgrade maven-reporting-impl and doxia

Modified:
    maven/plugins/trunk/maven-pmd-plugin/pom.xml

Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1813593&r1=1813592&r2=1813593&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Oct 28 08:22:14 2017
@@ -81,7 +81,7 @@ under the License.
 
   <properties>
     <mavenVersion>3.0</mavenVersion>
-    <doxiaVersion>1.4</doxiaVersion>
+    <doxiaVersion>1.7</doxiaVersion>
     <!-- Because PMD 5.4+ requires Java 7 -->
     <javaVersion>1.7</javaVersion>
     <maven.compiler.source>${javaVersion}</maven.compiler.source>
@@ -119,6 +119,28 @@ under the License.
       <scope>provided</scope>
     </dependency>
 
+    <!-- pmd -->
+    <dependency>
+      <groupId>net.sourceforge.pmd</groupId>
+      <artifactId>pmd-core</artifactId>
+      <version>${pmdVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.pmd</groupId>
+      <artifactId>pmd-java</artifactId>
+      <version>${pmdVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.pmd</groupId>
+      <artifactId>pmd-javascript</artifactId>
+      <version>${pmdVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.pmd</groupId>
+      <artifactId>pmd-jsp</artifactId>
+      <version>${pmdVersion}</version>
+    </dependency>
+
     <!-- doxia -->
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
@@ -135,15 +157,10 @@ under the License.
       <artifactId>doxia-site-renderer</artifactId>
       <version>${doxiaVersion}</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>
-          <artifactId>dom4j</artifactId>
-          <groupId>dom4j</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- shared -->
@@ -155,7 +172,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>2.3</version>
+      <version>3.0.0</version>
     </dependency>
 
     <!-- plexus -->
@@ -170,28 +187,6 @@ under the License.
       <version>3.0.24</version>
     </dependency>
 
-    <!-- pmd -->
-    <dependency>
-      <groupId>net.sourceforge.pmd</groupId>
-      <artifactId>pmd-core</artifactId>
-      <version>${pmdVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.pmd</groupId>
-      <artifactId>pmd-java</artifactId>
-      <version>${pmdVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.pmd</groupId>
-      <artifactId>pmd-javascript</artifactId>
-      <version>${pmdVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.pmd</groupId>
-      <artifactId>pmd-jsp</artifactId>
-      <version>${pmdVersion}</version>
-    </dependency>
-
     <!-- test -->
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>


Reply via email to