svn commit: r1552883 - in /commons/proper/compress/trunk: ./ src/main/java/org/apache/commons/compress/archivers/arj/ src/main/java/org/apache/commons/compress/archivers/cpio/ src/main/java/org/apache/commons/compress/archivers/jar/

[bodewig]

Author: bodewig
Date: Sat Dec 21 06:46:59 2013
New Revision: 1552883

URL: http://svn.apache.org/r1552883
Log:
upgrade findbugs, this allows us to remove equals from JarEntry but needs a few 
additional adjustments

Modified:
    commons/proper/compress/trunk/pom.xml
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java

Modified: commons/proper/compress/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/pom.xml?rev=1552883&r1=1552882&r2=1552883&view=diff
==============================================================================
--- commons/proper/compress/trunk/pom.xml (original)
+++ commons/proper/compress/trunk/pom.xml Sat Dec 21 06:46:59 2013
@@ -207,7 +207,7 @@ These include: bzip2, gzip, pack200, lzm
         <!-- generate a code coverage report -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>2.6</version>
       </plugin>
       <plugin>
         <!-- generate the PMD reports -->
@@ -258,7 +258,7 @@ These include: bzip2, gzip, pack200, lzm
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>2.5.3</version>
         <configuration>
           <threshold>Normal</threshold>
           <effort>Default</effort>

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java?rev=1552883&r1=1552882&r2=1552883&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
 Sat Dec 21 06:46:59 2013
@@ -114,6 +114,7 @@ public class ArjArchiveInputStream exten
         if (charsetName != null) {
             return new String(buffer.toByteArray(), charsetName);
         } else {
+            // intentionally using the default encoding as that's the contract 
for a null charsetName
             return new String(buffer.toByteArray());
         }
     }

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java?rev=1552883&r1=1552882&r2=1552883&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
 Sat Dec 21 06:46:59 2013
@@ -264,6 +264,8 @@ public class CpioArchiveOutputStream ext
             writeBinaryLong(MAGIC_OLD_BINARY, 2, swapHalfWord);
             writeOldBinaryEntry(e, swapHalfWord);
             break;
+        default:
+            throw new IOException("unknown format " + e.getFormat());
         }
     }
 

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java?rev=1552883&r1=1552882&r2=1552883&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java
 Sat Dec 21 06:46:59 2013
@@ -87,19 +87,4 @@ public class JarArchiveEntry extends Zip
         return null;
     }
 
-    /* 
-     * We can chose between Findbugs complaining about
-     * 
http://findbugs.sourceforge.net/bugDescriptions.html#EQ_DOESNT_OVERRIDE_EQUALS
-     * or PMD stating "Overriding method merely calls super" - so far
-     * the choice is to make Findbugs happy.
-     */
-    @Override
-    public boolean equals(Object o) {
-        return super.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
 }