diff --git a/Jenkinsfile b/Jenkinsfile index 5a61e4e5fe7458f160e7fee5ea8586fb48cc4342..7f2ffdd28f0dc0c6ecfaa75c3aaa4e6e9a749123 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,6 +49,8 @@ pipeline { anyOf { branch 'master' branch 'release' + branch 'master-interface-proto4' + branch 'release-interface-proto4' } } } @@ -64,6 +66,14 @@ pipeline { } } stage('Build and deploy UserManager parent pom') { + when { + not { + anyOf { + branch 'master-interface-proto4' + branch 'release-interface-proto4' + } + } + } steps { script { FAILED_STAGE=env.STAGE_NAME @@ -89,6 +99,14 @@ pipeline { } stage('Build and deploy UserManager') { + when { + not { + anyOf { + branch 'master-interface-proto4' + branch 'release-interface-proto4' + } + } + } steps { script { FAILED_STAGE=env.STAGE_NAME @@ -102,6 +120,14 @@ pipeline { } stage('Build native container image') { + when { + not { + anyOf { + branch 'master-interface-proto4' + branch 'release-interface-proto4' + } + } + } steps { script { FAILED_STAGE=env.STAGE_NAME @@ -128,6 +154,14 @@ pipeline { } stage ('Deploy SBOM to DependencyTrack') { + when { + not { + anyOf { + branch 'master-interface-proto4' + branch 'release-interface-proto4' + } + } + } steps { script { IMAGE_TAG = generateImageTag() @@ -172,6 +206,14 @@ pipeline { } stage('Tag and Push Docker image') { + when { + not { + anyOf { + branch 'master-interface-proto4' + branch 'release-interface-proto4' + } + } + } steps { script { FAILED_STAGE = env.STAGE_NAME @@ -190,6 +232,14 @@ pipeline { } stage('Test, build and deploy Helm Chart') { + when { + not { + anyOf { + branch 'master-interface-proto4' + branch 'release-interface-proto4' + } + } + } steps { script { FAILED_STAGE=env.STAGE_NAME diff --git a/pom.xml b/pom.xml index 24c89fc45f8843820d65a329d2c52344cbd91dbf..75cb93d9f7aa640cdef0cee88d93124caa2a3101 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>de.ozgcloud.common</groupId> <artifactId>ozgcloud-common-dependencies</artifactId> - <version>4.4.0-PR-25-SNAPSHOT</version> + <version>4.3.2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/user-manager-interface/pom.xml b/user-manager-interface/pom.xml index b24fa1e2caf62d79e09c292faa5e688ef1f351a3..51a2f0f57cfbe137e72e072a88aad1c73323057b 100644 --- a/user-manager-interface/pom.xml +++ b/user-manager-interface/pom.xml @@ -24,16 +24,21 @@ unter der Lizenz sind dem Lizenztext zu entnehmen. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>de.ozgcloud.user</groupId> - <artifactId>user-manager</artifactId> - <version>2.9.0-SNAPSHOT</version> + <groupId>de.ozgcloud.common</groupId> + <artifactId>ozgcloud-common-dependencies</artifactId> + <version>4.4.0-PR-25-SNAPSHOT</version> + <relativePath/> </parent> + + <groupId>de.ozgcloud.user</groupId> <artifactId>user-manager-interface</artifactId> + <version>2.9_4.0-SNAPSHOT</version> <name>OZG-Cloud User Manager Interface</name> <description>gRPC Interface for User Manager</description> diff --git a/user-manager-server/pom.xml b/user-manager-server/pom.xml index 9ae6f04364246aeb50383a357bb3b6ced675832b..5446926a06335a5fa6a93ae9fddedad238a69e5b 100644 --- a/user-manager-server/pom.xml +++ b/user-manager-server/pom.xml @@ -49,6 +49,7 @@ <dependency> <groupId>de.ozgcloud.user</groupId> <artifactId>user-manager-interface</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>de.ozgcloud.common</groupId>