Restore JDK8 compatibility (#616)

dependency-check · Feb 24, 2022 · c73d1ad · c73d1ad
1 parent 6100fb1
commit c73d1ad
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '11' ]
+        java: [ '8', '11' ]
     name: Java ${{ matrix.Java }} testing
     steps:
       - name: Checkout

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,6 @@
         <license.owner>dependency-check</license.owner>
         <license.mailto>[email protected]</license.mailto>
 
-        <jdk.min.version>11</jdk.min.version>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.projectKey>dependency-check_dependency-check-sonar-plugin</sonar.projectKey>
         <sonar.organization>dependency-check</sonar.organization>

diff --git a/...y-check-plugin/src/main/java/org/sonar/dependencycheck/base/DependencyCheckConstants.java b/...y-check-plugin/src/main/java/org/sonar/dependencycheck/base/DependencyCheckConstants.java
@@ -24,13 +24,13 @@ public final class DependencyCheckConstants {
     /**
      * @deprecated Please use the JSON Report
      */
-    @Deprecated(since = "3.0.0", forRemoval = true)
+    @Deprecated
     public static final String XML_REPORT_PATH_PROPERTY = "sonar.dependencyCheck.xmlReportPath";
 
     /**
      * @deprecated Please use the JSON Report
      */
-    @Deprecated(since = "3.0.0", forRemoval = true)
+    @Deprecated
     public static final String DEPRECTED_XML_REPORT_PATH_PROPERTY = "sonar.dependencyCheck.reportPath";
     public static final String JSON_REPORT_PATH_PROPERTY = "sonar.dependencyCheck.jsonReportPath";
     public static final String HTML_REPORT_PATH_PROPERTY = "sonar.dependencyCheck.htmlReportPath";
@@ -50,7 +50,7 @@ public final class DependencyCheckConstants {
     /**
      * @deprecated Please use the JSON Report
      */
-    @Deprecated(since = "3.0.0", forRemoval = true)
+    @Deprecated
     public static final String XML_REPORT_PATH_DEFAULT = "${WORKSPACE}/dependency-check-report.xml";
     public static final String JSON_REPORT_PATH_DEFAULT = "${WORKSPACE}/dependency-check-report.json";
     public static final String HTML_REPORT_PATH_DEFAULT = "${WORKSPACE}/dependency-check-report.html";

diff --git a/...cy-check-plugin/src/main/java/org/sonar/dependencycheck/parser/XMLReportParserHelper.java b/...cy-check-plugin/src/main/java/org/sonar/dependencycheck/parser/XMLReportParserHelper.java
@@ -32,7 +32,7 @@
 /**
  * @deprecated Please use the JSON Report
  */
-@Deprecated(since = "3.0.0", forRemoval = true)
+@Deprecated
 public class XMLReportParserHelper {
 
     private XMLReportParserHelper() {

diff --git a/...-dependency-check-plugin/src/main/java/org/sonar/dependencycheck/report/ReportFormat.java b/...-dependency-check-plugin/src/main/java/org/sonar/dependencycheck/report/ReportFormat.java
@@ -20,7 +20,7 @@
 package org.sonar.dependencycheck.report;
 
 public enum ReportFormat {
-    @Deprecated(since = "3.0.0", forRemoval = true)
+    @Deprecated
     XML,
     HTML,
     JSON

diff --git a/...dependency-check-plugin/src/main/java/org/sonar/dependencycheck/report/XmlReportFile.java b/...dependency-check-plugin/src/main/java/org/sonar/dependencycheck/report/XmlReportFile.java
@@ -30,7 +30,7 @@
 /**
  * @deprecated Please use the JsonReportFile
  */
-@Deprecated(since = "3.0.0", forRemoval = true)
+@Deprecated
 public class XmlReportFile extends ReportFile {
 
     public static XmlReportFile getXmlReport(Configuration config, FileSystem fileSystem, PathResolver pathResolver) throws FileNotFoundException {

diff --git a/...dency-check-plugin/src/test/java/org/sonar/dependencycheck/DependencyCheckSensorTest.java b/...dency-check-plugin/src/test/java/org/sonar/dependencycheck/DependencyCheckSensorTest.java
@@ -236,7 +236,7 @@ void shouldAddWarningsPlugin() {
     }
 
     @Test
-    @Deprecated(since = "3.0.0", forRemoval = true)
+    @Deprecated
     void shouldAddWarningsWithXMLReportPlugin() {
         final SensorContextTester context = SensorContextTester.create(new File(""));
         // Plugin Configuration

diff --git a/...heck-plugin/src/test/java/org/sonar/dependencycheck/parser/XMLReportParserHelperTest.java b/...heck-plugin/src/test/java/org/sonar/dependencycheck/parser/XMLReportParserHelperTest.java
@@ -41,7 +41,7 @@
 import org.sonar.dependencycheck.parser.element.Dependency;
 import org.sonar.dependencycheck.parser.element.Vulnerability;
 
-@Deprecated(since = "3.0.0", forRemoval = true)
+@Deprecated
 class XMLReportParserHelperTest extends ReportParserTest {
 
     @Override