Skip to content
Snippets Groups Projects
Commit 8807ee65 authored by OZGCloud's avatar OZGCloud
Browse files

Revert "release version 2.5.0"

This reverts commit 3eff258e.
parent 3eff258e
No related branches found
No related tags found
No related merge requests found
......@@ -29,7 +29,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
<version>2.5.0</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
<?xml version="1.0"?>
<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.5.0</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>alfa-server</artifactId>
<name>Alfa Server</name>
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<spring-boot.build-image.imageName>docker.ozg-sh.de/alfa:build-latest</spring-boot.build-image.imageName>
</properties>
<dependencies>
<dependency>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa-service</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa-xdomea</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<!-- aspectJ -->
<dependency>
<groupId>org.aspectj</groupId>
......@@ -38,6 +46,7 @@
<artifactId>aspectjrt</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
......@@ -62,6 +71,7 @@
</docker>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
......@@ -78,6 +88,7 @@
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
......@@ -118,4 +129,5 @@
</plugin>
</plugins>
</build>
</project>
......@@ -25,20 +25,25 @@
-->
<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.5.0</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>alfa-service</artifactId>
<name>Alfa Service</name>
<description>Alfa Service implementation</description>
<packaging>jar</packaging>
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
<dependencies>
<!-- Spring -->
<dependency>
......@@ -81,6 +86,7 @@
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
</dependency>
<!-- jwt -->
<dependency>
<groupId>com.auth0</groupId>
......@@ -99,6 +105,7 @@
<artifactId>jjwt-jackson</artifactId>
<scope>runtime</scope>
</dependency>
<!-- own projects -->
<dependency>
<groupId>de.ozgcloud.vorgang</groupId>
......@@ -116,11 +123,13 @@
<groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager-interface</artifactId>
</dependency>
<!-- tools -->
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
</dependency>
<!-- Dev -->
<dependency>
<groupId>org.projectlombok</groupId>
......@@ -131,6 +140,7 @@
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
</dependency>
<!-- commons -->
<dependency>
<groupId>org.apache.commons</groupId>
......@@ -144,6 +154,7 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
<!-- Test -->
<dependency>
<groupId>org.springframework.security</groupId>
......@@ -157,16 +168,20 @@
<scope>test</scope>
<version>${vorgang-manager.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.thedeanda</groupId>
<artifactId>lorem</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
......@@ -185,6 +200,7 @@
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
......@@ -208,4 +224,5 @@
</plugin>
</plugins>
</build>
</project>
......@@ -25,21 +25,26 @@
-->
<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.5.0</version>
<version>2.5.0-SNAPSHOT</version>
</parent>
<artifactId>alfa-xdomea</artifactId>
<name>Alfa xdomea</name>
<description>Alfa xdomea implementation</description>
<packaging>jar</packaging>
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<jaxb2-maven-plugin.version>3.1.0</jaxb2-maven-plugin.version>
</properties>
<dependencies>
<dependency>
<groupId>de.ozgcloud.alfa</groupId>
......@@ -70,6 +75,7 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
......@@ -102,14 +108,17 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
......
......@@ -26,31 +26,38 @@
-->
<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.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
<version>4.0.1</version>
<version>4.0.1-SNAPSHOT</version>
</parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
<version>2.5.0</version>
<version>2.5.0-SNAPSHOT</version>
<name>Alfa Parent</name>
<packaging>pom</packaging>
<modules>
<module>alfa-client</module>
<module>alfa-server</module>
<module>alfa-xdomea</module>
<module>alfa-service</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<vorgang-manager.version>2.5.0</vorgang-manager.version>
<vorgang-manager.version>2.5.0-SNAPSHOT</vorgang-manager.version>
<ozgcloud-common-pdf.version>3.0.1</ozgcloud-common-pdf.version>
<user-manager.version>2.2.0</user-manager.version>
<!-- TODO: die Version über ozgcloud-common ziehen -->
<jjwt.version>0.11.5</jjwt.version>
</properties>
<build>
<pluginManagement>
<plugins>
......@@ -87,6 +94,7 @@
</plugins>
</pluginManagement>
</build>
<dependencyManagement>
<dependencies>
<dependency>
......@@ -119,6 +127,7 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
......@@ -137,6 +146,7 @@
</dependency>
</dependencies>
</dependencyManagement>
<distributionManagement>
<repository>
<id>ozg-nexus</id>
......@@ -144,9 +154,9 @@
<url>https://nexus.ozg-sh.de/repository/ozg-releases/</url>
</repository>
<snapshotRepository>
<id>ozgs-nexus</id>
<name>ozgs</name>
<url>https://nexus.ozg-sh.de/repository/ozgs/</url>
<id>ozg-snapshots-nexus</id>
<name>ozg-snapshots</name>
<url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment