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 6a3b4e980b57bdd6878dc78c9609e1b5c8fe021c Author: Andi Huber <[email protected]> AuthorDate: Sun Nov 13 12:18:10 2022 +0100 ISIS-3275: migrate valuetypes --- valuetypes/asciidoc/applib/src/main/java/module-info.java | 4 ++-- .../causeway/valuetypes/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.java | 2 +- .../apache/causeway/valuetypes/asciidoc/applib/value/AsciiDoc.java | 4 ++-- valuetypes/asciidoc/metamodel/src/main/java/module-info.java | 2 +- .../asciidoc/metamodel/semantics/AsciiDocValueSemantics.java | 2 +- .../metamodel/semantics/ChangesDtoValueSemanticsPrettyRender.java | 2 +- .../metamodel/semantics/CommandDtoValueSemanticsPrettyRender.java | 2 +- .../metamodel/semantics/InteractionDtoValueSemanticsPrettyRender.java | 2 +- valuetypes/asciidoc/persistence-jpa/src/main/java/module-info.java | 2 +- .../persistence/jpa/converters/CausewayAsciiDocConverter.java | 4 ++-- .../asciidoc/ui/vaa/components/AsciiDocFieldFactoryVaa.java | 2 +- valuetypes/jodatime/applib/src/main/java/module-info.java | 2 +- .../valuetypes/jodatime/applib/jaxb/JodaTimeJaxbAdapters.java | 2 +- valuetypes/jodatime/integration/src/main/java/module-info.java | 2 +- .../integration/valuesemantics/JodaDateTimeValueSemantics.java | 4 ++-- .../integration/valuesemantics/JodaLocalDateTimeValueSemantics.java | 4 ++-- .../integration/valuesemantics/JodaLocalDateValueSemantics.java | 4 ++-- .../integration/valuesemantics/JodaLocalTimeValueSemantics.java | 4 ++-- valuetypes/markdown/applib/src/main/java/module-info.java | 4 ++-- .../causeway/valuetypes/markdown/applib/jaxb/MarkdownJaxbAdapter.java | 2 +- .../apache/causeway/valuetypes/markdown/applib/value/Markdown.java | 4 ++-- valuetypes/markdown/metamodel/src/main/java/module-info.java | 2 +- .../markdown/metamodel/semantics/MarkdownValueSemantics.java | 2 +- valuetypes/markdown/persistence-jpa/src/main/java/module-info.java | 2 +- .../persistence/jpa/converters/CausewayMarkdownConverter.java | 4 ++-- valuetypes/vega/applib/src/main/java/module-info.java | 4 ++-- .../apache/causeway/valuetypes/vega/applib/jaxb/VegaJaxbAdapter.java | 2 +- .../java/org/apache/causeway/valuetypes/vega/applib/value/Vega.java | 4 ++-- valuetypes/vega/metamodel/src/main/java/module-info.java | 2 +- .../valuetypes/vega/metamodel/semantics/VegaValueSemantics.java | 2 +- valuetypes/vega/persistence-jpa/src/main/java/module-info.java | 2 +- .../vega/persistence/jpa/converters/CausewayVegaConverter.java | 4 ++-- .../valuetypes/vega/ui/vaa/components/VegaFieldFactoryVaa.java | 2 +- 33 files changed, 46 insertions(+), 46 deletions(-) diff --git a/valuetypes/asciidoc/applib/src/main/java/module-info.java b/valuetypes/asciidoc/applib/src/main/java/module-info.java index 84ad4c21d5..a33a3f93fb 100644 --- a/valuetypes/asciidoc/applib/src/main/java/module-info.java +++ b/valuetypes/asciidoc/applib/src/main/java/module-info.java @@ -22,8 +22,8 @@ module org.apache.causeway.valuetypes.asciidoc.applib { exports org.apache.causeway.valuetypes.asciidoc.applib.jaxb; requires asciidoctorj.api; - requires java.inject; - requires java.xml.bind; + requires jakarta.inject; + requires jakarta.xml.bind; requires lombok; requires org.apache.causeway.applib; requires org.apache.causeway.commons; diff --git a/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.java index d750d7715a..c6c06ef2f0 100644 --- a/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.java +++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.java @@ -21,7 +21,7 @@ package org.apache.causeway.valuetypes.asciidoc.applib.jaxb; import java.nio.charset.StandardCharsets; import java.util.Base64; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.apache.causeway.commons.internal.base._Strings; import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc; diff --git a/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/value/AsciiDoc.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/value/AsciiDoc.java index bf09ee110a..b35b965316 100644 --- a/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/value/AsciiDoc.java +++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/causeway/valuetypes/asciidoc/applib/value/AsciiDoc.java @@ -21,8 +21,8 @@ package org.apache.causeway.valuetypes.asciidoc.applib.value; import java.io.Serializable; import java.util.Objects; -import javax.inject.Named; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.inject.Named; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.causeway.applib.value.Markup; import org.apache.causeway.valuetypes.asciidoc.applib.CausewayModuleValAsciidocApplib; diff --git a/valuetypes/asciidoc/metamodel/src/main/java/module-info.java b/valuetypes/asciidoc/metamodel/src/main/java/module-info.java index 5ef7d274ad..c0a3400e6d 100644 --- a/valuetypes/asciidoc/metamodel/src/main/java/module-info.java +++ b/valuetypes/asciidoc/metamodel/src/main/java/module-info.java @@ -20,7 +20,7 @@ module org.apache.causeway.valuetypes.asciidoc.metamodel { exports org.apache.causeway.valuetypes.asciidoc.metamodel; exports org.apache.causeway.valuetypes.asciidoc.metamodel.semantics; - requires java.inject; + requires jakarta.inject; requires lombok; requires org.apache.causeway.applib; requires org.apache.causeway.commons; diff --git a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java index 58a09c46ea..487b5500f2 100644 --- a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java +++ b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.valuetypes.asciidoc.metamodel.semantics; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.stereotype.Component; diff --git a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/ChangesDtoValueSemanticsPrettyRender.java b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/ChangesDtoValueSemanticsPrettyRender.java index 3f05254553..b9c54cae44 100644 --- a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/ChangesDtoValueSemanticsPrettyRender.java +++ b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/ChangesDtoValueSemanticsPrettyRender.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.valuetypes.asciidoc.metamodel.semantics; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.annotation.Order; diff --git a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/CommandDtoValueSemanticsPrettyRender.java b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/CommandDtoValueSemanticsPrettyRender.java index 864968bc32..33ad2ba028 100644 --- a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/CommandDtoValueSemanticsPrettyRender.java +++ b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/CommandDtoValueSemanticsPrettyRender.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.valuetypes.asciidoc.metamodel.semantics; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.annotation.Order; diff --git a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/InteractionDtoValueSemanticsPrettyRender.java b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/InteractionDtoValueSemanticsPrettyRender.java index ecd6ddc453..b1af103f8c 100644 --- a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/InteractionDtoValueSemanticsPrettyRender.java +++ b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/InteractionDtoValueSemanticsPrettyRender.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.valuetypes.asciidoc.metamodel.semantics; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.annotation.Order; diff --git a/valuetypes/asciidoc/persistence-jpa/src/main/java/module-info.java b/valuetypes/asciidoc/persistence-jpa/src/main/java/module-info.java index 0efa122136..98a7def0b9 100644 --- a/valuetypes/asciidoc/persistence-jpa/src/main/java/module-info.java +++ b/valuetypes/asciidoc/persistence-jpa/src/main/java/module-info.java @@ -20,7 +20,7 @@ module org.apache.causeway.valuetypes.asciidoc.persistence.jpa { exports org.apache.causeway.valuetypes.asciidoc.persistence.jpa; exports org.apache.causeway.valuetypes.asciidoc.persistence.jpa.converters; - requires java.persistence; + requires jakarta.persistence; requires org.apache.causeway.core.config; requires org.apache.causeway.valuetypes.asciidoc.applib; requires spring.boot.autoconfigure; diff --git a/valuetypes/asciidoc/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jpa/converters/CausewayAsciiDocConverter.java b/valuetypes/asciidoc/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jpa/converters/CausewayAsciiDocConverter.java index 1812588dab..15a79313a8 100644 --- a/valuetypes/asciidoc/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jpa/converters/CausewayAsciiDocConverter.java +++ b/valuetypes/asciidoc/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jpa/converters/CausewayAsciiDocConverter.java @@ -18,8 +18,8 @@ */ package org.apache.causeway.valuetypes.asciidoc.persistence.jpa.converters; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc; diff --git a/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldFactoryVaa.java b/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldFactoryVaa.java index 02d39255e4..ed8cf94866 100644 --- a/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldFactoryVaa.java +++ b/valuetypes/asciidoc/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/asciidoc/ui/vaa/components/AsciiDocFieldFactoryVaa.java @@ -28,7 +28,7 @@ import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.Co import lombok.val; @org.springframework.stereotype.Component [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) public class AsciiDocFieldFactoryVaa implements UiComponentHandlerVaa { //private final static int TYPICAL_LENGTH = 48; diff --git a/valuetypes/jodatime/applib/src/main/java/module-info.java b/valuetypes/jodatime/applib/src/main/java/module-info.java index b11524c6e3..e8d93329ac 100644 --- a/valuetypes/jodatime/applib/src/main/java/module-info.java +++ b/valuetypes/jodatime/applib/src/main/java/module-info.java @@ -22,7 +22,7 @@ module org.apache.causeway.valuetypes.jodatime.applib { exports org.apache.causeway.valuetypes.jodatime.applib.value; requires java.xml; - requires java.xml.bind; + requires jakarta.xml.bind; requires lombok; requires org.apache.causeway.applib; requires org.joda.time; diff --git a/valuetypes/jodatime/applib/src/main/java/org/apache/causeway/valuetypes/jodatime/applib/jaxb/JodaTimeJaxbAdapters.java b/valuetypes/jodatime/applib/src/main/java/org/apache/causeway/valuetypes/jodatime/applib/jaxb/JodaTimeJaxbAdapters.java index f6fe49b7ff..139d0915ae 100644 --- a/valuetypes/jodatime/applib/src/main/java/org/apache/causeway/valuetypes/jodatime/applib/jaxb/JodaTimeJaxbAdapters.java +++ b/valuetypes/jodatime/applib/src/main/java/org/apache/causeway/valuetypes/jodatime/applib/jaxb/JodaTimeJaxbAdapters.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.valuetypes.jodatime.applib.jaxb; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import javax.xml.datatype.XMLGregorianCalendar; import org.joda.time.DateTime; diff --git a/valuetypes/jodatime/integration/src/main/java/module-info.java b/valuetypes/jodatime/integration/src/main/java/module-info.java index 49ebe0438b..188d80c4ac 100644 --- a/valuetypes/jodatime/integration/src/main/java/module-info.java +++ b/valuetypes/jodatime/integration/src/main/java/module-info.java @@ -20,7 +20,7 @@ module org.apache.causeway.valuetypes.jodatime.integration { exports org.apache.causeway.valuetypes.jodatime.integration; exports org.apache.causeway.valuetypes.jodatime.integration.valuesemantics; - requires java.inject; + requires jakarta.inject; requires lombok; requires org.apache.causeway.applib; requires org.apache.causeway.commons; diff --git a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaDateTimeValueSemantics.java b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaDateTimeValueSemantics.java index 56ba20ae7e..71391a4094 100644 --- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaDateTimeValueSemantics.java +++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaDateTimeValueSemantics.java @@ -20,8 +20,8 @@ package org.apache.causeway.valuetypes.jodatime.integration.valuesemantics; import java.time.ZonedDateTime; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.joda.time.DateTime; import org.springframework.stereotype.Component; diff --git a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateTimeValueSemantics.java b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateTimeValueSemantics.java index 4f7078c070..b4bbdf612e 100644 --- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateTimeValueSemantics.java +++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateTimeValueSemantics.java @@ -18,8 +18,8 @@ */ package org.apache.causeway.valuetypes.jodatime.integration.valuesemantics; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.joda.time.LocalDateTime; import org.springframework.stereotype.Component; diff --git a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateValueSemantics.java b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateValueSemantics.java index cb99971f25..a0cd3d7cb1 100644 --- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateValueSemantics.java +++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateValueSemantics.java @@ -18,8 +18,8 @@ */ package org.apache.causeway.valuetypes.jodatime.integration.valuesemantics; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.joda.time.LocalDate; import org.springframework.stereotype.Component; diff --git a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalTimeValueSemantics.java b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalTimeValueSemantics.java index da51d75824..684fc4fab0 100644 --- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalTimeValueSemantics.java +++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalTimeValueSemantics.java @@ -18,8 +18,8 @@ */ package org.apache.causeway.valuetypes.jodatime.integration.valuesemantics; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.joda.time.LocalTime; import org.springframework.stereotype.Component; diff --git a/valuetypes/markdown/applib/src/main/java/module-info.java b/valuetypes/markdown/applib/src/main/java/module-info.java index 34250079aa..46acfba457 100644 --- a/valuetypes/markdown/applib/src/main/java/module-info.java +++ b/valuetypes/markdown/applib/src/main/java/module-info.java @@ -29,8 +29,8 @@ module org.apache.causeway.valuetypes.markdown.applib { requires flexmark.util.data; requires flexmark.util.misc; requires flexmark.util.sequence; - requires java.inject; - requires java.xml.bind; + requires jakarta.inject; + requires jakarta.xml.bind; requires lombok; requires org.apache.causeway.applib; requires org.apache.causeway.commons; diff --git a/valuetypes/markdown/applib/src/main/java/org/apache/causeway/valuetypes/markdown/applib/jaxb/MarkdownJaxbAdapter.java b/valuetypes/markdown/applib/src/main/java/org/apache/causeway/valuetypes/markdown/applib/jaxb/MarkdownJaxbAdapter.java index 88795c69a2..3d2831b3bd 100644 --- a/valuetypes/markdown/applib/src/main/java/org/apache/causeway/valuetypes/markdown/applib/jaxb/MarkdownJaxbAdapter.java +++ b/valuetypes/markdown/applib/src/main/java/org/apache/causeway/valuetypes/markdown/applib/jaxb/MarkdownJaxbAdapter.java @@ -21,7 +21,7 @@ package org.apache.causeway.valuetypes.markdown.applib.jaxb; import java.nio.charset.StandardCharsets; import java.util.Base64; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.apache.causeway.commons.internal.base._Strings; import org.apache.causeway.valuetypes.markdown.applib.value.Markdown; diff --git a/valuetypes/markdown/applib/src/main/java/org/apache/causeway/valuetypes/markdown/applib/value/Markdown.java b/valuetypes/markdown/applib/src/main/java/org/apache/causeway/valuetypes/markdown/applib/value/Markdown.java index 079cbb6b2a..970cdfef8a 100644 --- a/valuetypes/markdown/applib/src/main/java/org/apache/causeway/valuetypes/markdown/applib/value/Markdown.java +++ b/valuetypes/markdown/applib/src/main/java/org/apache/causeway/valuetypes/markdown/applib/value/Markdown.java @@ -21,8 +21,8 @@ package org.apache.causeway.valuetypes.markdown.applib.value; import java.io.Serializable; import java.util.Objects; -import javax.inject.Named; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.inject.Named; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.causeway.applib.value.Markup; import org.apache.causeway.valuetypes.markdown.applib.CausewayModuleValMarkdownApplib; diff --git a/valuetypes/markdown/metamodel/src/main/java/module-info.java b/valuetypes/markdown/metamodel/src/main/java/module-info.java index 9fc413b7c3..5d405ec467 100644 --- a/valuetypes/markdown/metamodel/src/main/java/module-info.java +++ b/valuetypes/markdown/metamodel/src/main/java/module-info.java @@ -20,7 +20,7 @@ module org.apache.causeway.valuetypes.markdown.metamodel { exports org.apache.causeway.valuetypes.markdown.metamodel; exports org.apache.causeway.valuetypes.markdown.metamodel.semantics; - requires java.inject; + requires jakarta.inject; requires org.apache.causeway.applib; requires org.apache.causeway.commons; requires org.apache.causeway.core.config; diff --git a/valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/semantics/MarkdownValueSemantics.java b/valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/semantics/MarkdownValueSemantics.java index f56f496074..789f62364e 100644 --- a/valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/semantics/MarkdownValueSemantics.java +++ b/valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/semantics/MarkdownValueSemantics.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.valuetypes.markdown.metamodel.semantics; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.stereotype.Component; diff --git a/valuetypes/markdown/persistence-jpa/src/main/java/module-info.java b/valuetypes/markdown/persistence-jpa/src/main/java/module-info.java index c6987b8f06..9045265c67 100644 --- a/valuetypes/markdown/persistence-jpa/src/main/java/module-info.java +++ b/valuetypes/markdown/persistence-jpa/src/main/java/module-info.java @@ -20,7 +20,7 @@ module org.apache.causeway.valuetypes.markdown.persistence.jpa { exports org.apache.causeway.valuetypes.markdown.persistence.jpa.converters; exports org.apache.causeway.valuetypes.markdown.persistence.jpa; - requires java.persistence; + requires jakarta.persistence; requires org.apache.causeway.core.config; requires org.apache.causeway.valuetypes.markdown.applib; requires spring.boot.autoconfigure; diff --git a/valuetypes/markdown/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jpa/converters/CausewayMarkdownConverter.java b/valuetypes/markdown/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jpa/converters/CausewayMarkdownConverter.java index d5bab07146..97c905d5ef 100644 --- a/valuetypes/markdown/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jpa/converters/CausewayMarkdownConverter.java +++ b/valuetypes/markdown/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jpa/converters/CausewayMarkdownConverter.java @@ -18,8 +18,8 @@ */ package org.apache.causeway.valuetypes.markdown.persistence.jpa.converters; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import org.apache.causeway.valuetypes.markdown.applib.value.Markdown; diff --git a/valuetypes/vega/applib/src/main/java/module-info.java b/valuetypes/vega/applib/src/main/java/module-info.java index deae3a7408..016fb43393 100644 --- a/valuetypes/vega/applib/src/main/java/module-info.java +++ b/valuetypes/vega/applib/src/main/java/module-info.java @@ -25,8 +25,8 @@ module org.apache.causeway.valuetypes.vega.applib { org.apache.causeway.valuetypes.vega.persistence.jdo, org.apache.causeway.valuetypes.vega.persistence.jpa; - requires java.inject; - requires java.xml.bind; + requires jakarta.inject; + requires jakarta.xml.bind; requires lombok; requires org.apache.causeway.applib; requires org.apache.causeway.commons; diff --git a/valuetypes/vega/applib/src/main/java/org/apache/causeway/valuetypes/vega/applib/jaxb/VegaJaxbAdapter.java b/valuetypes/vega/applib/src/main/java/org/apache/causeway/valuetypes/vega/applib/jaxb/VegaJaxbAdapter.java index 2c104f691b..7954c6a23b 100644 --- a/valuetypes/vega/applib/src/main/java/org/apache/causeway/valuetypes/vega/applib/jaxb/VegaJaxbAdapter.java +++ b/valuetypes/vega/applib/src/main/java/org/apache/causeway/valuetypes/vega/applib/jaxb/VegaJaxbAdapter.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.valuetypes.vega.applib.jaxb; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.apache.causeway.valuetypes.vega.applib.stringify.VegaStringifier; import org.apache.causeway.valuetypes.vega.applib.value.Vega; diff --git a/valuetypes/vega/applib/src/main/java/org/apache/causeway/valuetypes/vega/applib/value/Vega.java b/valuetypes/vega/applib/src/main/java/org/apache/causeway/valuetypes/vega/applib/value/Vega.java index 3eaf7f6016..193e44cd70 100644 --- a/valuetypes/vega/applib/src/main/java/org/apache/causeway/valuetypes/vega/applib/value/Vega.java +++ b/valuetypes/vega/applib/src/main/java/org/apache/causeway/valuetypes/vega/applib/value/Vega.java @@ -22,8 +22,8 @@ import java.io.Serializable; import java.util.Map; import java.util.Objects; -import javax.inject.Named; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.inject.Named; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.springframework.lang.Nullable; diff --git a/valuetypes/vega/metamodel/src/main/java/module-info.java b/valuetypes/vega/metamodel/src/main/java/module-info.java index 59290ae2e4..3ae84363c3 100644 --- a/valuetypes/vega/metamodel/src/main/java/module-info.java +++ b/valuetypes/vega/metamodel/src/main/java/module-info.java @@ -20,7 +20,7 @@ module org.apache.causeway.valuetypes.vega.metamodel { exports org.apache.causeway.valuetypes.vega.metamodel; exports org.apache.causeway.valuetypes.vega.metamodel.semantics; - requires java.inject; + requires jakarta.inject; requires lombok; requires org.apache.causeway.applib; requires org.apache.causeway.commons; diff --git a/valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/semantics/VegaValueSemantics.java b/valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/semantics/VegaValueSemantics.java index fdbd317893..ca42e4fee6 100644 --- a/valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/semantics/VegaValueSemantics.java +++ b/valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/semantics/VegaValueSemantics.java @@ -20,7 +20,7 @@ package org.apache.causeway.valuetypes.vega.metamodel.semantics; import java.util.UUID; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.stereotype.Component; diff --git a/valuetypes/vega/persistence-jpa/src/main/java/module-info.java b/valuetypes/vega/persistence-jpa/src/main/java/module-info.java index 23bfad92d6..fe533513d6 100644 --- a/valuetypes/vega/persistence-jpa/src/main/java/module-info.java +++ b/valuetypes/vega/persistence-jpa/src/main/java/module-info.java @@ -20,7 +20,7 @@ module org.apache.causeway.valuetypes.vega.persistence.jpa { exports org.apache.causeway.valuetypes.vega.persistence.jpa; exports org.apache.causeway.valuetypes.vega.persistence.jpa.converters; - requires java.persistence; + requires jakarta.persistence; requires org.apache.causeway.core.config; requires org.apache.causeway.valuetypes.vega.applib; requires spring.boot.autoconfigure; diff --git a/valuetypes/vega/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jpa/converters/CausewayVegaConverter.java b/valuetypes/vega/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jpa/converters/CausewayVegaConverter.java index 2b4efb7a80..9f056277c2 100644 --- a/valuetypes/vega/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jpa/converters/CausewayVegaConverter.java +++ b/valuetypes/vega/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jpa/converters/CausewayVegaConverter.java @@ -18,8 +18,8 @@ */ package org.apache.causeway.valuetypes.vega.persistence.jpa.converters; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import org.apache.causeway.valuetypes.vega.applib.stringify.VegaStringifier; import org.apache.causeway.valuetypes.vega.applib.value.Vega; diff --git a/valuetypes/vega/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/vega/ui/vaa/components/VegaFieldFactoryVaa.java b/valuetypes/vega/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/vega/ui/vaa/components/VegaFieldFactoryVaa.java index fee250b9f5..a133f364c0 100644 --- a/valuetypes/vega/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/vega/ui/vaa/components/VegaFieldFactoryVaa.java +++ b/valuetypes/vega/ui/vaadin/src/main/java/org/apache/causeway/valuetypes/vega/ui/vaa/components/VegaFieldFactoryVaa.java @@ -28,7 +28,7 @@ import org.apache.causeway.viewer.commons.model.components.UiComponentFactory.Co import lombok.val; @org.springframework.stereotype.Component [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) public class VegaFieldFactoryVaa implements UiComponentHandlerVaa { //private final static int TYPICAL_LENGTH = 48;
