Skip to content
Snippets Groups Projects
Commit 46d96eaa authored by Krzysztof Witukiewicz's avatar Krzysztof Witukiewicz
Browse files

Merge remote-tracking branch 'origin/main' into OZG-6706-anbindung-bescheid-schnittstelle

parents e9ba8e01 ac7895cb
No related branches found
No related tags found
1 merge request!7Ozg 6706 anbindung bescheid schnittstelle
...@@ -37,6 +37,7 @@ pipeline { ...@@ -37,6 +37,7 @@ pipeline {
FORCE_COLOR = 0 FORCE_COLOR = 0
NO_COLOR = 1 NO_COLOR = 1
NX_DISABLE_DB = true NX_DISABLE_DB = true
IMAGE_TAG = buildVersionName()
} }
options { options {
...@@ -91,7 +92,6 @@ pipeline { ...@@ -91,7 +92,6 @@ pipeline {
steps { steps {
script { script {
FAILED_STAGE=env.STAGE_NAME FAILED_STAGE=env.STAGE_NAME
IMAGE_TAG = buildVersionName()
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
sh 'mvn --version' sh 'mvn --version'
......
...@@ -24,13 +24,15 @@ ...@@ -24,13 +24,15 @@
unter der Lizenz sind dem Lizenztext zu entnehmen. 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 http://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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>de.ozgcloud.alfa</groupId> <groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId> <artifactId>alfa</artifactId>
<version>2.19.0-SNAPSHOT</version> <version>2.20.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfa-server</artifactId> <artifactId>alfa-server</artifactId>
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
unter der Lizenz sind dem Lizenztext zu entnehmen. 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" <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 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
<parent> <parent>
<groupId>de.ozgcloud.alfa</groupId> <groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId> <artifactId>alfa</artifactId>
<version>2.19.0-SNAPSHOT</version> <version>2.20.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfa-service</artifactId> <artifactId>alfa-service</artifactId>
......
...@@ -24,7 +24,9 @@ ...@@ -24,7 +24,9 @@
unter der Lizenz sind dem Lizenztext zu entnehmen. 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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
...@@ -35,7 +37,7 @@ ...@@ -35,7 +37,7 @@
<groupId>de.ozgcloud.alfa</groupId> <groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId> <artifactId>alfa</artifactId>
<version>2.19.0-SNAPSHOT</version> <version>2.20.0-SNAPSHOT</version>
<name>Alfa Parent</name> <name>Alfa Parent</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<inceptionYear>2020</inceptionYear> <inceptionYear>2020</inceptionYear>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment