From 551e139ae1656f380644fb469eeec9adeb7dfa7d Mon Sep 17 00:00:00 2001
From: LEMERCIER Denis <denis.lemercier@soprasteria.com>
Date: Fri, 2 Feb 2024 18:13:58 +0100
Subject: [PATCH] [DLE] correction dependency check path
---
services/common/.gitlab-ci-library.yml | 7 +++++--
services/common/.gitlab-ci-maven.yml | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/services/common/.gitlab-ci-library.yml b/services/common/.gitlab-ci-library.yml
index 64086d3f..5a4d8cb6 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 76001a38..3961c708 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
--
GitLab