RED-5603: Removed dependency check report html

2022-11-15 16:52:07 +01:00 · 2022-11-15 16:18:52 +01:00 · 2022-11-15 15:09:49 +01:00
2 changed files with 7 additions and 5 deletions
--- 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 \
@ -25,11 +25,11 @@ then
        -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
        -Dsonar.branch.name=${bamboo_planRepository_1_branch} \
        -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
+#        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
 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 \
@ -39,6 +39,7 @@ else
        -Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \
        -Dsonar.pullrequest.base=${bamboo_repository_pr_targetBranch} \
        -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
+#        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
 fi
+    echo "Finished Sonar Scan"
--- 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>
Author	SHA1	Message	Date
Ali Oezyetimoglu	ad17f92330	RED-5603: Removed dependency check report html	2022-11-15 16:52:07 +01:00
Ali Oezyetimoglu	b5130f6d8b	RED-5603: Removed dependency check report html	2022-11-15 16:18:52 +01:00
Ali Oezyetimoglu	d1433c6c98	RED-5603: Removed dependency check report html	2022-11-15 15:09:49 +01:00