From 73d0127d51e68543044bf4e68097f13c9579f8a5 Mon Sep 17 00:00:00 2001
From: Philipp Dallig <philipp.dallig@gmail.com>
Date: Thu, 13 Apr 2023 11:55:31 +0200
Subject: [PATCH 1/2] Update api and api-impl to current LTS version

---
 sonar-dependency-check-plugin/pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sonar-dependency-check-plugin/pom.xml b/sonar-dependency-check-plugin/pom.xml
index ca3502f4..f01b1b00 100644
--- a/sonar-dependency-check-plugin/pom.xml
+++ b/sonar-dependency-check-plugin/pom.xml
@@ -19,7 +19,8 @@
     </scm>
 
     <properties>
-        <sonar.version>8.9.0.43852</sonar.version>
+        <sonar.api.version>9.9.0.229</sonar.api.version>
+        <sonar.api.impl.version>9.6.1.59531</sonar.api.impl.version>
         <!-- Configuration for sonar-packaging-maven-plugin -->
         <sonar.pluginClass>org.sonar.dependencycheck.DependencyCheckPlugin</sonar.pluginClass>
         <sonar.pluginName>Dependency-Check</sonar.pluginName>
@@ -34,9 +35,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.sonarsource.sonarqube</groupId>
+            <groupId>org.sonarsource.api.plugin</groupId>
             <artifactId>sonar-plugin-api</artifactId>
-            <version>${sonar.version}</version>
+            <version>${sonar.api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -89,7 +90,7 @@
         <dependency>
             <groupId>org.sonarsource.sonarqube</groupId>
             <artifactId>sonar-plugin-api-impl</artifactId>
-            <version>${sonar.version}</version>
+            <version>${sonar.api.impl.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From b45f55333eb52e02744a56230d44dda983c84134 Mon Sep 17 00:00:00 2001
From: Philipp Dallig <philipp.dallig@gmail.com>
Date: Thu, 13 Apr 2023 11:58:51 +0200
Subject: [PATCH 2/2] Remove jdk8 support

---
 .github/workflows/testing.yml         | 2 +-
 README.md                             | 7 ++++---
 pom.xml                               | 6 +++---
 sonar-dependency-check-plugin/pom.xml | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index b9086813..edd96a70 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11' ]
+        java: [ '11' , '17' ]
     name: Java ${{ matrix.Java }} testing
     steps:
       - name: Checkout
diff --git a/README.md b/README.md
index 44f59628..7fb2d968 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Dependency-Check Plugin for SonarQube 8.x and 9.x
+# Dependency-Check Plugin for SonarQube 9.x and 10.x
 
 ![Build Status](https://github.com/dependency-check/dependency-check-sonar-plugin/workflows/build/badge.svg?branch=master)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/e9cebd3112ec4252804bba68a5b44071)](https://www.codacy.com/gh/dependency-check/dependency-check-sonar-plugin/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=dependency-check/dependency-check-sonar-plugin&amp;utm_campaign=Badge_Grade)
@@ -8,7 +8,7 @@
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=dependency-check_dependency-check-sonar-plugin&metric=coverage)](https://sonarcloud.io/dashboard?id=dependency-check_dependency-check-sonar-plugin)
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=dependency-check_dependency-check-sonar-plugin&metric=security_rating)](https://sonarcloud.io/dashboard?id=dependency-check_dependency-check-sonar-plugin)
 
-Integrates [Dependency-Check][] reports into SonarQube v8.9 or higher.
+Integrates [Dependency-Check][] reports into SonarQube v9.9 or higher.
 
 The project will try to backport all code from master branch to last supported LTS. Please see the [SonarQube 6.x][] or [SonarQube 7.x][] branch for old supported version.
 
@@ -67,7 +67,8 @@ Please use the newest version. Please keep in mind that this plugin only support
 
 | Plugin Version | SonarQube version           |
 | -------------- | --------------------------- |
-| 3.0.0 and up   | SonarQube 8.9 LTS and up    |
+| 4.0.0 and up   | SonarQube 9.9 LTS and up    |
+| 3.0.0 - 3.1.0  | SonarQube 8.9 LTS - 9.9 LTS |
 | 2.0.6 - 2.0.8  | SonarQube 7.9 LTS - 8.9 LTS |
 | 1.2.x - 2.0.5  | SonarQube 7.6 - 7.9 LTS     |
 | 1.1.x          | SonarQube 6.7 LTS           |
diff --git a/pom.xml b/pom.xml
index bf580731..8616b205 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     </parent>
     <groupId>org.sonarsource.owasp</groupId>
     <artifactId>sonar-dependency-check</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Dependency-Check for SonarQube</name>
     <description>Integrates Dependency-Check reports into SonarQube</description>
@@ -17,7 +17,7 @@
     <properties>
         <license.owner>dependency-check</license.owner>
         <license.mailto>philipp.dallig@gmail.com</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>
@@ -113,7 +113,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <source>8</source>
+                    <source>${jdk.min.version}</source>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/sonar-dependency-check-plugin/pom.xml b/sonar-dependency-check-plugin/pom.xml
index f01b1b00..d0b29de1 100644
--- a/sonar-dependency-check-plugin/pom.xml
+++ b/sonar-dependency-check-plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.sonarsource.owasp</groupId>
         <artifactId>sonar-dependency-check</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>sonar-dependency-check-plugin</artifactId>
     <packaging>sonar-plugin</packaging>