diff --git a/.travis.yml b/.travis.yml index 7ca7bad83..fa619ef4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,12 +29,12 @@ matrix: env: - JDK="JDK7" script: - - if [ ! -z "$TRAVIS_TAG" ]; then travis_wait 20 mvn install site site:stage -DreleaseTesting; else travis_wait 15 mvn install -DreleaseTesting; fi + - if [ ! -z "$TRAVIS_TAG" ]; then travis_wait 30 mvn install site site:stage -DreleaseTesting; else travis_wait 30 mvn install -DreleaseTesting; fi - jdk: oraclejdk8 env: - JDK="JDK8" script: - - travis_wait 15 mvn install -DreleaseTesting + - travis_wait 30 mvn install -DreleaseTesting after_success: - if [ "$JDK" == "JDK8" ]; then diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.java index 4ae521fe1..a5d061229 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.java @@ -187,7 +187,7 @@ public abstract class AbstractAnalyzer implements Analyzer { @Override public boolean supportsParallelProcessing() { //temporarily removing parallel processing from all analyzders until further examination of thread safety occurs. - //return true; - return false; + return true; + //return false; } }