OZG-3630 upgrade to spring 6

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>
 

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;

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,8 +132,15 @@
 		<plugins>
 			<!-- tag::wsdl/xsd[] -->
 			<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>
 					<schemaLanguage>WSDL</schemaLanguage>
 					<generatePackage>de.itvsh.kop.eingangsadapter.formsolutions</generatePackage>
@@ -151,6 +154,7 @@
 							</fileset>
 						</schema>
 					</schemas>
+					<schemaLanguage>WSDL</schemaLanguage>
 				</configuration>
 		      </plugin>
 			
@@ -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>
 

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>

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;

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;

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>

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;

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;

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;

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;

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;

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;