ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1671097 - in /webservices/wss4j/trunk: .gitignore pom.xml ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java
Date Fri, 03 Apr 2015 16:16:11 GMT
Author: dkulp
Date: Fri Apr  3 16:16:11 2015
New Revision: 1671097

URL: http://svn.apache.org/r1671097
Log:
Update to latest pmd

Modified:
    webservices/wss4j/trunk/.gitignore
    webservices/wss4j/trunk/pom.xml
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java

Modified: webservices/wss4j/trunk/.gitignore
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/.gitignore?rev=1671097&r1=1671096&r2=1671097&view=diff
==============================================================================
--- webservices/wss4j/trunk/.gitignore (original)
+++ webservices/wss4j/trunk/.gitignore Fri Apr  3 16:16:11 2015
@@ -6,3 +6,5 @@
 .settings/
 target/
 velocity.log
+.pmdruleset.xml
+

Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1671097&r1=1671096&r2=1671097&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Fri Apr  3 16:16:11 2015
@@ -128,7 +128,19 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.4</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>net.sourceforge.pmd</groupId>
+                        <artifactId>pmd-core</artifactId>
+                        <version>5.3.0</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>net.sourceforge.pmd</groupId>
+                        <artifactId>pmd-java</artifactId>
+                        <version>5.3.0</version>
+                    </dependency>
+                </dependencies>
                 <configuration>
                     <sourceEncoding>UTF-8</sourceEncoding>
                     <failOnViolation>true</failOnViolation>
@@ -136,9 +148,6 @@
                     <verbose>true</verbose>
                     <minimumTokens>100</minimumTokens>
                     <targetJdk>${targetJdk}</targetJdk>
-                    <excludes>
-                        <exclude>**/CryptoBase.java, **/DOM2Writer.java</exclude>
-                    </excludes>
                     <excludeRoots>
                         <excludeRoot>${basedir}/src/main/generated</excludeRoot>
                     </excludeRoots>

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java?rev=1671097&r1=1671096&r2=1671097&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
Fri Apr  3 16:16:11 2015
@@ -46,14 +46,14 @@ import org.apache.wss4j.common.ext.WSSec
  * functionality of the Crypto interface.
  */
 public abstract class CryptoBase implements Crypto {
-    public static final String SKI_OID = "2.5.29.14";
+    public static final String SKI_OID = "2.5.29.14";  //NOPMD - not an IP address
     /**
      * OID For the NameConstraints Extension to X.509
      *
      * http://java.sun.com/j2se/1.4.2/docs/api/
      * http://www.ietf.org/rfc/rfc3280.txt (s. 4.2.1.11)
      */
-    public static final String NAME_CONSTRAINTS_OID = "2.5.29.30";
+    public static final String NAME_CONSTRAINTS_OID = "2.5.29.30";  //NOPMD - not an IP address
     
     private static final org.slf4j.Logger LOG = 
         org.slf4j.LoggerFactory.getLogger(CryptoBase.class);
@@ -69,8 +69,8 @@ public abstract class CryptoBase impleme
         try {
             Class<?> c = Class.forName("org.bouncycastle.asn1.x500.X500Name");
             cons = c.getConstructor(new Class[] {String.class});
-        } catch (Exception e) {
-            //ignore
+        } catch (Exception e) { //NOPMD
+          //ignore
         }
         BC_509CLASS_CONS = cons;
     }
@@ -288,7 +288,7 @@ public abstract class CryptoBase impleme
         if (BC_509CLASS_CONS != null) {
              try {
                  return BC_509CLASS_CONS.newInstance(s);
-             } catch (Exception e) {
+             } catch (Exception e) { //NOPMD
                  //ignore
              }
         }

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java?rev=1671097&r1=1671096&r2=1671097&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java
Fri Apr  3 16:16:11 2015
@@ -37,7 +37,7 @@ import java.io.Writer;
 public final class DOM2Writer {
     public static final char NL = '\n';
     public static final String LS = System.getProperty("line.separator",
-            (Character.valueOf(NL)).toString());
+            Character.valueOf(NL).toString());
     
     private DOM2Writer() {
         // Complete
@@ -122,7 +122,7 @@ public final class DOM2Writer {
                             if (elNamespaceURI.equals(namespaceURI)) {
                                 prefixIsDeclared = true;
                             }
-                        } catch (IllegalArgumentException e) {
+                        } catch (IllegalArgumentException e) { //NOPMD
                             //
                         }
                         if (!prefixIsDeclared) {
@@ -145,7 +145,7 @@ public final class DOM2Writer {
                                 if (attrNamespaceURI.equals(namespaceURI)) {
                                     prefixIsDeclared = true;
                                 }
-                            } catch (IllegalArgumentException e) {
+                            } catch (IllegalArgumentException e) { //NOPMD
                                 //
                             }
                             if (!prefixIsDeclared) {



Mime
View raw message