This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch v3 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 91ca3329bc69075b6e7e148591dd448f6f358c45 Merge: d77b5931ed f6ecd951e0 Author: Andi Huber <[email protected]> AuthorDate: Wed Apr 17 15:32:45 2024 +0200 merge master into v3 .../metamodel/CausewayModuleCoreMetamodel.java | 76 +++++++++++----------- .../ApplicationFeatureIdValueSemantics.java | 15 +---- .../valuesemantics/BigDecimalValueSemantics.java | 15 +---- .../valuesemantics/BigIntegerValueSemantics.java | 15 +---- .../valuesemantics/BlobValueSemantics.java | 14 ---- .../valuesemantics/BookmarkValueSemantics.java | 15 +---- .../valuesemantics/BooleanValueSemantics.java | 16 +---- .../BufferedImageValueSemantics.java | 15 +---- .../valuesemantics/ByteValueSemantics.java | 15 +---- .../valuesemantics/ChangesDtoValueSemantics.java | 15 +---- .../valuesemantics/CharacterValueSemantics.java | 16 +---- .../valuesemantics/ClobValueSemantics.java | 15 +---- .../valuesemantics/CommandDtoValueSemantics.java | 15 +---- .../valuesemantics/DoubleValueSemantics.java | 15 +---- .../valuesemantics/FloatValueSemantics.java | 15 +---- .../valuesemantics/IntValueSemantics.java | 15 +---- .../InteractionDtoValueSemantics.java | 15 +---- .../LocalResourcePathValueSemantics.java | 15 +---- .../valuesemantics/LocaleValueSemantics.java | 15 +---- .../valuesemantics/LongValueSemantics.java | 15 +---- .../valuesemantics/MarkupValueSemantics.java | 15 +---- .../valuesemantics/OidDtoValueSemantics.java | 15 +---- .../valuesemantics/PasswordValueSemantics.java | 15 +---- .../valuesemantics/ShortValueSemantics.java | 15 +---- .../valuesemantics/StringValueSemantics.java | 15 +---- .../valuesemantics/TreeNodeValueSemantics.java | 15 +---- .../valuesemantics/TreePathValueSemantics.java | 21 ++---- .../valuesemantics/URLValueSemantics.java | 15 +---- .../valuesemantics/UUIDValueSemantics.java | 15 +---- .../temporal/LocalDateTimeValueSemantics.java | 15 +---- .../temporal/LocalDateValueSemantics.java | 15 +---- .../temporal/LocalTimeValueSemantics.java | 15 +---- .../temporal/OffsetDateTimeValueSemantics.java | 15 +---- .../temporal/OffsetTimeValueSemantics.java | 15 +---- .../temporal/ZonedDateTimeValueSemantics.java | 15 +---- .../temporal/legacy/JavaSqlDateValueSemantics.java | 15 +---- .../legacy/JavaSqlTimeStampValueSemantics.java | 15 +---- .../temporal/legacy/JavaSqlTimeValueSemantics.java | 15 +---- .../legacy/JavaUtilDateValueSemantics.java | 15 +---- .../commandlog/jpa/dom/CommandLogEntryPK.java | 16 +---- .../executionlog/jdo/dom/ExecutionLogEntryPK.java | 16 +---- .../executionlog/jpa/dom/ExecutionLogEntryPK.java | 16 +---- .../jdo/dom/ExecutionOutboxEntryPK.java | 16 +---- .../jpa/dom/ExecutionOutboxEntryPK.java | 16 +---- .../sessionlog/jpa/dom/SessionLogEntryPK.java | 16 +---- .../applib/value/CalendarEventSemantics.java | 25 ++----- .../CausewayModulePersistenceJdoDatanucleus.java | 36 +++++----- .../valuetypes/DnByteIdValueSemantics.java | 16 +---- .../valuetypes/DnCharIdValueSemantics.java | 15 +---- .../DnDatastoreIdImplValueSemantics.java | 15 +---- .../DnDatastoreUniqueLongIdValueSemantics.java | 16 +---- .../valuetypes/DnIntIdValueSemantics.java | 15 +---- .../valuetypes/DnLongIdValueSemantics.java | 15 +---- .../valuetypes/DnObjectIdValueSemantics.java | 15 +---- .../valuetypes/DnScoidValueSemantics.java | 16 +---- .../valuetypes/DnShortIdValueSemantics.java | 16 +---- .../valuetypes/DnStringIdValueSemantics.java | 16 +---- .../valuetypes/JdoByteIdentityValueSemantics.java | 19 +----- .../valuetypes/JdoCharIdentityValueSemantics.java | 19 +----- .../valuetypes/JdoDatastoreIdValueSemantics.java | 16 +---- .../valuetypes/JdoIntIdentityValueSemantics.java | 19 +----- .../valuetypes/JdoLongIdentityValueSemantics.java | 19 +----- .../JdoObjectIdentityValueSemantics.java | 19 +----- .../valuetypes/JdoShortIdentityValueSemantics.java | 19 +----- .../JdoStringIdentityValueSemantics.java | 19 +----- .../metamodel/src/main/java/module-info.java | 1 - .../CausewayModuleValAsciidocMetaModel.java | 2 +- .../semantics/AsciiDocValueSemantics.java | 15 +---- .../integration/src/main/java/module-info.java | 1 - .../CausewayModuleValJodatimeIntegration.java | 8 +-- .../valuesemantics/JodaDateTimeValueSemantics.java | 15 +---- .../JodaLocalDateTimeValueSemantics.java | 15 +---- .../JodaLocalDateValueSemantics.java | 15 +---- .../JodaLocalTimeValueSemantics.java | 15 +---- .../metamodel/src/main/java/module-info.java | 1 - .../CausewayModuleValMarkdownMetaModel.java | 2 +- .../semantics/MarkdownValueSemantics.java | 15 +---- .../vega/metamodel/src/main/java/module-info.java | 1 - .../metamodel/CausewayModuleValVegaMetaModel.java | 2 +- .../metamodel/semantics/VegaValueSemantics.java | 14 ---- .../staff/Staff_lowlevel_v1_IntegTest.java | 4 +- 81 files changed, 216 insertions(+), 1024 deletions(-) diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ApplicationFeatureIdValueSemantics.java index e5d0c816e6,0ace27a19f..1b8b248418 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ApplicationFeatureIdValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ApplicationFeatureIdValueSemantics.java @@@ -18,12 -18,10 +18,10 @@@ */ package org.apache.causeway.core.metamodel.valuesemantics; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java index b925e24cff,0df8eade1e..c3682de7f9 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java @@@ -24,13 -24,11 +24,11 @@@ import java.util.Optional import java.util.OptionalInt; import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.bookmark.IdStringifier; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigIntegerValueSemantics.java index e7487aac07,bbea83b61b..9098d649ec --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigIntegerValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigIntegerValueSemantics.java @@@ -21,12 -21,10 +21,10 @@@ package org.apache.causeway.core.metamo import java.math.BigInteger; import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.bookmark.IdStringifier; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BlobValueSemantics.java index 84bf1f5345,f6d31dc1ff..61a895c326 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BlobValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BlobValueSemantics.java @@@ -20,13 -20,9 +20,9 @@@ package org.apache.causeway.core.metamo import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; - import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.util.schema.CommonDtoUtils; import org.apache.causeway.applib.value.Blob; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BookmarkValueSemantics.java index 5ae837c050,c550f0e835..fbc379506e --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BookmarkValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BookmarkValueSemantics.java @@@ -18,12 -18,10 +18,10 @@@ */ package org.apache.causeway.core.metamodel.valuesemantics; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.bookmark.Bookmark; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BooleanValueSemantics.java index d2a3019768,edc8aac0d3..bfb7568bc4 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BooleanValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BooleanValueSemantics.java @@@ -20,12 -20,10 +20,10 @@@ package org.apache.causeway.core.metamo import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.exceptions.recoverable.TextEntryParseException; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BufferedImageValueSemantics.java index 9946fad919,7bdfc017c2..8ce5ab0825 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BufferedImageValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BufferedImageValueSemantics.java @@@ -21,13 -21,11 +21,11 @@@ package org.apache.causeway.core.metamo import java.awt.image.BufferedImage; import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; import org.springframework.lang.Nullable; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.Blob; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ByteValueSemantics.java index 4e7b2bbe2f,40f9b4346b..d22d3d1d35 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ByteValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ByteValueSemantics.java @@@ -21,12 -21,10 +21,10 @@@ package org.apache.causeway.core.metamo import java.math.BigInteger; import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.exceptions.recoverable.TextEntryParseException; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ChangesDtoValueSemantics.java index 299be6a14e,85cfa4c38b..09272de399 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ChangesDtoValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ChangesDtoValueSemantics.java @@@ -18,12 -18,10 +18,10 @@@ */ package org.apache.causeway.core.metamodel.valuesemantics; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.util.schema.ChangesDtoUtils; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/CharacterValueSemantics.java index 19eb1564cd,f2be09b592..7a330ff160 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/CharacterValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/CharacterValueSemantics.java @@@ -23,12 -23,10 +23,10 @@@ import java.util.Objects import java.util.function.UnaryOperator; import java.util.stream.Collectors; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.exceptions.recoverable.InvalidEntryException; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ClobValueSemantics.java index 4071891cdb,5dc3795146..8f5c3b7099 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ClobValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ClobValueSemantics.java @@@ -20,12 -20,10 +20,10 @@@ package org.apache.causeway.core.metamo import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.util.schema.CommonDtoUtils; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/CommandDtoValueSemantics.java index 0017767f3e,b16d69e391..e18f2fb370 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/CommandDtoValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/CommandDtoValueSemantics.java @@@ -18,12 -18,10 +18,10 @@@ */ package org.apache.causeway.core.metamodel.valuesemantics; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.util.schema.CommandDtoUtils; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/DoubleValueSemantics.java index 2839cf9ba1,97253eafd7..e7837c331d --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/DoubleValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/DoubleValueSemantics.java @@@ -20,12 -20,10 +20,10 @@@ package org.apache.causeway.core.metamo import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.semantics.DefaultsProvider; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/FloatValueSemantics.java index 5108efb2f6,93b44fdf04..407d8c0a04 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/FloatValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/FloatValueSemantics.java @@@ -20,12 -20,10 +20,10 @@@ package org.apache.causeway.core.metamo import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.semantics.DefaultsProvider; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/IntValueSemantics.java index 5b784a997b,0b1edc0dce..4e5330f42a --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/IntValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/IntValueSemantics.java @@@ -21,12 -21,10 +21,10 @@@ package org.apache.causeway.core.metamo import java.math.BigInteger; import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.exceptions.recoverable.TextEntryParseException; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/InteractionDtoValueSemantics.java index c20cfb0270,e8978b1c63..07b550ee50 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/InteractionDtoValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/InteractionDtoValueSemantics.java @@@ -18,12 -18,10 +18,10 @@@ */ package org.apache.causeway.core.metamodel.valuesemantics; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.util.schema.InteractionDtoUtils; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LocalResourcePathValueSemantics.java index 9cc4966ed2,ac5bb45f24..480b4ee3b9 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LocalResourcePathValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LocalResourcePathValueSemantics.java @@@ -20,12 -20,10 +20,10 @@@ package org.apache.causeway.core.metamo import java.nio.file.InvalidPathException; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.LocalResourcePath; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LocaleValueSemantics.java index 2c0f7dc5c5,bdd33fbd8f..669693aa44 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LocaleValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LocaleValueSemantics.java @@@ -20,13 -20,11 +20,11 @@@ package org.apache.causeway.core.metamo import java.util.Locale; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; import org.springframework.lang.Nullable; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.semantics.Parser; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LongValueSemantics.java index 186afe5c95,fcf82e0428..2219956860 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LongValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LongValueSemantics.java @@@ -21,12 -21,10 +21,10 @@@ package org.apache.causeway.core.metamo import java.math.BigInteger; import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.exceptions.recoverable.TextEntryParseException; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/MarkupValueSemantics.java index cae31526c2,482387eba5..98f66417ea --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/MarkupValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/MarkupValueSemantics.java @@@ -18,12 -18,10 +18,10 @@@ */ package org.apache.causeway.core.metamodel.valuesemantics; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.Markup; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/OidDtoValueSemantics.java index aaf7bd2e2a,d57aec6ca5..ecb2a50d8d --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/OidDtoValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/OidDtoValueSemantics.java @@@ -18,13 -18,11 +18,11 @@@ */ package org.apache.causeway.core.metamodel.valuesemantics; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.bookmark.Bookmark; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/PasswordValueSemantics.java index 886b437c79,bb34371e79..8aca24e08f --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/PasswordValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/PasswordValueSemantics.java @@@ -18,12 -18,10 +18,10 @@@ */ package org.apache.causeway.core.metamodel.valuesemantics; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.PlaceholderLiteral; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ShortValueSemantics.java index 64e08b80ba,b29f4d641d..1ecd54018b --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ShortValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ShortValueSemantics.java @@@ -21,12 -21,10 +21,10 @@@ package org.apache.causeway.core.metamo import java.math.BigInteger; import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.exceptions.recoverable.TextEntryParseException; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/StringValueSemantics.java index acc56f53e3,e2d1afe459..ba12d84258 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/StringValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/StringValueSemantics.java @@@ -22,12 -22,10 +22,10 @@@ import java.util.Arrays import java.util.List; import java.util.function.UnaryOperator; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.bookmark.IdStringifier; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/TreeNodeValueSemantics.java index bec6ffcf18,1dff074f2d..ba97291ba2 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/TreeNodeValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/TreeNodeValueSemantics.java @@@ -20,13 -20,11 +20,11 @@@ package org.apache.causeway.core.metamo import java.util.stream.Stream; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.graph.tree.TreeAdapter; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/TreePathValueSemantics.java index ad666d6305,a9ae584914..95381da86a --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/TreePathValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/TreePathValueSemantics.java @@@ -18,13 -18,11 +18,11 @@@ */ package org.apache.causeway.core.metamodel.valuesemantics; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; import org.springframework.lang.Nullable; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.graph.tree.TreePath; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/URLValueSemantics.java index 52d149bac5,ac3e2f2965..5fe9eda063 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/URLValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/URLValueSemantics.java @@@ -20,12 -20,10 +20,10 @@@ package org.apache.causeway.core.metamo import java.net.URL; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.semantics.Parser; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/UUIDValueSemantics.java index a01785247a,a3854cc896..d85d15bda1 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/UUIDValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/UUIDValueSemantics.java @@@ -20,12 -20,10 +20,10 @@@ package org.apache.causeway.core.metamo import java.util.UUID; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.bookmark.IdStringifier; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateTimeValueSemantics.java index 28ca07429a,995f146977..f508d1b1f2 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateTimeValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateTimeValueSemantics.java @@@ -22,12 -22,10 +22,10 @@@ import java.time.Duration import java.time.LocalDateTime; import java.util.Optional; -import javax.inject.Named; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; import org.springframework.lang.Nullable; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.value.semantics.OrderRelation; import org.apache.causeway.commons.collections.Can; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java index 295b2be9d7,f2d8051159..5b038789e6 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java @@@ -22,12 -22,10 +22,10 @@@ import java.time.Duration import java.time.LocalDate; import java.util.Optional; -import javax.inject.Named; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; import org.springframework.lang.Nullable; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.value.semantics.OrderRelation; import org.apache.causeway.commons.collections.Can; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalTimeValueSemantics.java index 4abfc4d2e7,ca1b7d3728..0db86550a2 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalTimeValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalTimeValueSemantics.java @@@ -22,12 -22,10 +22,10 @@@ import java.time.Duration import java.time.LocalTime; import java.util.Optional; -import javax.inject.Named; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; import org.springframework.lang.Nullable; + import org.springframework.stereotype.Component; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.internal.base._Temporals; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/OffsetDateTimeValueSemantics.java index 0df6c4a11e,cf4e83d689..f7d2f551b2 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/OffsetDateTimeValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/OffsetDateTimeValueSemantics.java @@@ -22,12 -22,10 +22,10 @@@ import java.time.Duration import java.time.OffsetDateTime; import java.util.Optional; -import javax.inject.Named; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; import org.springframework.lang.Nullable; + import org.springframework.stereotype.Component; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.functional.Either; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/OffsetTimeValueSemantics.java index 0d7c15e62b,0b4593fe72..4db32964a0 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/OffsetTimeValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/OffsetTimeValueSemantics.java @@@ -22,12 -22,10 +22,10 @@@ import java.time.Duration import java.time.OffsetTime; import java.util.Optional; -import javax.inject.Named; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; import org.springframework.lang.Nullable; + import org.springframework.stereotype.Component; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.functional.Either; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/ZonedDateTimeValueSemantics.java index 1c6c5af7fd,fdbd616400..807987d451 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/ZonedDateTimeValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/ZonedDateTimeValueSemantics.java @@@ -22,12 -22,10 +22,10 @@@ import java.time.Duration import java.time.ZonedDateTime; import java.util.Optional; -import javax.inject.Named; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; import org.springframework.lang.Nullable; + import org.springframework.stereotype.Component; import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.functional.Either; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/legacy/JavaSqlDateValueSemantics.java index b5992e2ddb,7e391b64ad..79947fbf69 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/legacy/JavaSqlDateValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/legacy/JavaSqlDateValueSemantics.java @@@ -21,12 -21,10 +21,10 @@@ package org.apache.causeway.core.metamo import java.sql.Date; import java.time.LocalDate; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract; import org.apache.causeway.commons.collections.Can; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/legacy/JavaSqlTimeStampValueSemantics.java index d43dfbd34e,bad63ca76f..60cf4dd1b1 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/legacy/JavaSqlTimeStampValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/legacy/JavaSqlTimeStampValueSemantics.java @@@ -21,12 -21,10 +21,10 @@@ package org.apache.causeway.core.metamo import java.sql.Timestamp; import java.time.LocalDateTime; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract; import org.apache.causeway.commons.collections.Can; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/legacy/JavaSqlTimeValueSemantics.java index 7033226342,b156ad2df8..7227c43e0b --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/legacy/JavaSqlTimeValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/legacy/JavaSqlTimeValueSemantics.java @@@ -21,12 -21,10 +21,10 @@@ package org.apache.causeway.core.metamo import java.sql.Time; import java.time.LocalTime; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract; import org.apache.causeway.commons.collections.Can; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/legacy/JavaUtilDateValueSemantics.java index b889be229d,dce7b4e182..fb7892f090 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/legacy/JavaUtilDateValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/legacy/JavaUtilDateValueSemantics.java @@@ -22,12 -22,10 +22,10 @@@ import java.time.LocalDateTime import java.time.ZoneId; import java.util.Date; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract; import org.apache.causeway.commons.collections.Can; diff --cc extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntryPK.java index 4dd8a9ba09,4c9525f36f..d7bc37d920 --- a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntryPK.java +++ b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntryPK.java @@@ -22,14 -22,12 +22,12 @@@ package org.apache.causeway.extensions. import java.io.Serializable; import java.util.UUID; -import javax.annotation.Priority; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Embeddable; +import jakarta.annotation.Priority; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Embeddable; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic; diff --cc extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java index 5c9efe9593,02fb85187e..d464fd1b83 --- a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java +++ b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java @@@ -22,11 -22,9 +22,9 @@@ import java.io.Serializable import java.util.StringTokenizer; import java.util.UUID; -import javax.annotation.Priority; +import jakarta.annotation.Priority; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic; diff --cc extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java index 992516bdc8,0f925c7314..b738f22c50 --- a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java +++ b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java @@@ -22,14 -22,12 +22,12 @@@ import java.io.Serializable import java.util.StringTokenizer; import java.util.UUID; -import javax.annotation.Priority; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Embeddable; +import jakarta.annotation.Priority; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Embeddable; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic; diff --cc extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java index 156f132c53,702cce8396..fbdac0d738 --- a/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java +++ b/extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java @@@ -22,11 -22,9 +22,9 @@@ import java.io.Serializable import java.util.StringTokenizer; import java.util.UUID; -import javax.annotation.Priority; +import jakarta.annotation.Priority; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic; diff --cc extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java index 8f27817cc1,ad78df5d0e..81d7f12569 --- a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java +++ b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java @@@ -22,14 -22,12 +22,12 @@@ import java.io.Serializable import java.util.StringTokenizer; import java.util.UUID; -import javax.annotation.Priority; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Embeddable; +import jakarta.annotation.Priority; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Embeddable; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic; diff --cc extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/dom/SessionLogEntryPK.java index d6a9b12b7d,44d88882dc..0044972dc3 --- a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/dom/SessionLogEntryPK.java +++ b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/dom/SessionLogEntryPK.java @@@ -23,14 -23,12 +23,12 @@@ package org.apache.causeway.extensions. import java.io.Serializable; import java.util.UUID; -import javax.annotation.Priority; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Embeddable; +import jakarta.annotation.Priority; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Embeddable; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic; diff --cc extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java index da1060ac24,4adde41059..44cb1437d3 --- a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java +++ b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java @@@ -27,12 -27,10 +27,10 @@@ import java.time.ZonedDateTime import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoByteIdentityValueSemantics.java index dcc4297ef7,da2dbc369b..cdf71a1f40 --- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoByteIdentityValueSemantics.java +++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoByteIdentityValueSemantics.java @@@ -18,13 -18,10 +18,10 @@@ */ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes; - import javax.jdo.identity.ByteIdentity; - -import javax.annotation.Priority; +import jakarta.annotation.Priority; + import javax.jdo.identity.ByteIdentity; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.util.schema.CommonDtoUtils; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoCharIdentityValueSemantics.java index 5121a7e0fd,5e92374065..9a39c6398e --- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoCharIdentityValueSemantics.java +++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoCharIdentityValueSemantics.java @@@ -18,14 -18,11 +18,11 @@@ */ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes; - import javax.jdo.identity.CharIdentity; - -import javax.annotation.Priority; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; + import javax.jdo.identity.CharIdentity; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.bookmark.IdStringifier; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoIntIdentityValueSemantics.java index f357a2ae84,8689d6aa4a..1ed1d4c074 --- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoIntIdentityValueSemantics.java +++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoIntIdentityValueSemantics.java @@@ -18,13 -18,10 +18,10 @@@ */ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes; - import javax.jdo.identity.IntIdentity; - -import javax.annotation.Priority; +import jakarta.annotation.Priority; + import javax.jdo.identity.IntIdentity; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.util.schema.CommonDtoUtils; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoLongIdentityValueSemantics.java index 15577ddf4d,bd9db134f2..c384ae3974 --- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoLongIdentityValueSemantics.java +++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoLongIdentityValueSemantics.java @@@ -18,13 -18,10 +18,10 @@@ */ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes; - import javax.jdo.identity.LongIdentity; - -import javax.annotation.Priority; +import jakarta.annotation.Priority; + import javax.jdo.identity.LongIdentity; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.util.schema.CommonDtoUtils; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoObjectIdentityValueSemantics.java index f3bfb060aa,f1784f0d3f..7829c5368e --- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoObjectIdentityValueSemantics.java +++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoObjectIdentityValueSemantics.java @@@ -20,13 -20,10 +20,10 @@@ package org.apache.causeway.persistence import java.util.UUID; - import javax.jdo.identity.ObjectIdentity; - -import javax.annotation.Priority; +import jakarta.annotation.Priority; + import javax.jdo.identity.ObjectIdentity; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.util.schema.CommonDtoUtils; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoShortIdentityValueSemantics.java index 0c36473ce5,c3f014089a..d629e5402b --- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoShortIdentityValueSemantics.java +++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoShortIdentityValueSemantics.java @@@ -18,13 -18,10 +18,10 @@@ */ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes; - import javax.jdo.identity.ShortIdentity; - -import javax.annotation.Priority; +import jakarta.annotation.Priority; + import javax.jdo.identity.ShortIdentity; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.util.schema.CommonDtoUtils; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoStringIdentityValueSemantics.java index c970a48232,03e21ed42e..e191057762 --- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoStringIdentityValueSemantics.java +++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoStringIdentityValueSemantics.java @@@ -18,14 -18,11 +18,11 @@@ */ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes; - import javax.jdo.identity.StringIdentity; - -import javax.annotation.Priority; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; + import javax.jdo.identity.StringIdentity; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.bookmark.IdStringifier; diff --cc valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java index 7dfc7642b4,58a09c46ea..487b5500f2 --- 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,11 -18,9 +18,9 @@@ */ package org.apache.causeway.valuetypes.asciidoc.metamodel.semantics; -import javax.inject.Named; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.value.semantics.Parser; import org.apache.causeway.applib.value.semantics.Renderer; diff --cc valuetypes/markdown/metamodel/src/main/java/org/apache/causeway/valuetypes/markdown/metamodel/semantics/MarkdownValueSemantics.java index 90041af61a,f56f496074..789f62364e --- 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,11 -18,9 +18,9 @@@ */ package org.apache.causeway.valuetypes.markdown.metamodel.semantics; -import javax.inject.Named; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.value.semantics.Parser; import org.apache.causeway.applib.value.semantics.Renderer; diff --cc valuetypes/vega/metamodel/src/main/java/org/apache/causeway/valuetypes/vega/metamodel/semantics/VegaValueSemantics.java index 65751f2da1,fdbd317893..ca42e4fee6 --- 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,11 -20,8 +20,8 @@@ package org.apache.causeway.valuetypes. import java.util.UUID; -import javax.inject.Named; +import jakarta.inject.Named; - import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; - import org.springframework.context.annotation.Bean; - import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; import org.apache.causeway.applib.value.semantics.DefaultsProvider;
