From 30e926099e550d5952748fb1cd7d7897a846a9f3 Mon Sep 17 00:00:00 2001
From: grimsi <9295182+grimsi@users.noreply.github.com>
Date: Fri, 21 Oct 2022 18:54:22 +0200
Subject: [PATCH 1/7] Fix pom.xml

---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index d8f8f43..cef79b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,11 +34,6 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
 
-    <properties>
-        <sonar.organization>grimsi-github</sonar.organization>
-        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-    </properties>
-
     <build>
         <plugins>
             <plugin>

From 8fefc4588ab53f2d35d23f19a957d7e9d2147a8a Mon Sep 17 00:00:00 2001
From: grimsi <9295182+grimsi@users.noreply.github.com>
Date: Fri, 21 Oct 2022 19:08:46 +0200
Subject: [PATCH 2/7] Fix SonarCloud config

---
 .github/workflows/build.yml | 2 +-
 pom.xml                     | 4 +++-
 sonar-project.properties    | 5 -----
 3 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 sonar-project.properties

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 08cd03b..61235eb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=grimsi_gameyfin
+        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v3
diff --git a/pom.xml b/pom.xml
index cef79b4..1751f87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,8 +30,10 @@
     </scm>
   
     <properties>
-        <sonar.organization>grimsi-github</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+        <sonar.organization>grimsi-github</sonar.organization>
+        <sonar.projectKey>grimsi_gameyfin</sonar.projectKey>
+        <sonar.coverage.jacoco.xmlReportPaths>./backend/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
     <build>
diff --git a/sonar-project.properties b/sonar-project.properties
deleted file mode 100644
index 94f3f62..0000000
--- a/sonar-project.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# Point SONAR to the compiled Java classes
-sonar.java.binaries=./backend/target
-
-# Point SONAR to the JaCoCo report
-sonar.coverage.jacoco.xmlReportPaths=./backend/target/site/jacoco-aggregate/jacoco.xml

From 738269b00fbb78612d0f8b1085e4b46c9c390fea Mon Sep 17 00:00:00 2001
From: grimsi <9295182+grimsi@users.noreply.github.com>
Date: Fri, 21 Oct 2022 19:12:23 +0200
Subject: [PATCH 3/7] Fix SonarCloud config

---
 backend/pom.xml | 3 +++
 pom.xml         | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 5247c41..70e9ff3 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -15,6 +15,9 @@
     <properties>
         <java.version>18</java.version>
 
+        <sonar.projectKey>grimsi_gameyfin</sonar.projectKey>
+        <sonar.coverage.jacoco.xmlReportPaths>./backend/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+
         <springdoc-openapi-ui.version>1.6.11</springdoc-openapi-ui.version>
         <resilience4j.version>1.7.1</resilience4j.version>
         <commons-io.version>2.11.0</commons-io.version>
diff --git a/pom.xml b/pom.xml
index 1751f87..bd29ecd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,8 +32,6 @@
     <properties>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.organization>grimsi-github</sonar.organization>
-        <sonar.projectKey>grimsi_gameyfin</sonar.projectKey>
-        <sonar.coverage.jacoco.xmlReportPaths>./backend/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
     <build>

From cfc5bc3ec4f56547eee78d889801672b6a016d37 Mon Sep 17 00:00:00 2001
From: grimsi <9295182+grimsi@users.noreply.github.com>
Date: Fri, 21 Oct 2022 19:21:32 +0200
Subject: [PATCH 4/7] Fix JaCoCo & SonarCloud config

---
 backend/pom.xml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 70e9ff3..f111a1a 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -16,7 +16,10 @@
         <java.version>18</java.version>
 
         <sonar.projectKey>grimsi_gameyfin</sonar.projectKey>
-        <sonar.coverage.jacoco.xmlReportPaths>./backend/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+        <sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
+        <sonar.language>java</sonar.language>
 
         <springdoc-openapi-ui.version>1.6.11</springdoc-openapi-ui.version>
         <resilience4j.version>1.7.1</resilience4j.version>
@@ -26,6 +29,7 @@
         <protobuf-java.version>3.21.7</protobuf-java.version>
         <easy-random.version>5.0.0</easy-random.version>
         <easy-random-protobuf.version>0.4.0</easy-random-protobuf.version>
+        <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
 
         <!-- Use older version because the newer versions have problems with non-ASCII characters in properties files (umlauts etc.) -->
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
@@ -262,14 +266,20 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>${jacoco-maven-plugin.version}</version>
                 <executions>
                     <execution>
-                        <id>report</id>
+                        <id>jacoco-initialize</id>
                         <goals>
-                            <goal>report-aggregate</goal>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>jacoco-site</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>report</goal>
                         </goals>
-                        <phase>verify</phase>
                     </execution>
                 </executions>
             </plugin>

From 424ff805d40789449b2e955c06e91e0c484e0db3 Mon Sep 17 00:00:00 2001
From: grimsi <9295182+grimsi@users.noreply.github.com>
Date: Fri, 21 Oct 2022 19:28:46 +0200
Subject: [PATCH 5/7] Update JaCoCo Sonar integration

---
 backend/pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index f111a1a..c63986e 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -16,10 +16,7 @@
         <java.version>18</java.version>
 
         <sonar.projectKey>grimsi_gameyfin</sonar.projectKey>
-        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-        <sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
-        <sonar.language>java</sonar.language>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 
         <springdoc-openapi-ui.version>1.6.11</springdoc-openapi-ui.version>
         <resilience4j.version>1.7.1</resilience4j.version>

From cc0004b0e288493e77fa61bfb84aad1facf35c54 Mon Sep 17 00:00:00 2001
From: grimsi <9295182+grimsi@users.noreply.github.com>
Date: Fri, 21 Oct 2022 19:40:05 +0200
Subject: [PATCH 6/7] Update JaCoCo Sonar integration

---
 backend/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index c63986e..fdce545 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -16,7 +16,6 @@
         <java.version>18</java.version>
 
         <sonar.projectKey>grimsi_gameyfin</sonar.projectKey>
-        <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 
         <springdoc-openapi-ui.version>1.6.11</springdoc-openapi-ui.version>
         <resilience4j.version>1.7.1</resilience4j.version>

From 43f16a44be91bc4be15cd242704cdfcf6d82624c Mon Sep 17 00:00:00 2001
From: grimsi <9295182+grimsi@users.noreply.github.com>
Date: Fri, 21 Oct 2022 19:48:48 +0200
Subject: [PATCH 7/7] Add Sonar project key to CI

---
 .github/workflows/build.yml | 2 +-
 backend/pom.xml             | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 61235eb..08cd03b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=grimsi_gameyfin
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v3
diff --git a/backend/pom.xml b/backend/pom.xml
index fdce545..3c8d4c8 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -15,8 +15,6 @@
     <properties>
         <java.version>18</java.version>
 
-        <sonar.projectKey>grimsi_gameyfin</sonar.projectKey>
-
         <springdoc-openapi-ui.version>1.6.11</springdoc-openapi-ui.version>
         <resilience4j.version>1.7.1</resilience4j.version>
         <commons-io.version>2.11.0</commons-io.version>