From 0b111301a4728d3fb103130674be86a802deca50 Mon Sep 17 00:00:00 2001
From: James Vance <whitesoup12@gmail.com>
Date: Tue, 28 Nov 2023 15:53:15 -0600
Subject: [PATCH 1/2] Revert Jacoco changes

---
 remote-falcon-api/pom.xml     | 20 ++++++++++++++++----
 remote-falcon-api/qodana.yaml |  3 ---
 remote-falcon-web/qodana.yaml |  3 ---
 3 files changed, 16 insertions(+), 10 deletions(-)
 delete mode 100644 remote-falcon-api/qodana.yaml
 delete mode 100644 remote-falcon-web/qodana.yaml

diff --git a/remote-falcon-api/pom.xml b/remote-falcon-api/pom.xml
index f9a5b05..222f06b 100644
--- a/remote-falcon-api/pom.xml
+++ b/remote-falcon-api/pom.xml
@@ -12,7 +12,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
-        <jacoco.version>0.8.7</jacoco.version>
+        <jacoco.version>0.8.7</jacoco.version><sonar.organization>remote-falcon</sonar.organization>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+        <sonar.language>java</sonar.language>
+        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+        <sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
     </properties>
 
     <parent>
@@ -221,20 +226,27 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>${jacoco.version}</version>
+                <configuration>
+                    <destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
+                    <dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
+                    <output>file</output>
+                    <append>true</append>
+                </configuration>
                 <executions>
                     <execution>
+                        <id>jacoco-initialize</id>
                         <goals>
                             <goal>prepare-agent</goal>
                         </goals>
+                        <phase>test-compile</phase>
                     </execution>
                     <execution>
-                        <id>report</id>
-                        <phase>test</phase>
+                        <id>jacoco-site</id>
+                        <phase>verify</phase>
                         <goals>
                             <goal>report</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.basedir}/.qodana/code-coverage/</outputDirectory>
                             <formats>XML</formats>
                             <excludes>
                                 <exclude>com/remotefalcon/api/aop/*</exclude>
diff --git a/remote-falcon-api/qodana.yaml b/remote-falcon-api/qodana.yaml
deleted file mode 100644
index c5de121..0000000
--- a/remote-falcon-api/qodana.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-version: "1.0"
-profile:
-  name: qodana.recommended
diff --git a/remote-falcon-web/qodana.yaml b/remote-falcon-web/qodana.yaml
deleted file mode 100644
index 2971434..0000000
--- a/remote-falcon-web/qodana.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-version: "1.0"
-profile:
-  name: qodana.recommended
\ No newline at end of file

From 0f796f3b26ef465c98b1bd33a6f512a52e2f2540 Mon Sep 17 00:00:00 2001
From: James Vance <whitesoup12@gmail.com>
Date: Tue, 28 Nov 2023 15:53:52 -0600
Subject: [PATCH 2/2] PR template change

---
 .github/pull_request_template.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6577d52..e69de29 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,3 +0,0 @@
-### Qodana Scans
-
-[![Qodana RF API](https://github.com/whitesoup12/remote-falcon/actions/workflows/qodana-api.yml/badge.svg)](https://github.com/whitesoup12/remote-falcon/actions/workflows/qodana-api.yml)
\ No newline at end of file