paul/gilde-ci-cd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(Java): Reorder and add CLI arguments/options in Maven and Gradle

Browse Source
This commit is contained in:
Marcel Feix 2022-07-01 16:50:02 +02:00
parent 97ff8551cb
commit 357641729a
No known key found for this signature in database
GPG Key ID: 04D016E104A25F03
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/java/gradle/gradle-build.gitlab-ci.yml
View File

@ -13,7 +13,7 @@
$(sed -i /^version/s/$GRADLE_VERSION/\'$CI_COMMIT_TAG\'/ $PATH_TO_VERSION_FILE) $(sed -i /^version/s/$GRADLE_VERSION/\'$CI_COMMIT_TAG\'/ $PATH_TO_VERSION_FILE)
fi fi
script: script:
- "./gradlew --build-cache assemble $GRADLE_CLI_BUILD_OPTS $GRADLE_CLI_OPTS" - "./gradlew --build-cache assemble $GRADLE_CLI_BUILD_OPTS $GRADLE_CLI_OPTS $GRADLE_EXTRA_OPTS"
artifacts: artifacts:
expire_in: 2 weeks expire_in: 2 weeks
when: on_success when: on_success

2
templates/java/gradle/gradle-database-diff.gitlab-ci.yml
View File

@ -14,5 +14,5 @@ include:
cd $BACKEND_DIR cd $BACKEND_DIR
fi fi
script: script:
- ./gradlew liquibase:update liquibase:diff $GRADLE_CLI_OPTS - ./gradlew liquibase:update liquibase:diff $GRADLE_CLI_OPTS $GRADLE_EXTRA_OPTS

2
templates/java/gradle/gradle-license.gitlab-ci.yml
View File

@ -8,7 +8,7 @@
fi fi
script: script:
- "cd $BACKEND_DIR" - "cd $BACKEND_DIR"
- "./gradlew --build-cache cyclonedxBom $GRADLE_CLI_OPTS" - "./gradlew --build-cache cyclonedxBom $GRADLE_CLI_OPTS $GRADLE_EXTRA_OPTS"
needs: [] needs: []
artifacts: artifacts:
expire_in: 2 weeks expire_in: 2 weeks

2
templates/java/gradle/gradle-verify.gitlab-ci.yml
View File

@ -7,7 +7,7 @@
cd $BACKEND_DIR cd $BACKEND_DIR
fi fi
script: script:
- "./gradlew --build-cache test $GRADLE_CLI_OPTS" - "./gradlew --build-cache test $GRADLE_CLI_OPTS $GRADLE_EXTRA_OPTS"
artifacts: artifacts:
expire_in: 2 weeks expire_in: 2 weeks
reports: reports:

2
templates/java/maven/maven-build.gitlab-ci.yml
View File

@ -8,7 +8,7 @@
fi fi
- > - >
if [ ! -z "$CI_COMMIT_TAG" ]; then if [ ! -z "$CI_COMMIT_TAG" ]; then
mvn $MVN_EXTRA_ARGS $MAVEN_CLI_OPTS versions:set -DnewVersion=$CI_COMMIT_TAG -DgenerateBackupPoms=false mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS versions:set -DnewVersion=$CI_COMMIT_TAG -DgenerateBackupPoms=false $MVN_EXTRA_ARGS
fi fi
script: script:
- "cd $BACKEND_DIR" - "cd $BACKEND_DIR"

2
templates/java/maven/maven-database-diff.gitlab-ci.yml
View File

@ -14,7 +14,7 @@ include:
cd $BACKEND_DIR cd $BACKEND_DIR
fi fi
script: script:
- mvn compile liquibase:update liquibase:diff $MAVEN_EXTRA_OPTS - mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS compile liquibase:update liquibase:diff $MVN_EXTRA_ARGS
artifacts: artifacts:
when: on_failure when: on_failure
expire_in: 2 weeks expire_in: 2 weeks

2
templates/java/maven/maven-dependencies.gitlab-ci.yml
View File

@ -7,4 +7,4 @@
cd $BACKEND_DIR cd $BACKEND_DIR
fi fi
script: script:
- "mvn $MAVEN_CLI_OPTS dependency:resolve" - mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS dependency:resolve $MVN_EXTRA_ARGS

2
templates/java/maven/maven-license.gitlab-ci.yml
View File

@ -7,7 +7,7 @@
cd $BACKEND_DIR cd $BACKEND_DIR
fi fi
script: script:
- mvn cyclonedx:makeBom - mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS cyclonedx:makeBom $MVN_EXTRA_ARGS
artifacts: artifacts:
when: always when: always
paths: paths:

2
templates/java/maven/maven-verify.gitlab-ci.yml
View File

@ -7,7 +7,7 @@
cd $BACKEND_DIR cd $BACKEND_DIR
fi fi
script: script:
- mvn $MAVEN_CLI_OPTS verify - mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS verify $MVN_EXTRA_ARGS
artifacts: artifacts:
expire_in: 2 weeks expire_in: 2 weeks
reports: reports:

2
templates/static-analysis/sonar-7.gitlab-ci.yml
View File

@ -18,7 +18,7 @@
cd $BACKEND_DIR cd $BACKEND_DIR
fi fi
script: script:
- mvn $MAVEN_CLI_OPTS test sonar:sonar - mvn $MAVEN_CLI_OPTS test sonar:sonar $MVN_EXTRA_ARGS
"-Dsonar.host.url=$SONAR_HOST_URL" "-Dsonar.host.url=$SONAR_HOST_URL"
"-Dsonar.login=$SONAR_TOKEN" "-Dsonar.login=$SONAR_TOKEN"
"-Dsonar.projectKey=$SONAR_PROJECT_KEY" "-Dsonar.projectKey=$SONAR_PROJECT_KEY"

2
templates/static-analysis/sonar-8.gitlab-ci.yml
View File

@ -17,7 +17,7 @@
cd $BACKEND_DIR cd $BACKEND_DIR
fi fi
script: script:
- mvn $MAVEN_CLI_OPTS test sonar:sonar - mvn $MAVEN_CLI_OPTS test sonar:sonar $MVN_EXTRA_ARGS
"-Dsonar.host.url=$SONAR_HOST_URL" "-Dsonar.host.url=$SONAR_HOST_URL"
"-Dsonar.login=$SONAR_TOKEN" "-Dsonar.login=$SONAR_TOKEN"
"-Dsonar.projectKey=$SONAR_PROJECT_KEY" "-Dsonar.projectKey=$SONAR_PROJECT_KEY"