From 0e49beeeded4ae47b955281e9b03211e5292dfba Mon Sep 17 00:00:00 2001 From: cschabert Date: Wed, 30 Mar 2022 17:04:05 +0200 Subject: [PATCH] update mvn command --- .../src/main/java/buildjob/PlanSpec.java | 4 +- .../src/main/resources/scripts/build-java.sh | 18 +++---- .../src/main/resources/scripts/sonar-java.sh | 53 +++++++++---------- 3 files changed, 33 insertions(+), 42 deletions(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index bf9cc782d..8bf2da382 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -93,6 +93,7 @@ public class PlanSpec { "rm -rf ./*"), new VcsCheckoutTask() .description("Checkout Default Repository") + .cleanCheckout(true) .checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask() .description("Build") @@ -146,6 +147,7 @@ public class PlanSpec { "rm -rf ./*"), new VcsCheckoutTask() .description("Checkout Default Repository") + .cleanCheckout(true) .checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask() .description("Sonar") @@ -156,7 +158,7 @@ public class PlanSpec { new DockerConfiguration() .image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim") .dockerRunArguments("--net=host") - .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml") + .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml") .volume("/var/run/docker.sock", "/var/run/docker.sock") ) ) diff --git a/bamboo-specs/src/main/resources/scripts/build-java.sh b/bamboo-specs/src/main/resources/scripts/build-java.sh index a330f6135..d5b915b54 100755 --- a/bamboo-specs/src/main/resources/scripts/build-java.sh +++ b/bamboo-specs/src/main/resources/scripts/build-java.sh @@ -17,8 +17,7 @@ elif [[ "${bamboo_version_tag}" != "dev" ]] then newVersion="${bamboo_version_tag}" else - ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ + mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ --no-transfer-progress \ ${bamboo_maven_add_param} \ clean install \ @@ -29,20 +28,17 @@ fi echo "gitTag=${newVersion}" > git.tag -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ +mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ versions:set \ -DnewVersion=${newVersion} -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ +mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ versions:set \ -DnewVersion=${newVersion} -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ +mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ --no-transfer-progress \ clean deploy \ ${bamboo_maven_add_param} \ @@ -53,13 +49,11 @@ ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ -Dmaven.wagon.http.ssl.ignore.validity.dates=true \ -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ +mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ package -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ +mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ docker:push diff --git a/bamboo-specs/src/main/resources/scripts/sonar-java.sh b/bamboo-specs/src/main/resources/scripts/sonar-java.sh index f1d90a5ef..e141df861 100755 --- a/bamboo-specs/src/main/resources/scripts/sonar-java.sh +++ b/bamboo-specs/src/main/resources/scripts/sonar-java.sh @@ -4,46 +4,41 @@ set -e SERVICE_NAME=$1 echo "build jar binaries" -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ +mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ --no-transfer-progress \ clean install \ -Djava.security.egd=file:/dev/./urandomelse echo "dependency-check:aggregate" -${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ +mvn --no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ org.owasp:dependency-check-maven:aggregate if [[ -z "${bamboo_repository_pr_key}" ]] then echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}" - ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ - -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ - sonar:sonar \ - -Dsonar.projectKey=RED_$SERVICE_NAME \ - -Dsonar.host.url=https://sonarqube.iqser.com \ - -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 - + mvn --no-transfer-progress \ + -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ + sonar:sonar \ + -Dsonar.projectKey=RED_$SERVICE_NAME \ + -Dsonar.host.url=https://sonarqube.iqser.com \ + -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 else echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}" - ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ - --no-transfer-progress \ - -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ - sonar:sonar \ - -Dsonar.projectKey=RED_$SERVICE_NAME \ - -Dsonar.host.url=https://sonarqube.iqser.com \ - -Dsonar.login=${bamboo_sonarqube_api_token_secret} \ - -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \ - -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 + mvn --no-transfer-progress \ + -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ + sonar:sonar \ + -Dsonar.projectKey=RED_$SERVICE_NAME \ + -Dsonar.host.url=https://sonarqube.iqser.com \ + -Dsonar.login=${bamboo_sonarqube_api_token_secret} \ + -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \ + -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 fi