From c9ac03849ab80c7dcc02e47c1798bac6de739a13 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Thu, 16 Mar 2023 13:53:52 +0100 Subject: [PATCH] OZG-3630 upgrade to spring 6 --- common/pom.xml | 5 ---- .../common/formdata/FormData.java | 2 +- formsolutions-adapter/pom.xml | 28 +++++++++---------- intelliform-adapter/pom.xml | 18 ++++++++---- .../intelliform/FormDataEndpoint.java | 3 +- .../intelliform/XmlToJavaMapsMapperTest.java | 2 +- pom.xml | 21 ++++++++++++-- .../eingangsadapter/router/CallContext.java | 2 +- .../router/GrpcClientsProperties.java | 2 +- .../router/PlutoListProperties.java | 10 +++---- .../router/PlutoServerResolver.java | 2 +- .../router/PlutoListPropertiesTest.java | 6 ++-- .../formsolutions/ZipAttachment.java | 2 +- 13 files changed, 61 insertions(+), 42 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index cf369974d..9e4901b78 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 4b3db193b..63bfd47f7 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 b57131d6c..af9d4b16d 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 366051e4c..6f20cae88 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 c8feda1bc..27e18ef94 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 ca7d08bc8..f6b733378 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 34511a6f1..9c2896a06 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 23e178074..9cb944130 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 faad2d62b..6c51fad5c 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 764833b72..86b05690a 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 b60b55ef0..9d31c2d1a 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 84009f740..dfb874864 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 6d578968c..4654ca9cc 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; -- GitLab