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

Impressum - Datenschutz - Barrierefreiheit