diff --git a/pipelines/licence/license-gradle.gitlab-ci.yml b/pipelines/licence/license-gradle.gitlab-ci.yml deleted file mode 100644 index 9322596..0000000 --- a/pipelines/licence/license-gradle.gitlab-ci.yml +++ /dev/null @@ -1,11 +0,0 @@ -include: - - '/templates/java/gradle/gradle-license.gitlab-ci.yml' - - '/templates/license/license.gitlab-ci.yml' - -License-Bom: - extends: .gradle-licence - -License-Adoc: - extends: .license-asciidoc - variables: - BOM_FILE: build/reports/bom.json diff --git a/pipelines/licence/license-maven.gitlab-ci.yml b/pipelines/licence/license-maven.gitlab-ci.yml deleted file mode 100644 index 93bd4b3..0000000 --- a/pipelines/licence/license-maven.gitlab-ci.yml +++ /dev/null @@ -1,23 +0,0 @@ -stages: - - bom - - asciidoc - -License-Bom: - image: maven:3-jdk-11 - stage: bom - script: - - mvn cyclonedx:makeBom - artifacts: - when: always - paths: - - target/bom.json - -license-asciidoc: - image: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-license-tools - stage: asciidoc - script: - - licenseBom2Adoc --bom target/bom.json --adoc target/licenses.adoc - artifacts: - when: always - paths: - - target/licenses.adoc diff --git a/templates/java/gradle/gradle-license.gitlab-ci.yml b/templates/java/gradle/gradle-license.gitlab-ci.yml index 3e339a1..c54f7f7 100644 --- a/templates/java/gradle/gradle-license.gitlab-ci.yml +++ b/templates/java/gradle/gradle-license.gitlab-ci.yml @@ -1,6 +1,6 @@ -.gradle-licence: +.gradle-licence-bom: image: $GRADLE_IMAGE - stage: post-process + stage: build script: - "cd $BACKEND_DIR" - "./gradlew --build-cache cyclonedxBom $GRADLE_CLI_OPTS" diff --git a/templates/java/maven/maven-license.gitlab-ci.yml b/templates/java/maven/maven-license.gitlab-ci.yml new file mode 100644 index 0000000..54b2fb4 --- /dev/null +++ b/templates/java/maven/maven-license.gitlab-ci.yml @@ -0,0 +1,10 @@ +.maven-licence-bom: + image: $MAVEN_IMAGE + stage: build + script: + - "cd $BACKEND_DIR" + - mvn cyclonedx:makeBom + artifacts: + when: always + paths: + - "$BACKEND_DIR/target/bom.json" diff --git a/templates/license/license.gitlab-ci.yml b/templates/license/license.gitlab-ci.yml index bddd08a..7abe257 100644 --- a/templates/license/license.gitlab-ci.yml +++ b/templates/license/license.gitlab-ci.yml @@ -6,9 +6,9 @@ LICENSE_FILE: licenses.adoc script: - "cd $BACKEND_DIR" - - licenseBom2Adoc --bom $BACKEND_DIR/$BOM_FILE --adoc $LICENSE_FILE + - licenseBom2Adoc --bom $BOM_FILE --adoc $LICENSE_FILE artifacts: when: always expire_in: 2 weeks paths: - - $LICENSE_ADOC_FILE \ No newline at end of file + - $LICENSE_FILE \ No newline at end of file diff --git a/templates/static-analysis/license.gitlab-ci.yml b/templates/static-analysis/license.gitlab-ci.yml deleted file mode 100644 index dc04fd8..0000000 --- a/templates/static-analysis/license.gitlab-ci.yml +++ /dev/null @@ -1,11 +0,0 @@ -.license-license: - stage: verify - rules: - - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH - - if: $CI_COMMIT_REF_NAME =~ "RELEASE" - - if: $CI_COMMIT_REF_NAME == "Templates2.0" - - when: never - needs: [] - trigger: - include: license.gitlab-ci.yml - strategy: depend \ No newline at end of file