diff --git a/common/pom.xml b/common/pom.xml
index 4539d89981f71894a604d2b599f717f11d28bf46..81b5f5009fd5e3f7382e3127e2710e788a8cfce4 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -28,26 +28,6 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
-
- <!-- Test -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Runtime -->
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-prometheus</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<build>
@@ -63,6 +43,21 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <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>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/common/src/test/resources/application.yml b/common/src/test/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..46a546ec1e1e9ac1ce7b030d736319ee5359b018
--- /dev/null
+++ b/common/src/test/resources/application.yml
@@ -0,0 +1,16 @@
+spring:
+ profiles:
+ active:
+ - local
+ - itcase
+
+logging:
+ level:
+ ROOT: ERROR
+ '[org.springframework]': INFO
+ config: classpath:log4j2-local.xml
+
+kop:
+ adapter:
+ routingStrategy: SINGLE
+ targetPlutoName: kiel
\ No newline at end of file
diff --git a/formsolutions-adapter/src/main/resources/application-local.yml b/formsolutions-adapter/src/main/resources/application-local.yml
index 5ebda12171dc253711a2c79fbacf774c6a8f1c0a..ff8e8e157a7f35e9fdfe9eef73a025c38e01e263 100644
--- a/formsolutions-adapter/src/main/resources/application-local.yml
+++ b/formsolutions-adapter/src/main/resources/application-local.yml
@@ -1,3 +1,8 @@
+logging:
+ level:
+ ROOT: ERROR
+ config: classpath:log4j2-local.xml
+
grpc:
client:
pluto-local:
diff --git a/formsolutions-adapter/src/test/resources/application-itcase.yml b/formsolutions-adapter/src/test/resources/application-itcase.yml
index 0db8fef4679717244b61d2687f0a184659055ca9..7167c08a8537d199731ba5e41dadce409df7b1aa 100644
--- a/formsolutions-adapter/src/test/resources/application-itcase.yml
+++ b/formsolutions-adapter/src/test/resources/application-itcase.yml
@@ -1,4 +1,10 @@
spring:
jackson:
deserialization:
- fail-on-unknown-properties: true
\ No newline at end of file
+ fail-on-unknown-properties: true
+
+grpc:
+ client:
+ pluto-kiel:
+ address: static://127.0.0.1:9090
+ negotiationType: PLAINTEXT
\ No newline at end of file
diff --git a/formsolutions-adapter/src/test/resources/application.yml b/formsolutions-adapter/src/test/resources/application.yml
deleted file mode 100644
index aeae634592db80d608f753c4df0e9e1f13fd3b90..0000000000000000000000000000000000000000
--- a/formsolutions-adapter/src/test/resources/application.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-logging:
- level:
- ROOT: ERROR
-
-grpc:
- client:
- pluto-nf:
- address: static://127.0.0.1:9090
- negotiationType: PLAINTEXT
-
-kop:
- adapter:
- routingStrategy: SINGLE
- targetPlutoName: nf
\ No newline at end of file
diff --git a/forwarder/pom.xml b/forwarder/pom.xml
index def33c7f9e571ad7a6f575b5135dde390cd55962..669eb2e8cd7a0080b43b5a072029a46e067246f4 100644
--- a/forwarder/pom.xml
+++ b/forwarder/pom.xml
@@ -35,7 +35,6 @@
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
- <version>${grpc.spring-boot-starter.version}</version>
</dependency>
<!-- Tools -->
@@ -60,18 +59,6 @@
<artifactId>lombok</artifactId>
</dependency>
- <!-- Test -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
diff --git a/intelliform-adapter/pom.xml b/intelliform-adapter/pom.xml
index d25b87d293eb768e54c40fdd31427324a68043b0..00a53b3e4ffbf5850c06f0ca80a2f26801804f8d 100644
--- a/intelliform-adapter/pom.xml
+++ b/intelliform-adapter/pom.xml
@@ -77,12 +77,6 @@
<optional>true</optional>
</dependency>
- <!-- Logging/Monitoring -->
- <dependency>
- <groupId>net.logstash.logback</groupId>
- <artifactId>logstash-logback-encoder</artifactId>
- </dependency>
-
<!-- tag::springws[] -->
<dependency>
<groupId>wsdl4j</groupId>
@@ -156,21 +150,6 @@
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
-
<!-- tag::wsdl[] -->
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
@@ -191,15 +170,33 @@
</configuration>
</plugin>
<!-- end::wsdl[] -->
+
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-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-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ </plugin>
+
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 9580ca48218fa04faa71f1155893075016d67ef6..08011e4b273afe49be93e6c579e2c64ed61e8197 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,9 +10,9 @@
<version>0.16.0-SNAPSHOT</version>
<parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.4.12</version>
+ <groupId>de.itvsh.kop</groupId>
+ <artifactId>kop-common-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -25,23 +25,16 @@
</modules>
<properties>
- <java.version>17</java.version>
-
<mapstruct.version>1.4.2.Final</mapstruct.version>
<pluto.version>0.18.0-SNAPSHOT</pluto.version>
- <grpc.spring-boot-starter.version>2.12.0.RELEASE</grpc.spring-boot-starter.version>
-
<jsoup.version>1.14.3</jsoup.version>
- <lombok.version>edge-SNAPSHOT</lombok.version>
- <logstash-logback-encoder.version>6.6</logstash-logback-encoder.version>
<xmlschema.version>2.3.0</xmlschema.version>
<!-- plugins -->
<jaxb2-plugin.version>0.14.0</jaxb2-plugin.version>
<mojo-jaxb2-plugin.version>2.5.0</mojo-jaxb2-plugin.version>
- <jacoco-plugin.version>0.8.7</jacoco-plugin.version>
</properties>
<dependencyManagement>
@@ -64,41 +57,12 @@
<version>${pluto.version}</version>
</dependency>
- <!-- spring -->
- <dependency>
- <groupId>net.devh</groupId>
- <artifactId>grpc-client-spring-boot-starter</artifactId>
- <version>${grpc.spring-boot-starter.version}</version>
- </dependency>
-
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>${jsoup.version}</version>
</dependency>
- <!-- Tools -->
- <dependency>
- <groupId>org.mapstruct</groupId>
- <artifactId>mapstruct</artifactId>
- <version>${mapstruct.version}</version>
- </dependency>
-
- <!-- Dev -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Logging/Monitoring -->
- <dependency>
- <groupId>net.logstash.logback</groupId>
- <artifactId>logstash-logback-encoder</artifactId>
- <version>${logstash-logback-encoder.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-core</artifactId>
@@ -119,38 +83,6 @@
<build>
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <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>
- <!-- other annotation processors -->
- </annotationProcessorPaths>
-
- <showWarnings>true</showWarnings>
- <compilerArgs>
- <compilerArg>
- -Amapstruct.defaultComponentModel=spring
- </compilerArg>
- <compilerArg>
- -Amapstruct.unmappedTargetPolicy=WARN
- </compilerArg>
- </compilerArgs>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -187,52 +119,10 @@
</plugin>
<!-- end::webservice -->
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- <configuration>
- <offline>true</offline>
- </configuration>
- </plugin>
-
- <!-- tag::test[] -->
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco-plugin.version}</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>
- <!-- end::test[] -->
</plugins>
</pluginManagement>
</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>
@@ -240,7 +130,7 @@
<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>
diff --git a/router/pom.xml b/router/pom.xml
index 4a53c60d8aaf28e14f2947c96b819bbf8e40b797..b3706210a287805776a1c71187877e08a3cdc54a 100644
--- a/router/pom.xml
+++ b/router/pom.xml
@@ -27,43 +27,44 @@
<groupId>net.devh</groupId>
<artifactId>grpc-client-spring-boot-starter</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-configuration-processor</artifactId>
- <optional>true</optional>
- </dependency>
-
+
<!-- Tools -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
-
- <!-- Test -->
+ <!-- Dev -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
</dependency>
+
+ <!-- Test -->
<dependency>
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
- <!-- Dev -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </dependency>
- </dependencies>
+ <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>
+ </plugins>
+ </build>
</project>
\ No newline at end of file