From b5130f6d8b2e98e4a63bf48862f6ffbb87d6e54c Mon Sep 17 00:00:00 2001
From: Ali Oezyetimoglu <ali.oezyetimoglu@iqser.com>
Date: Tue, 15 Nov 2022 16:18:52 +0100
Subject: [PATCH] RED-5603: Removed dependency check report html

---
 bamboo-specs/src/main/resources/scripts/sonar-java.sh | 6 ++++--
 redaction-service-v1/pom.xml                          | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bamboo-specs/src/main/resources/scripts/sonar-java.sh b/bamboo-specs/src/main/resources/scripts/sonar-java.sh
index 785a8a8a..b4909c28 100755
--- a/bamboo-specs/src/main/resources/scripts/sonar-java.sh
+++ b/bamboo-specs/src/main/resources/scripts/sonar-java.sh
@@ -17,7 +17,7 @@ mvn --no-transfer-progress \
 if [[ -z "${bamboo_repository_pr_key}" ]]
 then
     echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}"
-    mvn --no-transfer-progress \
+    mvn -X --no-transfer-progress \
         -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
         sonar:sonar \
         -Dsonar.projectKey=RED_$SERVICE_NAME \
@@ -27,9 +27,10 @@ then
         -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
         -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml
 #        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
+    echo "Finished Sonar Scan"
 else
     echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}"
-    mvn --no-transfer-progress \
+    mvn -X --no-transfer-progress \
         -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
         sonar:sonar \
         -Dsonar.projectKey=RED_$SERVICE_NAME \
@@ -41,4 +42,5 @@ else
         -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
         -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml
 #        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
+    echo "Finished Sonar Scan"
 fi
\ No newline at end of file
diff --git a/redaction-service-v1/pom.xml b/redaction-service-v1/pom.xml
index e7c81361..7595b5a8 100644
--- a/redaction-service-v1/pom.xml
+++ b/redaction-service-v1/pom.xml
@@ -59,6 +59,7 @@
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
+                    <version>7.1.1</version>
                     <configuration>
                         <format>ALL</format>
                     </configuration>