Skip to content
Snippets Groups Projects
Commit 1a740911 authored by OZGCloud's avatar OZGCloud
Browse files

Merge remote-tracking branch 'origin/master' into OZG-5899-SchnittstelleEinzelnerBescheid 

# Conflicts:
#	Jenkinsfile
parents 6337f3ce 818178db
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 35 deletions
Jenkinsfile
+ 15
− 16
View file @ 1a740911
......@@ -60,7 +60,7 @@ pipeline {
JAR_TAG = getPomVersion('pom.xml').replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT")
BESCHEID_MANAGER_TAG = getPomVersion('bescheid-manager/pom.xml').replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT")
updateBescheidManagerDependencyVersion(BESCHEID_MANAGER_TAG)
updateVorgangManagerDependencyVersion(JAR_TAG)
}
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true"
......@@ -68,7 +68,6 @@ pipeline {
sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${BESCHEID_MANAGER_TAG}"
}
}
}
}
......@@ -91,6 +90,7 @@ pipeline {
}
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -DskipTests deploy -Dmaven.wagon.http.retryHandler.count=3'
}
}
}
......@@ -105,6 +105,7 @@ pipeline {
dir('vorgang-manager-server') {
sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3'
}
sh 'mvn -s $MAVEN_SETTINGS versions:revert'
}
}
}
......@@ -113,10 +114,11 @@ pipeline {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
IMAGE_TAG = generateImageTag('pom.xml')
tagAndPushDockerImage('vorgang-manager', IMAGE_TAG)
if (env.BRANCH_NAME == 'master') {
tagAndPushDockerImage('vorgang-manager', 'snapshot-latest')
tagAndPushDockerImage('vorgang-manager', 'e2e-test')
......@@ -181,12 +183,17 @@ pipeline {
stage ('Deploy SBOM to DependencyTrack') {
steps {
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
script {
IMAGE_TAG = generateImageTag('pom.xml')
dir('vorgang-manager-server') {
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=' + generateImageTag('pom.xml') + ' -Ddependency-track.dependencyTrackBaseUrl=https://dependency-track.ozg-sh.de'
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
dir('vorgang-manager-server') {
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"
}
}
}
}
}
......@@ -298,14 +305,6 @@ void updateBescheidManagerDependencyVersion(String snapshotVersion) {
}
}
void updateVorgangManagerDependencyVersion(String snapshotVersion) {
def vorgangManagerServerPom = readMavenPom file: 'bescheid-manager/pom.xml'
if ( vorgangManagerServerPom.properties['vorgang-manager.version'] ==~ SNAPSHOT_REGEX ) {
vorgangManagerServerPom.properties['vorgang-manager.version'] = snapshotVersion
writeMavenPom model: vorgangManagerServerPom, file: 'bescheid-manager/pom.xml'
}
}
String generateImageTag(String pomFile) {
def imageTag = "${env.BRANCH_NAME}-${getPomVersion(pomFile)}"
......
bescheid-manager/pom.xml
+ 1
− 1
View file @ 1a740911
......@@ -12,7 +12,7 @@
<groupId>de.ozgcloud.bescheid</groupId>
<artifactId>bescheid-manager</artifactId>
<name>OZG-Cloud Bescheid Manager</name>
<version>1.16.0-SNAPSHOT</version>
<version>1.17.0-SNAPSHOT</version>
<properties>
<vorgang-manager.version>2.12.0-SNAPSHOT</vorgang-manager.version>
......
pom.xml
+ 2
− 2
View file @ 1a740911
......@@ -29,13 +29,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager</artifactId>
<version>2.12.0-SNAPSHOT</version>
<version>2.13.0-SNAPSHOT</version>
<name>OZG-Cloud Vorgang Manager</name>
<packaging>pom</packaging>
<properties>
<ozgcloud.license.version>1.3.0</ozgcloud.license.version>
<ozgcloud.license.version>1.6.0</ozgcloud.license.version>
</properties>
<modules>
......
vorgang-manager-base/pom.xml
+ 1
− 1
View file @ 1a740911
......@@ -12,7 +12,7 @@
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-base</artifactId>
<version>2.12.0-SNAPSHOT</version>
<version>2.13.0-SNAPSHOT</version>
<name>OZG-Cloud Vorgang Manager Base</name>
......
vorgang-manager-command/pom.xml
+ 1
− 1
View file @ 1a740911
......@@ -10,7 +10,7 @@
<groupId>de.ozgcloud.command</groupId>
<artifactId>command-manager</artifactId>
<version>2.12.0-SNAPSHOT</version>
<version>2.13.0-SNAPSHOT</version>
<name>OZG-Cloud Command Manager</name>
<properties>
......
vorgang-manager-interface/pom.xml
+ 1
− 1
View file @ 1a740911
......@@ -36,7 +36,7 @@
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-interface</artifactId>
<version>2.12.0-SNAPSHOT</version>
<version>2.13.0-SNAPSHOT</version>
<name>OZG-Cloud Vorgang Manager gRPC Interface</name>
<description>Interface (gRPC) for Vorgang Manager Server</description>
......
vorgang-manager-server/pom.xml
+ 5
− 5
View file @ 1a740911
......@@ -38,7 +38,7 @@
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-server</artifactId>
<version>2.12.0-SNAPSHOT</version>
<version>2.13.0-SNAPSHOT</version>
<name>OZG-Cloud Vorgang Manager Server</name>
<description>Server Implementierung des VorgangManagers</description>
......@@ -53,12 +53,12 @@
<zufi-manager-interface.version>1.0.0</zufi-manager-interface.version>
<user-manager-interface.version>2.1.0</user-manager-interface.version>
<bescheid-manager.version>1.16.0-SNAPSHOT</bescheid-manager.version>
<bescheid-manager.version>1.17.0-SNAPSHOT</bescheid-manager.version>
<processor-manager.version>0.4.1</processor-manager.version>
<nachrichten-manager.version>2.11.0-SNAPSHOT</nachrichten-manager.version>
<nachrichten-manager.version>2.12.0-SNAPSHOT</nachrichten-manager.version>
<ozgcloud-starter.version>0.10.0</ozgcloud-starter.version>
<notification-manager.version>2.9.0</notification-manager.version>
<collaboration-manager.version>0.1.0-SNAPSHOT</collaboration-manager.version>
<notification-manager.version>2.10.0-SNAPSHOT</notification-manager.version>
<collaboration-manager.version>0.2.0-SNAPSHOT</collaboration-manager.version>
<zip.version>2.11.1</zip.version>
<jsoup.version>1.15.3</jsoup.version>
......
vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumITCase.java
+ 6
− 7
View file @ 1a740911
......@@ -29,7 +29,6 @@ import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.nachrichten.postfach.PostfachAddress;
import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
import de.ozgcloud.nachrichten.postfach.osi.OsiPostfachProperties;
import de.ozgcloud.nachrichten.postfach.osi.ReplyOption;
import de.ozgcloud.vorgang.VorgangManagerServerApplication;
import de.ozgcloud.vorgang.attached_item.VorgangAttachedItem;
......@@ -42,17 +41,17 @@ import de.ozgcloud.vorgang.vorgang.VorgangHeadTestFactory;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
import io.grpc.stub.StreamObserver;
@SpringBootTest(classes = { VorgangManagerServerApplication.class, OsiPostfachProperties.class }, properties = {
"grpc.server.in-process-name=postfachitcase",
@SpringBootTest(classes = { VorgangManagerServerApplication.class }, properties = {
"grpc.server.in-process-name=antragraumitcase",
"ozgcloud.antragraum.url=https://localhost/dummy/antragraum",
"ozgcloud.antragraum.entityId=dummy-id",
"ozgcloud.antragraum.metadataUri=http://localhost/dummy/antragraum/uri",
"ozgcloud.antragraum.decryptionPrivateKey=dummyPrivateKey",
"ozgcloud.antragraum.decryptionCertificate=dummyCertificate",
"grpc.client.ozgcloud-command-manager.address=in-process:postfachitcase",
"grpc.client.command-manager.address=in-process:postfachitcase",
"grpc.client.info-manager.address=in-process:postfachitcase",
"grpc.client.vorgang-manager.address=in-process:postfachitcase",
"grpc.client.ozgcloud-command-manager.address=in-process:antragraumitcase",
"grpc.client.command-manager.address=in-process:antragraumitcase",
"grpc.client.info-manager.address=in-process:antragraumitcase",
"grpc.client.vorgang-manager.address=in-process:antragraumitcase",
})
@WithMockUser
@DataITCase
......
vorgang-manager-utils/pom.xml
+ 1
− 1
View file @ 1a740911
......@@ -37,7 +37,7 @@
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-utils</artifactId>
<name>OZG-Cloud Vorgang Manager Utils</name>
<version>2.12.0-SNAPSHOT</version>
<version>2.13.0-SNAPSHOT</version>
<properties>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit