Skip to content
This repository was archived by the owner on Feb 17, 2025. It is now read-only.

Commit 0fd289a

Browse files
authored
chore: Remove code-paths for Java versions <=8 (#7297)
1 parent b51921f commit 0fd289a

File tree

8 files changed

+1
-609
lines changed

8 files changed

+1
-609
lines changed

core/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
299299
<groupId>com.fasterxml.jackson.datatype</groupId>
300300
<artifactId>jackson-datatype-jsr310</artifactId>
301301
</dependency>
302-
<dependency>
303-
<groupId>com.fasterxml.jackson.module</groupId>
304-
<artifactId>jackson-module-afterburner</artifactId>
305-
</dependency>
306302
<dependency>
307303
<groupId>com.fasterxml.jackson.module</groupId>
308304
<artifactId>jackson-module-blackbird</artifactId>

core/src/main/java/org/owasp/dependencycheck/Engine.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
import static org.owasp.dependencycheck.analyzer.AnalysisPhase.PRE_INFORMATION_COLLECTION;
8787
import org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer;
8888
import org.owasp.dependencycheck.dependency.naming.Identifier;
89-
import org.owasp.dependencycheck.utils.Utils;
9089

9190
/**
9291
* Scans files, directories, etc. for Dependencies. Analyzers are loaded and
@@ -191,8 +190,6 @@ public Engine(@NotNull final ClassLoader serviceClassLoader, @NotNull final Mode
191190
this.mode = mode;
192191
this.accessExternalSchema = System.getProperty("javax.xml.accessExternalSchema");
193192

194-
checkRuntimeVersion();
195-
196193
initializeEngine();
197194
}
198195

@@ -1286,19 +1283,6 @@ private boolean identifiersMatch(Set<Identifier> left, Set<Identifier> right) {
12861283
return false;
12871284
}
12881285

1289-
/**
1290-
* Checks that if Java 8 is being used, it is at least update 251. This is
1291-
* required as a new method was introduced that is used by Apache HTTP
1292-
* Client. See
1293-
* https://stackoverflow.com/questions/76226322/exception-in-thread-httpclient-dispatch-1-java-lang-nosuchmethoderror-javax-n#comment134427003_76226322
1294-
*/
1295-
private void checkRuntimeVersion() {
1296-
if (Utils.getJavaVersion() == 8 && Utils.getJavaUpdateVersion() < 251) {
1297-
LOGGER.error("Non-supported Java Runtime: dependency-check requires at least Java 8 update 251 or higher.");
1298-
throw new RuntimeException("dependency-check requires Java 8 update 251 or higher");
1299-
}
1300-
}
1301-
13021286
/**
13031287
* {@link Engine} execution modes.
13041288
*/

core/src/main/java/org/owasp/dependencycheck/data/update/cisa/KnownExploitedVulnerabilityParser.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919

2020
import com.fasterxml.jackson.core.JsonParser;
2121
import com.fasterxml.jackson.databind.DeserializationFeature;
22-
import com.fasterxml.jackson.databind.Module;
2322
import com.fasterxml.jackson.databind.ObjectMapper;
2423
import com.fasterxml.jackson.databind.ObjectReader;
25-
import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
2624
import com.fasterxml.jackson.module.blackbird.BlackbirdModule;
2725
import java.io.EOFException;
2826
import java.io.IOException;
@@ -33,7 +31,6 @@
3331
import org.owasp.dependencycheck.data.knownexploited.json.KnownExploitedVulnerabilitiesSchema;
3432
import org.owasp.dependencycheck.data.update.exception.CorruptedDatastreamException;
3533
import org.owasp.dependencycheck.data.update.exception.UpdateException;
36-
import org.owasp.dependencycheck.utils.Utils;
3734
import org.slf4j.Logger;
3835
import org.slf4j.LoggerFactory;
3936

@@ -61,13 +58,7 @@ public class KnownExploitedVulnerabilityParser {
6158
public KnownExploitedVulnerabilitiesSchema parse(InputStream in) throws UpdateException, CorruptedDatastreamException {
6259

6360
final ObjectMapper objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
64-
final Module module;
65-
if (Utils.getJavaVersion() <= 8) {
66-
module = new AfterburnerModule();
67-
} else {
68-
module = new BlackbirdModule();
69-
}
70-
objectMapper.registerModule(module);
61+
objectMapper.registerModule(new BlackbirdModule());
7162

7263
final ObjectReader objectReader = objectMapper.readerFor(KnownExploitedVulnerabilitiesSchema.class);
7364

core/src/main/java/org/owasp/dependencycheck/utils/Utils.java

Lines changed: 0 additions & 120 deletions
This file was deleted.

core/src/test/java/org/owasp/dependencycheck/utils/UtilsTest.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)