diff --git a/services/common/.gitlab-ci-library.yml b/services/common/.gitlab-ci-library.yml index 64086d3fe936628380dd7bb26de3919dd6ff4c75..5a4d8cb674261be545dafcdb3d2a0e0ae02ac84a 100644 --- a/services/common/.gitlab-ci-library.yml +++ b/services/common/.gitlab-ci-library.yml @@ -30,8 +30,6 @@ variables: PROJECT_DIR: services/$COMPONENT MAVEN_CLI_OPTS: "-s ci_settings.xml --batch-mode" MAVEN_OPTS: "-Dmaven.repo.local=.m2" - DEPENDENCY_CHECK_SCAN_PATH: $CI_PROJECT_DIR/services/$COMPONENT - DEPENDENCY_CHECK_SUPPRESSION_PATH: $CI_PROJECT_DIR/services/core #Compilation et Tests pour les Merges requests et les commits test-application: @@ -46,3 +44,8 @@ build-application: extends: - .tags-runner - .java:build + +dependency-check: + variables: + DEPENDENCY_CHECK_SCAN_PATH: $CI_PROJECT_DIR/services/$COMPONENT + DEPENDENCY_CHECK_SUPPRESSION_PATH: $CI_PROJECT_DIR/services/core diff --git a/services/common/.gitlab-ci-maven.yml b/services/common/.gitlab-ci-maven.yml index 76001a38f2bb76800e049f162c93545e877807a4..3961c7081dfbb55cdca02bf0e57cb1e0b568ad40 100644 --- a/services/common/.gitlab-ci-maven.yml +++ b/services/common/.gitlab-ci-maven.yml @@ -35,8 +35,6 @@ variables: MAVEN_CLI_OPTS: "-s $CI_PROJECT_DIR/services/common/ci_settings.xml --batch-mode" MAVEN_OPTS: "-Dmaven.repo.local=.m2" DOCKER_IMAGE: "$CI_REGISTRY_IMAGE/$COMPONENT:$CI_COMMIT_REF_NAME" - DEPENDENCY_CHECK_SCAN_PATH: $CI_PROJECT_DIR/services/$COMPONENT - DEPENDENCY_CHECK_SUPPRESSION_PATH: $CI_PROJECT_DIR/services/core #Compilation et Tests pour les Merges requests et les commits test-application: @@ -77,3 +75,8 @@ build-image: DOCKER_PASSWORD: $CI_REGISTRY_PASSWORD REGISTRY_URL: $CI_REGISTRY IMAGE_URL: $CI_REGISTRY_IMAGE/$COMPONENT + +dependency-check: + variables: + DEPENDENCY_CHECK_SCAN_PATH: $CI_PROJECT_DIR/services/$COMPONENT + DEPENDENCY_CHECK_SUPPRESSION_PATH: $CI_PROJECT_DIR/services/core