Fix sonarqube after merge

bcgov · Nov 22, 2023 · f793bba · f793bba
1 parent 1a9375b
commit f793bba
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -22,6 +22,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
     - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
@@ -41,12 +43,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
-        -Dsonar.login=${{ secrets.SONAR_TOKEN }}
+        -Pcoverage
         -Dsonar.host.url=https://sonarcloud.io
         -Dsonar.organization=bcgov-sonarcloud
         -Dsonar.projectKey=bcgov_VDYP
       env:
         GITHUB_TOKEN: ${{ github.token }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>ca.bc.gov.nrs.vdyp</groupId>
@@ -20,18 +18,14 @@
 		<junit.version>5.9.2</junit.version>
 		<hamcrest.version>2.2</hamcrest.version>
 		<easymock.version>5.1.0</easymock.version>
-
-		<sonar.coverage.jacoco.xmlReportPaths>
-			${project.basedir}/report-aggregate/target/site/
-      jacoco-aggregate/jacoco.xml
-		</sonar.coverage.jacoco.xmlReportPaths>
+
 	</properties>
 
 	<modules>
 		<module>vdyp-core</module>
 		<module>vdyp-fip</module>
 		<module>vdyp-buildtools</module>
-		<module>report-aggregate</module>
+		<module>vdyp-sindex</module>
 	</modules>
 
 	<dependencyManagement>
@@ -127,7 +121,11 @@
 					<artifactId>formatter-maven-plugin</artifactId>
 					<version>2.22.0</version>
 				</plugin>
-
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>0.8.9</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 
@@ -149,7 +147,7 @@
 			</plugin>
 
 		</plugins>
-
+		
 	</build>
 	<profiles>
 		<profile>
@@ -159,7 +157,6 @@
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.9</version>
 						<executions>
 							<execution>
 								<id>prepare-agent</id>