You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/12/01 18:06:34 UTC
[isis] 01/01: ISIS-3275: [Incubating] Migrate from Spring Framework 5.x to 6.x
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 613c6ea1c983376837c289542774fd22f2d42740
Merge: d844d93b25 f88d301cad
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 1 19:06:25 2022 +0100
ISIS-3275: [Incubating] Migrate from Spring Framework 5.x to 6.x
.../org/apache/causeway/applib/value/Blob.java | 71 ++++++++++++++---
.../org/apache/causeway/applib/value/Clob.java | 91 ++++++++++++++++++++--
.../domainmodel/MetaModelRegressionTest.java | 18 ++---
3 files changed, 155 insertions(+), 25 deletions(-)
diff --cc api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
index 67e371ebba,8779bdca27..32713ceeaa
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
@@@ -30,6 -33,14 +33,14 @@@ import java.util.Optional
import java.util.function.Consumer;
import java.util.function.Function;
-import javax.activation.MimeType;
-import javax.activation.MimeTypeParseException;
-import javax.inject.Named;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
++import jakarta.activation.MimeType;
++import jakarta.activation.MimeTypeParseException;
++import jakarta.inject.Named;
++import jakarta.xml.bind.annotation.adapters.XmlAdapter;
++import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+ import org.springframework.lang.Nullable;
+
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Value;
import org.apache.causeway.applib.jaxb.PrimitiveJaxbAdapters;
diff --cc api/applib/src/main/java/org/apache/causeway/applib/value/Clob.java
index 44287599d2,2861e84194..7b2d7d08d1
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/Clob.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Clob.java
@@@ -25,16 -29,20 +29,20 @@@ import java.nio.charset.Charset
import java.nio.charset.StandardCharsets;
import java.util.Objects;
- import org.apache.causeway.applib.CausewayModuleApplib;
- import org.apache.causeway.applib.annotation.Value;
- import org.apache.causeway.applib.jaxb.PrimitiveJaxbAdapters;
- import org.apache.causeway.commons.internal.base._Strings;
-
-import javax.activation.MimeType;
-import javax.activation.MimeTypeParseException;
-import javax.inject.Named;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.activation.MimeType;
+import jakarta.activation.MimeTypeParseException;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+ import org.springframework.lang.Nullable;
+
+ import org.apache.causeway.applib.CausewayModuleApplib;
+ import org.apache.causeway.applib.annotation.Value;
+ import org.apache.causeway.applib.jaxb.PrimitiveJaxbAdapters;
+ import org.apache.causeway.commons.functional.Try;
+ import org.apache.causeway.commons.internal.base._Strings;
+
import lombok.NonNull;
import lombok.SneakyThrows;
import lombok.val;