From 22ef7d980cd285b1ed9416a0b2fa98cb1bba84b6 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Wed, 19 Jul 2023 14:51:18 -0700 Subject: [PATCH 1/9] Fixing SonarCloud --- .github/workflows/maven.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 74f92e25c..6bc2993b3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -41,6 +41,12 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Build with Maven - run: mvn -B package - - name: Analyze with SonarCloud and run tests - run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=bcgov_VDYP + run: mvn package + - name: Run Sonar Analysis + run: mvn sonar:sonar + -Dsonar.login=${{ secrets.SONAR_TOKEN }} + -Dsonar.host.url=https://sonarcloud.io + -Dsonar.organization=bcgov-sonarcloud + -Dsonar.projectKey=bcgov_VDYP + env: + GITHUB_TOKEN: ${{ github.token }} From 831470fbe53f07d26fdec56404394b25981ce424 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Thu, 20 Jul 2023 10:52:31 -0700 Subject: [PATCH 2/9] Add JaCoCo plugin --- pom.xml | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 0cd915795..5f3c81eee 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,6 @@ 2.2 5.1.0 - bcgov-sonarcloud - https://sonarcloud.io - @@ -114,9 +111,40 @@ - - + + + coverage + + + + org.jacoco + jacoco-maven-plugin + 0.8.9 + + + prepare-agent + + prepare-agent + + + + report + + report + + + + XML + + + + + + + + + From 4c4dabae537ff33612126f837afe17b291610345 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Thu, 20 Jul 2023 12:03:09 -0700 Subject: [PATCH 3/9] Report aggregate module --- pom.xml | 4 +++- report-aggregate/pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 report-aggregate/pom.xml diff --git a/pom.xml b/pom.xml index 5f3c81eee..23c481b20 100644 --- a/pom.xml +++ b/pom.xml @@ -18,13 +18,15 @@ 5.9.2 2.2 5.1.0 - + + ${project.basedir}/report-aggregate/target/site/jacoco-aggregate/jacoco.xml vdyp-core vdyp-fip vdyp-buildtools + report-aggregate diff --git a/report-aggregate/pom.xml b/report-aggregate/pom.xml new file mode 100644 index 000000000..ab07645eb --- /dev/null +++ b/report-aggregate/pom.xml @@ -0,0 +1,40 @@ + + 4.0.0 + + ca.bc.gov.nrs.vdyp + report-aggregate + 0.0.1-SNAPSHOT + Variable Density Yield Project - Report Aggregation + Aggregate Coverage Report + + + + ${project.groupId} + vdyp-common + ${project.version} + + + ${project.groupId} + vdyp-fip + ${project.version} + + + + + + + org.jacoco + jacoco-maven-plugin + + + report-aggregate + verify + + report-aggregate + + + + + + + From e5fa49a9a80db41cd577220b2fb8b5b927a8ce56 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Thu, 20 Jul 2023 12:19:59 -0700 Subject: [PATCH 4/9] Add coverage profile to sonar execution --- .github/workflows/maven.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6bc2993b3..6aa4d4784 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -44,6 +44,7 @@ jobs: run: mvn package - name: Run Sonar Analysis run: mvn sonar:sonar + -Pcoverage -Dsonar.login=${{ secrets.SONAR_TOKEN }} -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=bcgov-sonarcloud From 812fade19d45987dce5aa450107ba01f4646745a Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Thu, 20 Jul 2023 12:23:05 -0700 Subject: [PATCH 5/9] Core instead of common until we catch up --- report-aggregate/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report-aggregate/pom.xml b/report-aggregate/pom.xml index ab07645eb..674f1d2fa 100644 --- a/report-aggregate/pom.xml +++ b/report-aggregate/pom.xml @@ -10,7 +10,7 @@ ${project.groupId} - vdyp-common + vdyp-core ${project.version} From 19aff1359b7f798ee976be669d8df214609e5a48 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Thu, 20 Jul 2023 13:23:48 -0700 Subject: [PATCH 6/9] Manage JaCoCo plugin version --- pom.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 23c481b20..e91f9f110 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,11 @@ formatter-maven-plugin 2.22.0 - + + org.jacoco + jacoco-maven-plugin + 0.8.9 + @@ -124,7 +128,6 @@ org.jacoco jacoco-maven-plugin - 0.8.9 prepare-agent From 88ca232bf24c245db0aa63c27dbf74784f403079 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Thu, 20 Jul 2023 13:34:22 -0700 Subject: [PATCH 7/9] Backreference to parent in report aggregate module --- report-aggregate/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/report-aggregate/pom.xml b/report-aggregate/pom.xml index 674f1d2fa..32da218dd 100644 --- a/report-aggregate/pom.xml +++ b/report-aggregate/pom.xml @@ -4,6 +4,14 @@ ca.bc.gov.nrs.vdyp report-aggregate 0.0.1-SNAPSHOT + + + ca.bc.gov.nrs.vdyp + vdyp-parent + 0.0.1-SNAPSHOT + + + Variable Density Yield Project - Report Aggregation Aggregate Coverage Report From fbea09ce130b73aa110820bb9ad56fe3c593547d Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Thu, 20 Jul 2023 13:45:37 -0700 Subject: [PATCH 8/9] Remove report coverage report aggregation --- pom.xml | 2 -- report-aggregate/pom.xml | 48 ---------------------------------------- 2 files changed, 50 deletions(-) delete mode 100644 report-aggregate/pom.xml diff --git a/pom.xml b/pom.xml index e91f9f110..0ebb3ea65 100644 --- a/pom.xml +++ b/pom.xml @@ -19,14 +19,12 @@ 2.2 5.1.0 - ${project.basedir}/report-aggregate/target/site/jacoco-aggregate/jacoco.xml vdyp-core vdyp-fip vdyp-buildtools - report-aggregate diff --git a/report-aggregate/pom.xml b/report-aggregate/pom.xml deleted file mode 100644 index 32da218dd..000000000 --- a/report-aggregate/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - 4.0.0 - - ca.bc.gov.nrs.vdyp - report-aggregate - 0.0.1-SNAPSHOT - - - ca.bc.gov.nrs.vdyp - vdyp-parent - 0.0.1-SNAPSHOT - - - - Variable Density Yield Project - Report Aggregation - Aggregate Coverage Report - - - - ${project.groupId} - vdyp-core - ${project.version} - - - ${project.groupId} - vdyp-fip - ${project.version} - - - - - - - org.jacoco - jacoco-maven-plugin - - - report-aggregate - verify - - report-aggregate - - - - - - - From 0197b1f0066431e34fdebb2bd359bbbba78522d0 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Thu, 20 Jul 2023 13:59:25 -0700 Subject: [PATCH 9/9] Move sonar login token to env variable and apply coverage profile during package build --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6aa4d4784..9223ce8d2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -41,13 +41,13 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Build with Maven - run: mvn package + run: mvn -Pcoverage package verify - name: Run Sonar Analysis run: mvn sonar:sonar -Pcoverage - -Dsonar.login=${{ secrets.SONAR_TOKEN }} -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=bcgov-sonarcloud -Dsonar.projectKey=bcgov_VDYP env: GITHUB_TOKEN: ${{ github.token }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}