Skip to content

Commit c73d1ad

Browse files
authored
Restore JDK8 compatibility (#616)
1 parent 6100fb1 commit c73d1ad

8 files changed

Lines changed: 9 additions & 10 deletions

File tree

.github/workflows/testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
java: [ '11' ]
14+
java: [ '8', '11' ]
1515
name: Java ${{ matrix.Java }} testing
1616
steps:
1717
- name: Checkout

pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<license.owner>dependency-check</license.owner>
1919
<license.mailto>philipp.dallig@gmail.com</license.mailto>
2020

21-
<jdk.min.version>11</jdk.min.version>
2221
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
2322
<sonar.projectKey>dependency-check_dependency-check-sonar-plugin</sonar.projectKey>
2423
<sonar.organization>dependency-check</sonar.organization>

sonar-dependency-check-plugin/src/main/java/org/sonar/dependencycheck/base/DependencyCheckConstants.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ public final class DependencyCheckConstants {
2424
/**
2525
* @deprecated Please use the JSON Report
2626
*/
27-
@Deprecated(since = "3.0.0", forRemoval = true)
27+
@Deprecated
2828
public static final String XML_REPORT_PATH_PROPERTY = "sonar.dependencyCheck.xmlReportPath";
2929

3030
/**
3131
* @deprecated Please use the JSON Report
3232
*/
33-
@Deprecated(since = "3.0.0", forRemoval = true)
33+
@Deprecated
3434
public static final String DEPRECTED_XML_REPORT_PATH_PROPERTY = "sonar.dependencyCheck.reportPath";
3535
public static final String JSON_REPORT_PATH_PROPERTY = "sonar.dependencyCheck.jsonReportPath";
3636
public static final String HTML_REPORT_PATH_PROPERTY = "sonar.dependencyCheck.htmlReportPath";
@@ -50,7 +50,7 @@ public final class DependencyCheckConstants {
5050
/**
5151
* @deprecated Please use the JSON Report
5252
*/
53-
@Deprecated(since = "3.0.0", forRemoval = true)
53+
@Deprecated
5454
public static final String XML_REPORT_PATH_DEFAULT = "${WORKSPACE}/dependency-check-report.xml";
5555
public static final String JSON_REPORT_PATH_DEFAULT = "${WORKSPACE}/dependency-check-report.json";
5656
public static final String HTML_REPORT_PATH_DEFAULT = "${WORKSPACE}/dependency-check-report.html";

sonar-dependency-check-plugin/src/main/java/org/sonar/dependencycheck/parser/XMLReportParserHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
/**
3333
* @deprecated Please use the JSON Report
3434
*/
35-
@Deprecated(since = "3.0.0", forRemoval = true)
35+
@Deprecated
3636
public class XMLReportParserHelper {
3737

3838
private XMLReportParserHelper() {

sonar-dependency-check-plugin/src/main/java/org/sonar/dependencycheck/report/ReportFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package org.sonar.dependencycheck.report;
2121

2222
public enum ReportFormat {
23-
@Deprecated(since = "3.0.0", forRemoval = true)
23+
@Deprecated
2424
XML,
2525
HTML,
2626
JSON

sonar-dependency-check-plugin/src/main/java/org/sonar/dependencycheck/report/XmlReportFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/**
3131
* @deprecated Please use the JsonReportFile
3232
*/
33-
@Deprecated(since = "3.0.0", forRemoval = true)
33+
@Deprecated
3434
public class XmlReportFile extends ReportFile {
3535

3636
public static XmlReportFile getXmlReport(Configuration config, FileSystem fileSystem, PathResolver pathResolver) throws FileNotFoundException {

sonar-dependency-check-plugin/src/test/java/org/sonar/dependencycheck/DependencyCheckSensorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ void shouldAddWarningsPlugin() {
236236
}
237237

238238
@Test
239-
@Deprecated(since = "3.0.0", forRemoval = true)
239+
@Deprecated
240240
void shouldAddWarningsWithXMLReportPlugin() {
241241
final SensorContextTester context = SensorContextTester.create(new File(""));
242242
// Plugin Configuration

sonar-dependency-check-plugin/src/test/java/org/sonar/dependencycheck/parser/XMLReportParserHelperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.sonar.dependencycheck.parser.element.Dependency;
4242
import org.sonar.dependencycheck.parser.element.Vulnerability;
4343

44-
@Deprecated(since = "3.0.0", forRemoval = true)
44+
@Deprecated
4545
class XMLReportParserHelperTest extends ReportParserTest {
4646

4747
@Override

0 commit comments

Comments
 (0)