diff --git a/Jenkinsfile b/Jenkinsfile index 74af965187a2d82a7045194a3ab787772cc05d62..721a76bd7c6e35420e49a24819570a6d2216f1c0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,6 +37,7 @@ pipeline { FORCE_COLOR = 0 NO_COLOR = 1 NX_DISABLE_DB = true + IMAGE_TAG = buildVersionName() } options { @@ -91,7 +92,6 @@ pipeline { steps { script { FAILED_STAGE=env.STAGE_NAME - IMAGE_TAG = buildVersionName() configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { sh 'mvn --version' diff --git a/alfa-server/pom.xml b/alfa-server/pom.xml index 2cbfbc8720b49029fe7e8a8f7e86d1f74612dfa5..f88c7042185a80d7c7f67370e7f1b734a134555f 100644 --- a/alfa-server/pom.xml +++ b/alfa-server/pom.xml @@ -24,13 +24,15 @@ 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> <parent> <groupId>de.ozgcloud.alfa</groupId> <artifactId>alfa</artifactId> - <version>2.19.0-SNAPSHOT</version> + <version>2.20.0-SNAPSHOT</version> </parent> <artifactId>alfa-server</artifactId> @@ -127,4 +129,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml index fffb143c9fadaf6aebecefd65afbd1915e75539d..7bfdc2210263056b04fd9401e8c3888c7afd11df 100644 --- a/alfa-service/pom.xml +++ b/alfa-service/pom.xml @@ -24,15 +24,16 @@ 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> <parent> <groupId>de.ozgcloud.alfa</groupId> <artifactId>alfa</artifactId> - <version>2.19.0-SNAPSHOT</version> + <version>2.20.0-SNAPSHOT</version> </parent> <artifactId>alfa-service</artifactId> @@ -251,4 +252,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file diff --git a/pom.xml b/pom.xml index e664684cdbcc70f1ef6548ebd97807fe0f566774..f15f86fe3dd54b8d8af02a23a397287a379bcaf4 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,9 @@ 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> @@ -35,7 +37,7 @@ <groupId>de.ozgcloud.alfa</groupId> <artifactId>alfa</artifactId> - <version>2.19.0-SNAPSHOT</version> + <version>2.20.0-SNAPSHOT</version> <name>Alfa Parent</name> <packaging>pom</packaging> <inceptionYear>2020</inceptionYear> @@ -168,4 +170,4 @@ <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url> </snapshotRepository> </distributionManagement> -</project> +</project> \ No newline at end of file