OZG-1518 use common for pluto-server

pluto-server/pom.xml

@@ -5,33 +5,23 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.12</version>
-		<relativePath /> <!-- lookup parent from repository -->
+		<groupId>de.itvsh.kop</groupId>
+		<artifactId>kop-common-parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 
 	<groupId>de.itvsh.ozg.pluto</groupId>
 	<artifactId>pluto-server</artifactId>
 	<version>0.18.0-SNAPSHOT</version>
 	<name>Pluto Server</name>
-	<description>Server Implementierung des VorgangManagers (Pluto)
+	<description>
+		Server Implementierung des VorgangManagers (Pluto)
 	</description>
 
 	<properties>
 		<java.version>17</java.version>
 
-		<grpc.spring-boot-starter.version>2.12.0.RELEASE</grpc.spring-boot-starter.version>
-		<mapstruct.version>1.4.2.Final</mapstruct.version>
-		<lorem.version>2.1</lorem.version>
-		<faker.version>1.0.2</faker.version>
-		<spring-admin.version>2.3.1</spring-admin.version>
-
-		<lombok.version>edge-SNAPSHOT</lombok.version>
-
-		<commons-io.version>2.8.0</commons-io.version>
-		<commons-collections.version>4.4</commons-collections.version>
-
 		<spring-boot.build-image.imageName>docker.ozg-sh.de/pluto:build-latest</spring-boot.build-image.imageName>
 
 		<zip.version>2.7.0</zip.version>
@@ -63,7 +53,6 @@
 		<dependency>
 			<groupId>net.devh</groupId>
 			<artifactId>grpc-server-spring-boot-starter</artifactId>
-			<version>${grpc.spring-boot-starter.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -74,11 +63,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>de.codecentric</groupId>
-			<artifactId>spring-boot-admin-starter-client</artifactId>
-			<version>${spring-admin.version}</version>
-		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
@@ -103,29 +88,26 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>${commons-io.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-collections4</artifactId>
-			<version>${commons-collections.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.thedeanda</groupId>
 			<artifactId>lorem</artifactId>
-			<version>${lorem.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.github.javafaker</groupId>
 			<artifactId>javafaker</artifactId>
-			<version>${faker.version}</version>
+			<scope>test</scope>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.mapstruct</groupId>
 			<artifactId>mapstruct</artifactId>
-			<version>${mapstruct.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.freemarker</groupId>
@@ -142,19 +124,6 @@
 			<version>${jsoup.version}</version>
 		</dependency>
 
-		<!-- Logging/Monitoring -->
-		<dependency>
-			<groupId>net.logstash.logback</groupId>
-			<artifactId>logstash-logback-encoder</artifactId>
-			<version>6.3</version>
-		</dependency>
-
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-
 		<!-- Dev -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -171,7 +140,6 @@
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<optional>true</optional>
-			<version>${lombok.version}</version>
 		</dependency>
 
 		<!-- Test -->
@@ -219,35 +187,11 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>build info</id>
-						<goals>
-							<goal>build-info</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.7</version>
-				<executions>
-					<execution>
-						<id>start-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>generate-report</id>
-						<phase>package</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 
 			<plugin>
@@ -263,69 +207,15 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-					<fork>true</fork>
-					<annotationProcessorPaths>
-						<path>
-							<groupId>org.projectlombok</groupId>
-							<artifactId>lombok</artifactId>
-							<version>${lombok.version}</version>
-						</path>
-						<path>
-							<groupId>org.mapstruct</groupId>
-							<artifactId>mapstruct-processor</artifactId>
-							<version>${mapstruct.version}</version>
-						</path>
-					</annotationProcessorPaths>
-
-					<showWarnings>true</showWarnings>
-					<compilerArgs>
-						<compilerArg>
-							-Amapstruct.defaultComponentModel=spring
-						</compilerArg>
-						<compilerArg>
-							-Amapstruct.unmappedTargetPolicy=WARN
-						</compilerArg>
-						<compilerArg>
-							-Amapstruct.unmappedSourcePolicy=WARN
-						</compilerArg>
-					</compilerArgs>
-				</configuration>
 			</plugin>
 
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
-				<configuration>
-					<offline>true</offline>
-				</configuration>
-				<executions>
-					<execution>
-						<id>get-the-git-infos</id>
-						<goals>
-							<goal>revision</goal>
-						</goals>
-						<phase>initialize</phase>
-					</execution>
-				</executions>
 			</plugin>
 		</plugins>
 	</build>
 
-	<repositories>
-		<repository>
-			<id>ozg-nexus</id>
-			<name>ozg nexus</name>
-			<url>https://nexus.ozg-sh.de/repository/ozg-group/</url>
-		</repository>
-		<repository>
-			<id>projectlombok.org</id>
-			<url>https://projectlombok.org/edge-releases</url>
-		</repository>
-	</repositories>
-
 	<distributionManagement>
 		<repository>
 			<id>ozg-nexus</id>
@@ -333,54 +223,10 @@
 			<url>https://nexus.ozg-sh.de/repository/ozg-releases/</url>
 		</repository>
 		<snapshotRepository>
-			<id>ozg-nexus</id>
+			<id>ozg-snapshots-nexus</id>
 			<name>ozg-snapshots</name>
 			<url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url>
 		</snapshotRepository>
 	</distributionManagement>
 
-	<profiles>
-		<profile>
-			<id>docker-build</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.spotify</groupId>
-						<artifactId>dockerfile-maven-plugin</artifactId>
-						<version>1.4.13</version>
-						<configuration>
-							<username>admin</username>
-							<password>admin</password>
-							<repository>registry.ozg-sh.de/sh-land/pluto</repository>
-							<!-- <repository>default-route-openshift-image-registry.apps.lab.okd.local/sh-kiel-dev/pluto</repository> -->
-							<tag>${git.branch}-${project.version}</tag>
-							<useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-							<buildArgs>
-								<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-							</buildArgs>
-						</configuration>
-						<executions>
-							<execution>
-								<id>default</id>
-								<phase>deploy</phase>
-								<goals>
-									<goal>build</goal>
-									<goal>tag</goal>
-									<goal>push</goal>
-								</goals>
-							</execution>
-						</executions>
-						<dependencies>
-							<dependency>
-								<groupId>javax.activation</groupId>
-								<artifactId>activation</artifactId>
-								<version>1.1.1</version>
-							</dependency>
-						</dependencies>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 </project>

pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/VorgangHeaderRepositoryITCase.java

@@ -10,6 +10,7 @@ import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.UUID;
 
+import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -28,7 +29,6 @@ import de.itvsh.ozg.pluto.command.WiedervorlageTestFactory;
 import de.itvsh.ozg.pluto.common.test.DataITCase;
 import de.itvsh.ozg.pluto.vorgang.FindVorgangRequest.OrderCriteria;
 import de.itvsh.ozg.pluto.vorgang.Vorgang.Status;
-import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
 
 @DataITCase
 class VorgangHeaderRepositoryITCase {