From b9767acd028386e5639fcbefdc9603b7cbf2ee81 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Fri, 31 May 2013 20:41:23 -0400 Subject: [PATCH] removed a reported exception for javadoc or sources jar files for not having a manifest Former-commit-id: 8dbe960af8c2391343d779708672d97a0c530a09 --- .../dependencycheck/analyzer/JarAnalyzer.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java b/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java index 3ab493820..0661321e4 100644 --- a/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java +++ b/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java @@ -219,8 +219,7 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { * pom. * @return whether or not evidence was added to the dependency */ - @edu.umd.cs.findbugs.annotations.SuppressWarnings( - value = "OS_OPEN_STREAM", + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "OS_OPEN_STREAM", justification = "The reader on line 259 is closed by closing the zipEntry") protected boolean analyzePOM(Dependency dependency) throws IOException, AnalysisException { boolean foundSomething = false; @@ -514,9 +513,15 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { final Manifest manifest = jar.getManifest(); if (manifest == null) { - Logger.getLogger(JarAnalyzer.class.getName()).log(Level.SEVERE, - String.format("Jar file '%s' does not contain a manifest.", - dependency.getFileName())); + //don't log this for javadoc or sources jar files + if (!dependency.getFileName().toLowerCase().endsWith("-sources.jar") + && !dependency.getFileName().toLowerCase().endsWith("-javadoc.jar") + && !dependency.getFileName().toLowerCase().endsWith("-src.jar") + && !dependency.getFileName().toLowerCase().endsWith("-doc.jar")) { + Logger.getLogger(JarAnalyzer.class.getName()).log(Level.SEVERE, + String.format("Jar file '%s' does not contain a manifest.", + dependency.getFileName())); + } return false; } final Attributes atts = manifest.getMainAttributes();