From c7bf02f041a76994d22ceeb7ff8e50810a2ca51b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 14 Oct 2024 15:49:06 +0200
Subject: [PATCH] OZG-6710 move bom location to common lib
---
Jenkinsfile | 2 +-
.../document/bescheid/vorgang/BescheidVorgangMapperTest.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3be8074..23b0ac4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -100,7 +100,7 @@ pipeline {
withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
- sh "mvn --no-transfer-progress -s $MAVEN_SETTINGS io.github.pmckeown:dependency-track-maven-plugin:upload-bom -Ddependency-track.apiKey=$API_KEY -Ddependency-track.projectVersion=${IMAGE_TAG} -Ddependency-track.dependencyTrackBaseUrl=https://dependency-track.ozg-sh.de -Ddependency-track.bomLocation=target/classes/META-INF/sbom/application.cdx.json"
+ sh "mvn --no-transfer-progress -s $MAVEN_SETTINGS io.github.pmckeown:dependency-track-maven-plugin:upload-bom -Ddependency-track.apiKey=$API_KEY -Ddependency-track.projectVersion=${IMAGE_TAG} -Ddependency-track.dependencyTrackBaseUrl=https://dependency-track.ozg-sh.de"
}
}
}
diff --git a/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapperTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapperTest.java
index cea6bd9..895d738 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapperTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapperTest.java
@@ -4,12 +4,13 @@ import static org.assertj.core.api.Assertions.*;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
+import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks;
class BescheidVorgangMapperTest {
@InjectMocks
- private BescheidVorgangMapperImpl mapper;
+ private final BescheidVorgangMapper mapper = Mappers.getMapper(BescheidVorgangMapper.class);
@Nested
class TestMapVorgang {
--
GitLab