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 d5cec1be48203c412212b02b2ca00a3603a4b4f8 Merge: 30b625b364 758a72a3c3 Author: Andi Huber <[email protected]> AuthorDate: Wed Apr 10 03:19:35 2024 +0200 Merge remote-tracking branch 'origin/master' into v3 .../metamodel/CausewayModuleCoreMetamodel.java | 74 +++++++++++----------- .../ApplicationFeatureIdValueSemantics.java | 15 ++++- .../valuesemantics/BigDecimalValueSemantics.java | 15 ++++- .../valuesemantics/BigIntegerValueSemantics.java | 15 ++++- .../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 | 16 ++++- .../valuetypes/JdoCharIdentityValueSemantics.java | 16 ++++- .../valuetypes/JdoDatastoreIdValueSemantics.java | 16 ++++- .../valuetypes/JdoIntIdentityValueSemantics.java | 16 ++++- .../valuetypes/JdoLongIdentityValueSemantics.java | 16 ++++- .../JdoObjectIdentityValueSemantics.java | 16 ++++- .../valuetypes/JdoShortIdentityValueSemantics.java | 16 ++++- .../JdoStringIdentityValueSemantics.java | 16 ++++- .../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 ++++ 79 files changed, 993 insertions(+), 206 deletions(-) diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ApplicationFeatureIdValueSemantics.java index 1b8b248418,c3785ba963..e5d0c816e6 --- 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,10 -18,12 +18,12 @@@ */ 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.stereotype.Component; + 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.services.appfeat.ApplicationFeatureId; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java index c3682de7f9,508359d682..b925e24cff --- 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,11 -24,13 +24,13 @@@ 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.stereotype.Component; + 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.services.bookmark.IdStringifier; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigIntegerValueSemantics.java index 9098d649ec,16998f8d7d..e7487aac07 --- 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,10 -21,12 +21,12 @@@ 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.stereotype.Component; + 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.services.bookmark.IdStringifier; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BookmarkValueSemantics.java index fbc379506e,6fe5986672..5ae837c050 --- 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,10 -18,12 +18,12 @@@ */ 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.stereotype.Component; + 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.services.bookmark.Bookmark; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BooleanValueSemantics.java index bfb7568bc4,319d00c3ed..d2a3019768 --- 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,10 -20,12 +20,12 @@@ 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.stereotype.Component; + 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.exceptions.recoverable.TextEntryParseException; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BufferedImageValueSemantics.java index 8ce5ab0825,3afa33d75c..9946fad919 --- 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,11 -21,13 +21,13 @@@ 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 d22d3d1d35,ebdfd2f3b3..4e7b2bbe2f --- 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,10 -21,12 +21,12 @@@ 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.stereotype.Component; + 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.exceptions.recoverable.TextEntryParseException; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ChangesDtoValueSemantics.java index 09272de399,f95fb2c98b..299be6a14e --- 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,10 -18,12 +18,12 @@@ */ 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.stereotype.Component; + 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.ChangesDtoUtils; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/CharacterValueSemantics.java index 7a330ff160,5fcadb3793..19eb1564cd --- 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,10 -23,12 +23,12 @@@ 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.stereotype.Component; + 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.exceptions.recoverable.InvalidEntryException; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ClobValueSemantics.java index 8f5c3b7099,3b9c5c59db..4071891cdb --- 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,10 -20,12 +20,12 @@@ 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.stereotype.Component; + 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; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/CommandDtoValueSemantics.java index e18f2fb370,edd34ef54b..0017767f3e --- 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,10 -18,12 +18,12 @@@ */ 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.stereotype.Component; + 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.CommandDtoUtils; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/DoubleValueSemantics.java index e7837c331d,48514bb5e0..2839cf9ba1 --- 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,10 -20,12 +20,12 @@@ 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.stereotype.Component; + 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.value.semantics.DefaultsProvider; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/FloatValueSemantics.java index 407d8c0a04,da5fd0c459..5108efb2f6 --- 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,10 -20,12 +20,12 @@@ 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.stereotype.Component; + 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.value.semantics.DefaultsProvider; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/IntValueSemantics.java index 4e5330f42a,0d119de7eb..5b784a997b --- 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,10 -21,12 +21,12 @@@ 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.stereotype.Component; + 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.exceptions.recoverable.TextEntryParseException; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/InteractionDtoValueSemantics.java index 07b550ee50,cf40e1fbc2..c20cfb0270 --- 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,10 -18,12 +18,12 @@@ */ 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.stereotype.Component; + 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.InteractionDtoUtils; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LocalResourcePathValueSemantics.java index 480b4ee3b9,0071fbf0ba..9cc4966ed2 --- 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,10 -20,12 +20,12 @@@ 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.stereotype.Component; + 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.value.LocalResourcePath; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LocaleValueSemantics.java index 669693aa44,24f79edfbe..2c0f7dc5c5 --- 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,11 -20,13 +20,13 @@@ 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 2219956860,e61d112e66..186afe5c95 --- 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,10 -21,12 +21,12 @@@ 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.stereotype.Component; + 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.exceptions.recoverable.TextEntryParseException; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/MarkupValueSemantics.java index 98f66417ea,e11208a89e..cae31526c2 --- 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,10 -18,12 +18,12 @@@ */ 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.stereotype.Component; + 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.value.Markup; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/OidDtoValueSemantics.java index ecb2a50d8d,9bdbeb0d76..aaf7bd2e2a --- 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,11 -18,13 +18,13 @@@ */ 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.stereotype.Component; + 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.services.bookmark.Bookmark; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/PasswordValueSemantics.java index 8aca24e08f,236bf63b30..886b437c79 --- 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,10 -18,12 +18,12 @@@ */ 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.stereotype.Component; + 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.services.placeholder.PlaceholderRenderService.PlaceholderLiteral; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ShortValueSemantics.java index 1ecd54018b,4918245b9f..64e08b80ba --- 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,10 -21,12 +21,12 @@@ 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.stereotype.Component; + 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.exceptions.recoverable.TextEntryParseException; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/StringValueSemantics.java index ba12d84258,367ab90ed1..acc56f53e3 --- 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,10 -22,12 +22,12 @@@ 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.stereotype.Component; + 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.services.bookmark.IdStringifier; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/TreeNodeValueSemantics.java index ba97291ba2,aad974dddb..bec6ffcf18 --- 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,11 -20,13 +20,13 @@@ 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.stereotype.Component; + 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.graph.tree.TreeAdapter; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/TreePathValueSemantics.java index 95381da86a,a6c20e3053..ad666d6305 --- 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,11 -18,13 +18,13 @@@ */ 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 5fe9eda063,f5ec8a5dab..52d149bac5 --- 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,10 -20,12 +20,12 @@@ 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.stereotype.Component; + 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.value.semantics.Parser; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/UUIDValueSemantics.java index d85d15bda1,58c9b5247a..a01785247a --- 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,10 -20,12 +20,12 @@@ 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.stereotype.Component; + 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.services.bookmark.IdStringifier; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateTimeValueSemantics.java index f508d1b1f2,67b4c09ea0..28ca07429a --- 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,10 -22,12 +22,12 @@@ 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 5b038789e6,1687e7955d..295b2be9d7 --- 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,10 -22,12 +22,12 @@@ 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 0db86550a2,3dc962980f..4abfc4d2e7 --- 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,10 -22,12 +22,12 @@@ 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 f7d2f551b2,7d943b01bb..0df6c4a11e --- 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,10 -22,12 +22,12 @@@ 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 4db32964a0,b427de24e5..0d7c15e62b --- 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,10 -22,12 +22,12 @@@ 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 807987d451,784da0aa36..1c6c5af7fd --- 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,10 -22,12 +22,12 @@@ 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 79947fbf69,c123197682..b5992e2ddb --- 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,10 -21,12 +21,12 @@@ 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.stereotype.Component; + import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; + import org.springframework.context.annotation.Bean; + import org.springframework.context.annotation.Configuration; 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 60cf4dd1b1,fa3558c3a3..d43dfbd34e --- 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,10 -21,12 +21,12 @@@ 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.stereotype.Component; + import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; + import org.springframework.context.annotation.Bean; + import org.springframework.context.annotation.Configuration; 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 7227c43e0b,636e368475..7033226342 --- 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,10 -21,12 +21,12 @@@ 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.stereotype.Component; + import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; + import org.springframework.context.annotation.Bean; + import org.springframework.context.annotation.Configuration; 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 fb7892f090,cc9c70a789..b889be229d --- 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,10 -22,12 +22,12 @@@ 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.stereotype.Component; + import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; + import org.springframework.context.annotation.Bean; + import org.springframework.context.annotation.Configuration; 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 d7bc37d920,fb13d13876..4dd8a9ba09 --- 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,12 -22,14 +22,14 @@@ 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.stereotype.Component; + 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.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic; diff --cc extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionlog/jdo/dom/ExecutionLogEntryPK.java index d464fd1b83,de9c9223d5..5c9efe9593 --- 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,9 -22,11 +22,11 @@@ import java.io.Serializable import java.util.StringTokenizer; import java.util.UUID; -import javax.annotation.Priority; +import jakarta.annotation.Priority; - import org.springframework.stereotype.Component; + 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.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic; diff --cc extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/dom/ExecutionLogEntryPK.java index b738f22c50,1ad733c6fd..992516bdc8 --- 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,12 -22,14 +22,14 @@@ 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.stereotype.Component; + 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.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic; diff --cc extensions/core/executionoutbox/persistence-jdo/src/main/java/org/apache/causeway/extensions/executionoutbox/jdo/dom/ExecutionOutboxEntryPK.java index fbdac0d738,2da0d6c6c6..156f132c53 --- 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,9 -22,11 +22,11 @@@ import java.io.Serializable import java.util.StringTokenizer; import java.util.UUID; -import javax.annotation.Priority; +import jakarta.annotation.Priority; - import org.springframework.stereotype.Component; + 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.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic; diff --cc extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/dom/ExecutionOutboxEntryPK.java index 81d7f12569,5dc48ff958..8f27817cc1 --- 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,12 -22,14 +22,14 @@@ 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.stereotype.Component; + 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.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic; diff --cc extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/dom/SessionLogEntryPK.java index 0044972dc3,edb2d6ba61..d6a9b12b7d --- 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,12 -23,14 +23,14 @@@ 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.stereotype.Component; + 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.value.semantics.ValueSemanticsBasedOnIdStringifierEntityAgnostic; diff --cc extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java index 44cb1437d3,351100f9cc..da1060ac24 --- 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,10 -27,12 +27,12 @@@ 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 f3bdc59e60,d0aff7b9af..dcc4297ef7 --- 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,11 -18,12 +18,13 @@@ */ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes; -import javax.annotation.Priority; import javax.jdo.identity.ByteIdentity; +import jakarta.annotation.Priority; + - import org.springframework.stereotype.Component; + 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; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoCharIdentityValueSemantics.java index d0dcb58ef6,34e40568d1..5121a7e0fd --- 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,12 -18,13 +18,14 @@@ */ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes; -import javax.annotation.Priority; -import javax.inject.Inject; import javax.jdo.identity.CharIdentity; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; + - import org.springframework.stereotype.Component; + 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.services.bookmark.IdStringifier; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoIntIdentityValueSemantics.java index 7b54910d6e,3c6bea9108..f357a2ae84 --- 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,11 -18,12 +18,13 @@@ */ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes; -import javax.annotation.Priority; import javax.jdo.identity.IntIdentity; +import jakarta.annotation.Priority; + - import org.springframework.stereotype.Component; + 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; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoLongIdentityValueSemantics.java index ef7753b184,5167a77b87..15577ddf4d --- 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,11 -18,12 +18,13 @@@ */ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes; -import javax.annotation.Priority; import javax.jdo.identity.LongIdentity; +import jakarta.annotation.Priority; + - import org.springframework.stereotype.Component; + 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; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoObjectIdentityValueSemantics.java index 2f0915b158,92bd03e577..f3bfb060aa --- 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,11 -20,12 +20,13 @@@ package org.apache.causeway.persistence import java.util.UUID; -import javax.annotation.Priority; import javax.jdo.identity.ObjectIdentity; +import jakarta.annotation.Priority; + - import org.springframework.stereotype.Component; + 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; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoShortIdentityValueSemantics.java index 2d5b392948,28b769bda7..0c36473ce5 --- 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,11 -18,12 +18,13 @@@ */ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes; -import javax.annotation.Priority; import javax.jdo.identity.ShortIdentity; +import jakarta.annotation.Priority; + - import org.springframework.stereotype.Component; + 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; diff --cc persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/valuetypes/JdoStringIdentityValueSemantics.java index cb684ddac6,7f2708a0b1..c970a48232 --- 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,12 -18,13 +18,14 @@@ */ package org.apache.causeway.persistence.jdo.datanucleus.valuetypes; -import javax.annotation.Priority; -import javax.inject.Inject; import javax.jdo.identity.StringIdentity; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; + - import org.springframework.stereotype.Component; + 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.services.bookmark.IdStringifier; diff --cc valuetypes/asciidoc/metamodel/src/main/java/org/apache/causeway/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java index 487b5500f2,2a9ce6bf9d..7dfc7642b4 --- 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,9 -18,11 +18,11 @@@ */ package org.apache.causeway.valuetypes.asciidoc.metamodel.semantics; -import javax.inject.Named; +import jakarta.inject.Named; - import org.springframework.stereotype.Component; + import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; + import org.springframework.context.annotation.Bean; + import org.springframework.context.annotation.Configuration; 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 789f62364e,fa7978959c..90041af61a --- 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,9 -18,11 +18,11 @@@ */ package org.apache.causeway.valuetypes.markdown.metamodel.semantics; -import javax.inject.Named; +import jakarta.inject.Named; - import org.springframework.stereotype.Component; + import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; + import org.springframework.context.annotation.Bean; + import org.springframework.context.annotation.Configuration; 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 ca42e4fee6,c35d672a07..65751f2da1 --- 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,8 -20,11 +20,11 @@@ 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;
