Merge pull request #163 from companieshouse/IDVA6-2214-sonar-upgrade

IDVA6-2214: Upgrading sonar
companieshouse · Feb 20, 2025 · d8fe480 · d8fe480
2 parents 06f4a7e + d3997f2
commit d8fe480
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -55,8 +55,8 @@ dist: clean build package
 
 .PHONY: sonar
 sonar:
-	mvn sonar:sonar
+	mvn sonar:sonar -Dsonar.dependencyCheck.htmlReportPath=./target/dependency-check-report.html
 
 .PHONY: sonar-pr-analysis
 sonar-pr-analysis:
-	mvn sonar:sonar -P sonar-pr-analysis
+		mvn sonar:sonar -P sonar-pr-analysis -Dsonar.dependencyCheck.htmlReportPath=./target/dependency-check-report.html
diff --git a/pom.xml b/pom.xml
@@ -31,17 +31,16 @@
         <google-http-client.version>1.45.0</google-http-client.version>
         <api-helper-java.version>3.0.1</api-helper-java.version>
         <email-producer-java.version>3.0.3</email-producer-java.version>
-        <sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
         <flapdoodle.version>4.16.1</flapdoodle.version>
+
+        <sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
+        <sonar.token>${CODE_ANALYSIS_TOKEN}</sonar.token>
+        <sonar.login></sonar.login>
+        <sonar.password></sonar.password>
+        <sonar.projectName>accounts-association-api</sonar.projectName>
+        <sonar.projectKey>uk.gov.companieshouse:accounts-association-api</sonar.projectKey>
+        <sonar.java.binaries>${project.basedir}/target,${project.basedir}/target/*</sonar.java.binaries>
     </properties>
-    <profiles>
-        <profile>
-            <id>sonar-pr-analysis</id>
-            <properties>
-                <sonar.pullrequest.base>main</sonar.pullrequest.base>
-            </properties>
-        </profile>
-    </profiles>
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -106,12 +105,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.sonarsource.scanner.maven</groupId>
-            <artifactId>sonar-maven-plugin</artifactId>
-            <version>${sonar-maven-plugin.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -228,6 +221,7 @@
             <plugin>
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
+                <version>${sonar-maven-plugin.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>