From 92ed30a415383cddc3d703a53c4bb78faee9995e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 12 Aug 2023 12:52:56 -0700
Subject: [PATCH] Added sonarcloud to GitHub workflow

---
 .github/workflows/bld.yml                     |  17 ++++++++++++++++-
 .idea/misc.xml                                |   1 -
 lib/bld/bld-wrapper.jar                       | Bin 27258 -> 27258 bytes
 lib/bld/bld-wrapper.properties                |   3 ++-
 .../erik/httpstatus/HttpStatusBuild.java      |  11 ++++++++++-
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml
index ddcc35c..bdafdc9 100644
--- a/.github/workflows/bld.yml
+++ b/.github/workflows/bld.yml
@@ -29,4 +29,19 @@ jobs:
         run: ./bld download
 
       - name: Run tests with bld
-        run: ./bld compile test
\ No newline at end of file
+        run: ./bld compile jacoco
+
+      - name: SonarCloud Scan
+        uses: sonarsource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        args: >
+          -Dsonar.organization=ethauvin-github
+          -Dsonar.projectKey=my-ethauvin_HttpStatus
+          -Dsonar.coverage.jacoco.xmlReportPaths=build/reports/jacoco/test/jacocoTestReport.xml
+          -Dsonar.jacoco.reportPath=build/jacoco/jacoco.exec
+          -Dsonar.sources=src/main/java/
+          -Dsonar.tests=src/test/java/
+          -Dsonar.verbose=true
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fa84ea4..a092c32 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <pattern value="net.thauvin.erik.httpstatus.HttpStatusBuild" />
diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
index 6af9e71e66fc1adc3d2662c003f39e6029ff9f08..28a07b517ed576198d012e5a0f2f2bee4d6cf8c1 100644
GIT binary patch
delta 145
zcmex$h4I%FM!o=VW)=|!4h{|m^Aw)&iF~yzAbMlJmNA&Id9QI76NKe$c0d=x;!iop
y2w^=;HGs%Y7R|5&3r!BsaDp)AW_UmtFEfH642Mh?2%{r27AlqL2Vq!e*#iJDg)6`S

delta 145
zcmex$h4I%FM!o=VW)=|!4h{~6hc#=$Ci2y?fas0=TE<|;=Do&UOc0j0*#TV$i$CQY
yBZT!Z)c_(pSv12AEHpVh!wJHeo8bXryvzuOFdQ;nAdHU8Sg2H{AB16@We)&3UOx^1

diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index 54bdb35..95c4633 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -1,6 +1,7 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.1
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.2-SNAPSHOT
+bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.0-SNAPSHOT
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.version=1.7.0
diff --git a/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java b/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java
index 79cbac7..a14d668 100644
--- a/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java
+++ b/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java
@@ -35,12 +35,14 @@ package net.thauvin.erik.httpstatus;
 import rife.bld.BuildCommand;
 import rife.bld.Project;
 import rife.bld.dependencies.Dependency;
+import rife.bld.extension.JacocoReportOperation;
 import rife.bld.extension.PmdOperation;
 import rife.bld.publish.PublishDeveloper;
 import rife.bld.publish.PublishInfo;
 import rife.bld.publish.PublishLicense;
 import rife.bld.publish.PublishScm;
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -117,8 +119,15 @@ public class HttpStatusBuild extends Project {
         Files.copy(pomPath, Path.of(workDirectory.getAbsolutePath(), "pom.xml"), StandardCopyOption.REPLACE_EXISTING);
     }
 
+    @BuildCommand(summary = "Generates Jacoco Reports")
+    public void jacoco() throws IOException {
+        new JacocoReportOperation()
+                .fromProject(this)
+                .execute();
+    }
+
     @BuildCommand(summary = "Runs PMD analysis")
-    public void pmd() throws Exception {
+    public void pmd() {
         new PmdOperation()
                 .fromProject(this)
                 .failOnViolation(true)