Merge branch 'master' of github.com:jeremylong/DependencyCheck

Former-commit-id: 3a30dd648eef49290e9290be719fb0eb25f79764
This commit is contained in:
Jeremy Long
2014-04-12 05:33:02 -04:00
2 changed files with 4 additions and 1 deletions

View File

@@ -92,7 +92,7 @@ public class ArchiveAnalyzer extends AbstractFileTypeAnalyzer {
/**
* The set of things we can handle with Zip methods
*/
private static final Set<String> ZIPPABLES = newHashSet("zip", "ear", "war", "nupkg");
private static final Set<String> ZIPPABLES = newHashSet("zip", "ear", "war", "jar", "sar", "apk", "nupkg");
/**
* The set of file extensions supported by this analyzer. Note for developers, any additions to this list will need
* to be explicitly handled in extractFiles().

View File

@@ -69,6 +69,9 @@ public class ArchiveAnalyzerTest extends AbstractDatabaseTestCase {
expResult.add("zip");
expResult.add("war");
expResult.add("ear");
expResult.add("jar");
expResult.add("sar");
expResult.add("apk");
expResult.add("nupkg");
expResult.add("tar");
expResult.add("gz");