[FIXED JENKINS-43569] Exclude saxon parser. Upgrade to PMD 5.7.0.

jenkinsci · May 30, 2017 · b4c5225 · b4c5225
1 parent 2d561a3
commit b4c5225
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/pmd.iml b/pmd.iml
@@ -47,15 +47,14 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.jenkins-ci.plugins:ssh-credentials:1.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.jenkins-ci.plugins:credentials:1.16.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.pmd:pmd-core:5.2.3" level="project" />
-    <orderEntry type="library" name="Maven: com.beust:jcommander:1.35" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.pmd:pmd-core:5.7.0" level="project" />
+    <orderEntry type="library" name="Maven: com.beust:jcommander:1.48" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.4" level="project" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
     <orderEntry type="library" name="Maven: net.java.dev.javacc:javacc:5.0" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.saxon:saxon:9.1.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: net.sourceforge.saxon:saxon:dom:9.1.0.8" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.pmd:pmd-java:5.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.pmd:pmd-java:5.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-digester3:3.2" level="project" />
     <orderEntry type="library" name="Maven: cglib:cglib:2.2.2" level="project" />
     <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />

diff --git a/pom.xml b/pom.xml
@@ -49,18 +49,28 @@
     <dependency>
       <groupId>net.sourceforge.pmd</groupId>
       <artifactId>pmd-core</artifactId>
-      <version>5.2.3</version>
+      <version>5.7.0</version>
       <exclusions>
         <exclusion>
           <groupId>com.ibm.icu</groupId>
           <artifactId>icu4j</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>net.sourceforge.saxon</groupId>
+          <artifactId>saxon</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.pmd</groupId>
       <artifactId>pmd-java</artifactId>
-      <version>5.2.3</version>
+      <version>5.7.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.sourceforge.saxon</groupId>
+          <artifactId>saxon</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/src/test/java/hudson/plugins/pmd/parser/PmdMessagesTest.java b/src/test/java/hudson/plugins/pmd/parser/PmdMessagesTest.java
@@ -32,6 +32,6 @@ public void shouldHaveAllMessage() {
                 "}\n" +
                 " \n" +
                 "      </pre>",
-                PmdMessages.getInstance().getMessage("Basic", "EmptyCatchBlock"));
+                PmdMessages.getInstance().getMessage("Empty Code", "EmptyCatchBlock"));
     }
 }