diff --git a/common/pom.xml b/common/pom.xml
index cf369974daae2628405fd4120c2dd89b00e0338b..9e4901b7856c61ed6259e08c3472e6f6396d7990 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -82,11 +82,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
-
- <plugin>
- <groupId>org.openrewrite.maven</groupId>
- <artifactId>rewrite-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormData.java b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormData.java
index 4b3db193b0b74dca100bd37330f3af0a91ecc56d..63bfd47f7ebe982e66315507cb6a17e7d38dd007 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormData.java
+++ b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormData.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import lombok.Builder;
import lombok.Getter;
diff --git a/formsolutions-adapter/pom.xml b/formsolutions-adapter/pom.xml
index b57131d6c490c403a563e6f168e165f93dea09f9..af9d4b16d16b61ea676af07b4cf8afa7abf22c02 100644
--- a/formsolutions-adapter/pom.xml
+++ b/formsolutions-adapter/pom.xml
@@ -80,10 +80,6 @@
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </dependency>
<!-- end::springws[] -->
<!-- Dev -->
@@ -136,9 +132,16 @@
<plugins>
<!-- tag::wsdl/xsd[] -->
<plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <configuration>
+ <groupId>com.evolvedbinary.maven.jvnet</groupId>
+ <artifactId>jaxb30-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
<schemaLanguage>WSDL</schemaLanguage>
<generatePackage>de.itvsh.kop.eingangsadapter.formsolutions</generatePackage>
<schemas>
@@ -151,9 +154,10 @@
</fileset>
</schema>
</schemas>
+ <schemaLanguage>WSDL</schemaLanguage>
</configuration>
- </plugin>
-
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -164,11 +168,6 @@
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
- <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId>
- <configuration> <sources> <source>${project.basedir}/src/main/resources/formsolutions/formdata.xsd</source>
- </sources> </configuration> </plugin> -->
- <!-- end::xsd[] -->
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -188,6 +187,7 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
+
</plugins>
</build>
diff --git a/intelliform-adapter/pom.xml b/intelliform-adapter/pom.xml
index 366051e4c84e56abad4cf161fffc20984fde38b1..6f20cae88951e7cfccbef083354f7b8ab2dbbc28 100644
--- a/intelliform-adapter/pom.xml
+++ b/intelliform-adapter/pom.xml
@@ -114,10 +114,8 @@
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </dependency>
+
+
<!-- end::springws[] -->
<!-- Test -->
@@ -179,9 +177,17 @@
<plugins>
<!-- tag::wsdl[] -->
<plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
+ <groupId>com.evolvedbinary.maven.jvnet</groupId>
+ <artifactId>jaxb30-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
+ <strict>false</strict>
<schemaLanguage>WSDL</schemaLanguage>
<generatePackage>de.itvsh.kop.eingangsadapter.intelliform</generatePackage>
<schemas>
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataEndpoint.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataEndpoint.java
index c8feda1bc896f18ea9df1febe1acb3490e59fb11..27e18ef94ce469b6696a7608960db60ca12f64ac 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataEndpoint.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataEndpoint.java
@@ -25,10 +25,11 @@ package de.itvsh.kop.eingangsadapter.intelliform;
import java.io.IOException;
-import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
+import jakarta.xml.bind.JAXBElement;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ws.server.endpoint.annotation.Endpoint;
import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
diff --git a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/XmlToJavaMapsMapperTest.java b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/XmlToJavaMapsMapperTest.java
index ca7d08bc8ac4b7f92dc60d6735068dc2eb6544fc..f6b733378e169908cc7766c35e0f951973189277 100644
--- a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/XmlToJavaMapsMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/XmlToJavaMapsMapperTest.java
@@ -31,7 +31,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.xml.soap.Node;
+import jakarta.xml.soap.Node;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
diff --git a/pom.xml b/pom.xml
index 34511a6f168e92dc601c03ab25c543bd85f38ff2..9c2896a061a718ee0bb243df1c652f18d024ce51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,8 +60,9 @@
<kop.license.version>1.3.0</kop.license.version>
<!-- plugins -->
- <jaxb2-plugin.version>0.14.0</jaxb2-plugin.version>
- <mojo-jaxb2-plugin.version>2.5.0</mojo-jaxb2-plugin.version>
+ <jaxb2-plugin.version>0.15.2</jaxb2-plugin.version>
+ <jaxb3-plugin.version>0.15.0</jaxb3-plugin.version>
+ <mojo-jaxb2-plugin.version>3.1.0</mojo-jaxb2-plugin.version>
</properties>
<dependencyManagement>
@@ -149,6 +150,18 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.evolvedbinary.maven.jvnet</groupId>
+ <artifactId>jaxb30-maven-plugin</artifactId>
+ <version>${jaxb3-plugin.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
@@ -191,6 +204,10 @@
</plugin>
</plugins>
</pluginManagement>
+
+ <plugins>
+
+ </plugins>
</build>
<distributionManagement>
diff --git a/router/src/main/java/de/itvsh/kop/eingangsadapter/router/CallContext.java b/router/src/main/java/de/itvsh/kop/eingangsadapter/router/CallContext.java
index 23e17807494155467e9cbcc74997822b95d8f9d4..9cb944130ccada0a0f2dff6ad82bcab2437673e3 100644
--- a/router/src/main/java/de/itvsh/kop/eingangsadapter/router/CallContext.java
+++ b/router/src/main/java/de/itvsh/kop/eingangsadapter/router/CallContext.java
@@ -23,7 +23,7 @@
*/
package de.itvsh.kop.eingangsadapter.router;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/router/src/main/java/de/itvsh/kop/eingangsadapter/router/GrpcClientsProperties.java b/router/src/main/java/de/itvsh/kop/eingangsadapter/router/GrpcClientsProperties.java
index faad2d62bb95c1edabdd9072a4f0f0afba0c302e..6c51fad5c8d90f87001260e85a753eaf52f82650 100644
--- a/router/src/main/java/de/itvsh/kop/eingangsadapter/router/GrpcClientsProperties.java
+++ b/router/src/main/java/de/itvsh/kop/eingangsadapter/router/GrpcClientsProperties.java
@@ -25,7 +25,7 @@ package de.itvsh.kop.eingangsadapter.router;
import java.util.Map;
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
diff --git a/router/src/main/java/de/itvsh/kop/eingangsadapter/router/PlutoListProperties.java b/router/src/main/java/de/itvsh/kop/eingangsadapter/router/PlutoListProperties.java
index 764833b722fb6677b21c4576e4716fa688fafb03..86b05690a7b73e33313b8a955900ff65ec289f42 100644
--- a/router/src/main/java/de/itvsh/kop/eingangsadapter/router/PlutoListProperties.java
+++ b/router/src/main/java/de/itvsh/kop/eingangsadapter/router/PlutoListProperties.java
@@ -35,11 +35,11 @@ import java.util.Optional;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/router/src/main/java/de/itvsh/kop/eingangsadapter/router/PlutoServerResolver.java b/router/src/main/java/de/itvsh/kop/eingangsadapter/router/PlutoServerResolver.java
index b60b55ef0f08876c652575f07bd9b15e83beecf4..9d31c2d1a8e881dcfec380502fbc53f57604ab18 100644
--- a/router/src/main/java/de/itvsh/kop/eingangsadapter/router/PlutoServerResolver.java
+++ b/router/src/main/java/de/itvsh/kop/eingangsadapter/router/PlutoServerResolver.java
@@ -25,7 +25,7 @@ package de.itvsh.kop.eingangsadapter.router;
import java.util.Optional;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/router/src/test/java/de/itvsh/kop/eingangsadapter/router/PlutoListPropertiesTest.java b/router/src/test/java/de/itvsh/kop/eingangsadapter/router/PlutoListPropertiesTest.java
index 84009f740ad51add1e2d301c3a62a3966775765b..dfb874864c3668a10c62dca0035399a3ea87915d 100644
--- a/router/src/test/java/de/itvsh/kop/eingangsadapter/router/PlutoListPropertiesTest.java
+++ b/router/src/test/java/de/itvsh/kop/eingangsadapter/router/PlutoListPropertiesTest.java
@@ -29,9 +29,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/ZipAttachment.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/ZipAttachment.java
index 6d578968cfb56187877439d75c0ec71a7eb677ed..4654ca9ccc5351083d3cabc1e85546c09c157f6c 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/ZipAttachment.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/ZipAttachment.java
@@ -49,7 +49,7 @@ import lombok.extern.log4j.Log4j2;
@Log4j2
class ZipAttachment {
- public static final String TMP_FILE_SUFFIX = ".tmp";
+ public static final String TMP_FILE_SUFFIX = ".ozg-cloud.tmp";
public static final String SOURCE_ZIP_PREFIX = "zip-attachment";
private static final String TARGET_ATTACHMENT_PREFIX = "ozg_fs_attachment_";
private final File sourceZipFile;