From ef4d501f19ca14b1055b2ee2b12614edb6b1f223 Mon Sep 17 00:00:00 2001 From: "kevin.tumma@knecon.com" Date: Tue, 5 Mar 2024 11:33:43 +0100 Subject: [PATCH 1/9] Add CycloneDX Plugin in Gradle Build and Report in CI --- .gitlab-ci.yml | 13 +++---------- .../persistence-service-server-v1/build.gradle.kts | 1 + 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e94cecc9..97f0e403b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,19 +5,12 @@ include: ref: 'main' file: 'ci-templates/gradle_java.yml' -deploy: +bom: stage: deploy tags: - dind script: - - echo "Building with gradle version ${BUILDVERSION}" - - gradle -Pversion=${BUILDVERSION} publish - - gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION} - - echo "BUILDVERSION=$BUILDVERSION" >> version.env + - echo "Publishing the generated BOM" artifacts: reports: - dotenv: version.env - rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - if: $CI_COMMIT_BRANCH =~ /^release/ - - if: $CI_COMMIT_TAG \ No newline at end of file + cyclonedx: persistence-service/persistence-service-v1/persistence-service-server-v1/build/reports/*.json \ No newline at end of file diff --git a/persistence-service-v1/persistence-service-server-v1/build.gradle.kts b/persistence-service-v1/persistence-service-server-v1/build.gradle.kts index 521247b80..fb0718cc0 100644 --- a/persistence-service-v1/persistence-service-server-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-server-v1/build.gradle.kts @@ -7,6 +7,7 @@ plugins { id("io.spring.dependency-management") version "1.1.3" id("org.sonarqube") version "4.4.1.3373" id("io.freefair.lombok") version "8.4" + id ("org.cyclonedx.bom") version "1.8.2" } configurations { -- 2.47.2 From 83a4c65290563c7792e0e38cbfc20a305eea0bda Mon Sep 17 00:00:00 2001 From: "kevin.tumma@knecon.com" Date: Tue, 5 Mar 2024 11:36:00 +0100 Subject: [PATCH 2/9] Adjust Path --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97f0e403b..b563c2203 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,5 @@ bom: - echo "Publishing the generated BOM" artifacts: reports: - cyclonedx: persistence-service/persistence-service-v1/persistence-service-server-v1/build/reports/*.json \ No newline at end of file + cyclonedx: + - persistence-service/persistence-service-v1/persistence-service-server-v1/build/reports/*.json \ No newline at end of file -- 2.47.2 From 5865c87cec081a640e154c359102ad31172d5043 Mon Sep 17 00:00:00 2001 From: "kevin.tumma@knecon.com" Date: Tue, 5 Mar 2024 11:40:47 +0100 Subject: [PATCH 3/9] Adjust Path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b563c2203..9e2a657f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,4 +14,4 @@ bom: artifacts: reports: cyclonedx: - - persistence-service/persistence-service-v1/persistence-service-server-v1/build/reports/*.json \ No newline at end of file + - persistence-service-v1/persistence-service-server-v1/build/reports/*.json \ No newline at end of file -- 2.47.2 From 85301333ba3831fe64c5add1f701853b257390ea Mon Sep 17 00:00:00 2001 From: "kevin.tumma@knecon.com" Date: Tue, 5 Mar 2024 12:13:57 +0100 Subject: [PATCH 4/9] Debug --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e2a657f7..531767613 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,9 @@ bom: - dind script: - echo "Publishing the generated BOM" + - pwd + - ls -la + - ls persistence-service-v1/persistence-service-server-v1/build/reports artifacts: reports: cyclonedx: -- 2.47.2 From 4971107ac8d4ee7d7f2dc26f811b087c141997c0 Mon Sep 17 00:00:00 2001 From: "kevin.tumma@knecon.com" Date: Tue, 5 Mar 2024 12:32:51 +0100 Subject: [PATCH 5/9] Debug --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 531767613..6ba59dd97 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,8 +13,8 @@ bom: - echo "Publishing the generated BOM" - pwd - ls -la - - ls persistence-service-v1/persistence-service-server-v1/build/reports + - ls persistence-service-v1/persistence-service-server-v1/build artifacts: reports: cyclonedx: - - persistence-service-v1/persistence-service-server-v1/build/reports/*.json \ No newline at end of file + - /builds/redactmanager/persistence-service/persistence-service-v1/persistence-service-server-v1/build/reports/bom.json \ No newline at end of file -- 2.47.2 From 4ccd8c08a3c08313279279e66b321ca6fb27f8ad Mon Sep 17 00:00:00 2001 From: "kevin.tumma@knecon.com" Date: Tue, 5 Mar 2024 12:53:15 +0100 Subject: [PATCH 6/9] Debug --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ba59dd97..d44badb30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ bom: tags: - dind script: + - gradle build - echo "Publishing the generated BOM" - pwd - ls -la -- 2.47.2 From 50cc3816bb8de51ab32fd91c055a86526099eed2 Mon Sep 17 00:00:00 2001 From: "kevin.tumma@knecon.com" Date: Tue, 5 Mar 2024 13:04:42 +0100 Subject: [PATCH 7/9] Debug --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d44badb30..aa4ace226 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,8 +14,8 @@ bom: - echo "Publishing the generated BOM" - pwd - ls -la - - ls persistence-service-v1/persistence-service-server-v1/build + - ls persistence-service-v1/persistence-service-server-v1/build/reports artifacts: reports: cyclonedx: - - /builds/redactmanager/persistence-service/persistence-service-v1/persistence-service-server-v1/build/reports/bom.json \ No newline at end of file + - persistence-service-v1/persistence-service-server-v1/build/reports/bom.json \ No newline at end of file -- 2.47.2 From 6557ca31fdee279a60994051653ee72978c71420 Mon Sep 17 00:00:00 2001 From: "kevin.tumma@knecon.com" Date: Tue, 5 Mar 2024 13:14:32 +0100 Subject: [PATCH 8/9] Debug --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa4ace226..fde96da19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ bom: tags: - dind script: - - gradle build + - gradle cyclonedxBom - echo "Publishing the generated BOM" - pwd - ls -la -- 2.47.2 From 6ecb75fe763fb6887a44ce5549babd3743f36b6c Mon Sep 17 00:00:00 2001 From: "kevin.tumma@knecon.com" Date: Tue, 5 Mar 2024 13:27:51 +0100 Subject: [PATCH 9/9] Debug --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fde96da19..3cc4952fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,4 +18,6 @@ bom: artifacts: reports: cyclonedx: - - persistence-service-v1/persistence-service-server-v1/build/reports/bom.json \ No newline at end of file + - persistence-service-v1/persistence-service-server-v1/build/reports/bom.json + paths: + - persistence-service-v1/persistence-service-server-v1/build/reports/bom.json -- 2.47.2