You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/03/16 07:28:46 UTC
[causeway] branch spring6 updated (167f96b203 -> 1627b87778)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
from 167f96b203 Merge remote-tracking branch 'origin/master' into spring6
add 7aad3e0ec5 CAUSEWAY-3377: updates tagger, rationalizes some framework logical type names
add 307ccb015c CAUSEWAY-3377: fixes unit test
add 1efa0e17dc CAUSEWAY-3377: reverts accidental edit
add 126975f961 Merge pull request #1487 from apache/CAUSEWAY-3377
add 33be93e597 CAUSEWAY-3253: updates .yml for nightly build before re-enable
add b006fd13a6 CAUSEWAY-3253: changes from nightly to weekly build
new 1627b87778 Merge remote-tracking branch 'origin/master' into spring6
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../workflows/ci-build-artifacts-push-maven.yml | 6 +--
.github/workflows/ci-build-site-no-push.yml | 2 +-
.../causeway/applib/CausewayModuleApplib.java | 1 +
.../services/metamodel/MetaModelServiceMenu.java | 20 +++----
.../causeway/applib/value/LocalResourcePath.java | 4 +-
.../causeway/schema/CausewayModuleSchema.java | 1 +
.../interaction/CausewayModuleCoreInteraction.java | 1 +
...teractionAwareTransactionalBoundaryHandler.java | 5 +-
.../metamodel/CausewayModuleCoreMetamodel.java | 1 +
.../core/metamodel/inspect/model/ActionNode.java | 2 +-
.../metamodel/inspect/model/CollectionNode.java | 2 +-
.../metamodel/inspect/model/FacetAttrNode.java | 2 +-
.../core/metamodel/inspect/model/FacetNode.java | 2 +-
.../metamodel/services/ServiceInjectorDefault.java | 4 +-
.../ApplicationFeatureIdValueSemantics.java | 2 +-
.../valuesemantics/BigDecimalValueSemantics.java | 2 +-
.../valuesemantics/BigIntegerValueSemantics.java | 2 +-
.../valuesemantics/BlobValueSemantics.java | 2 +-
.../valuesemantics/BookmarkValueSemantics.java | 2 +-
.../valuesemantics/BooleanValueSemantics.java | 2 +-
.../BufferedImageValueSemantics.java | 2 +-
.../valuesemantics/ByteValueSemantics.java | 2 +-
.../valuesemantics/ChangesDtoValueSemantics.java | 2 +-
.../valuesemantics/CharacterValueSemantics.java | 2 +-
.../valuesemantics/ClobValueSemantics.java | 2 +-
.../valuesemantics/CommandDtoValueSemantics.java | 2 +-
.../valuesemantics/DoubleValueSemantics.java | 2 +-
.../valuesemantics/FloatValueSemantics.java | 2 +-
.../IdStringifierForSerializable.java | 2 +-
.../valuesemantics/IntValueSemantics.java | 2 +-
.../InteractionDtoValueSemantics.java | 2 +-
.../LocalResourcePathValueSemantics.java | 2 +-
.../valuesemantics/LocaleValueSemantics.java | 2 +-
.../valuesemantics/LongValueSemantics.java | 2 +-
.../valuesemantics/MarkupValueSemantics.java | 2 +-
.../valuesemantics/OidDtoValueSemantics.java | 6 ++-
.../valuesemantics/PasswordValueSemantics.java | 2 +-
.../valuesemantics/ShortValueSemantics.java | 2 +-
.../valuesemantics/StringValueSemantics.java | 2 +-
.../valuesemantics/TreeNodeValueSemantics.java | 2 +-
.../valuesemantics/URLValueSemantics.java | 2 +-
.../valuesemantics/UUIDValueSemantics.java | 2 +-
.../temporal/LocalDateTimeValueSemantics.java | 2 +-
.../temporal/LocalDateValueSemantics.java | 2 +-
.../temporal/LocalTimeValueSemantics.java | 2 +-
.../temporal/OffsetDateTimeValueSemantics.java | 2 +-
.../temporal/OffsetTimeValueSemantics.java | 2 +-
.../temporal/ZonedDateTimeValueSemantics.java | 2 +-
.../temporal/legacy/JavaSqlDateValueSemantics.java | 2 +-
.../legacy/JavaSqlTimeStampValueSemantics.java | 2 +-
.../temporal/legacy/JavaSqlTimeValueSemantics.java | 2 +-
.../legacy/JavaUtilDateValueSemantics.java | 2 +-
.../runtimeservices/spring/SpringBeansService.java | 3 +-
.../runtimeservices/xml/XmlServiceDefault.java | 5 +-
.../manager/AuthenticationManager.java | 5 +-
.../standard/RandomCodeGeneratorDefault.java | 5 +-
.../manager/AuthorizationManager.java | 5 +-
.../transaction/CausewayModuleCoreTransaction.java | 1 +
.../changetracking/events/TimestampService.java | 5 +-
.../CausewayConfigurationRoleAndPermissions.java | 4 +-
...werRestfulObjectsSwaggerRoleAndPermissions.java | 2 +-
.../dom/ApplicationUserRepositoryAbstract.java | 2 +-
.../dom/mixins/ApplicationUser_updatePassword.java | 2 +-
.../realm/CausewayModuleExtSecmanShiroRealm.java | 2 +-
.../services/PasswordEncoderUsingJBcrypt.java | 2 +-
.../CausewayModuleExtSecmanEncryptionSpring.java | 2 +-
.../authenticator/AuthenticatorSecman.java | 2 +-
.../AuthenticatorSecmanAutoConfiguration.java | 5 +-
.../spiimpl/ImpersonateMenuAdvisorForSecman.java | 3 +-
.../userreg/UserRegistrationServiceForSecman.java | 2 +-
.../sse/wicket/CausewayModuleExtSseWicket.java | 2 +
.../sse/wicket/services/SseServiceDefault.java | 35 +++++-------
.../webmodule/WebModuleServerSentEvents.java | 5 +-
.../bypass/CausewayModuleSecurityBypass.java | 2 +
.../bypass/authentication/AuthenticatorBypass.java | 5 +-
.../bypass/authorization/AuthorizorBypass.java | 5 +-
.../spring/CausewayModuleSecuritySpring.java | 2 +
.../spring/authentication/AuthenticatorSpring.java | 5 +-
.../spring/webmodule/WebModuleSpringSecurity.java | 9 ++--
.../fakedata/applib/services/FakeDataService.java | 2 +-
.../CausewayModuleValJodatimeIntegration.java | 3 ++
.../valuesemantics/JodaDateTimeValueSemantics.java | 5 +-
.../JodaLocalDateTimeValueSemantics.java | 5 +-
.../JodaLocalDateValueSemantics.java | 5 +-
.../JodaLocalTimeValueSemantics.java | 5 +-
.../service/swagger/internal/TaggerDefault.java | 62 +++++++++++++++++-----
.../swagger/internal/_OpenApiModelFactory.java | 2 +-
.../service/swagger/internal/TaggerTest.java | 4 +-
88 files changed, 226 insertions(+), 127 deletions(-)
[causeway] 01/01: Merge remote-tracking branch 'origin/master' into spring6
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 1627b87778a5527c119d8feb6c8ceece6fe1913a
Merge: 167f96b203 b006fd13a6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 16 08:28:40 2023 +0100
Merge remote-tracking branch 'origin/master' into spring6
.../workflows/ci-build-artifacts-push-maven.yml | 6 +--
.github/workflows/ci-build-site-no-push.yml | 2 +-
.../causeway/applib/CausewayModuleApplib.java | 1 +
.../services/metamodel/MetaModelServiceMenu.java | 20 +++----
.../causeway/applib/value/LocalResourcePath.java | 4 +-
.../causeway/schema/CausewayModuleSchema.java | 1 +
.../interaction/CausewayModuleCoreInteraction.java | 1 +
...teractionAwareTransactionalBoundaryHandler.java | 5 +-
.../metamodel/CausewayModuleCoreMetamodel.java | 1 +
.../core/metamodel/inspect/model/ActionNode.java | 2 +-
.../metamodel/inspect/model/CollectionNode.java | 2 +-
.../metamodel/inspect/model/FacetAttrNode.java | 2 +-
.../core/metamodel/inspect/model/FacetNode.java | 2 +-
.../metamodel/services/ServiceInjectorDefault.java | 4 +-
.../ApplicationFeatureIdValueSemantics.java | 2 +-
.../valuesemantics/BigDecimalValueSemantics.java | 2 +-
.../valuesemantics/BigIntegerValueSemantics.java | 2 +-
.../valuesemantics/BlobValueSemantics.java | 2 +-
.../valuesemantics/BookmarkValueSemantics.java | 2 +-
.../valuesemantics/BooleanValueSemantics.java | 2 +-
.../BufferedImageValueSemantics.java | 2 +-
.../valuesemantics/ByteValueSemantics.java | 2 +-
.../valuesemantics/ChangesDtoValueSemantics.java | 2 +-
.../valuesemantics/CharacterValueSemantics.java | 2 +-
.../valuesemantics/ClobValueSemantics.java | 2 +-
.../valuesemantics/CommandDtoValueSemantics.java | 2 +-
.../valuesemantics/DoubleValueSemantics.java | 2 +-
.../valuesemantics/FloatValueSemantics.java | 2 +-
.../IdStringifierForSerializable.java | 2 +-
.../valuesemantics/IntValueSemantics.java | 2 +-
.../InteractionDtoValueSemantics.java | 2 +-
.../LocalResourcePathValueSemantics.java | 2 +-
.../valuesemantics/LocaleValueSemantics.java | 2 +-
.../valuesemantics/LongValueSemantics.java | 2 +-
.../valuesemantics/MarkupValueSemantics.java | 2 +-
.../valuesemantics/OidDtoValueSemantics.java | 6 ++-
.../valuesemantics/PasswordValueSemantics.java | 2 +-
.../valuesemantics/ShortValueSemantics.java | 2 +-
.../valuesemantics/StringValueSemantics.java | 2 +-
.../valuesemantics/TreeNodeValueSemantics.java | 2 +-
.../valuesemantics/URLValueSemantics.java | 2 +-
.../valuesemantics/UUIDValueSemantics.java | 2 +-
.../temporal/LocalDateTimeValueSemantics.java | 2 +-
.../temporal/LocalDateValueSemantics.java | 2 +-
.../temporal/LocalTimeValueSemantics.java | 2 +-
.../temporal/OffsetDateTimeValueSemantics.java | 2 +-
.../temporal/OffsetTimeValueSemantics.java | 2 +-
.../temporal/ZonedDateTimeValueSemantics.java | 2 +-
.../temporal/legacy/JavaSqlDateValueSemantics.java | 2 +-
.../legacy/JavaSqlTimeStampValueSemantics.java | 2 +-
.../temporal/legacy/JavaSqlTimeValueSemantics.java | 2 +-
.../legacy/JavaUtilDateValueSemantics.java | 2 +-
.../runtimeservices/spring/SpringBeansService.java | 3 +-
.../runtimeservices/xml/XmlServiceDefault.java | 5 +-
.../manager/AuthenticationManager.java | 5 +-
.../standard/RandomCodeGeneratorDefault.java | 5 +-
.../manager/AuthorizationManager.java | 5 +-
.../transaction/CausewayModuleCoreTransaction.java | 1 +
.../changetracking/events/TimestampService.java | 5 +-
.../CausewayConfigurationRoleAndPermissions.java | 4 +-
...werRestfulObjectsSwaggerRoleAndPermissions.java | 2 +-
.../dom/ApplicationUserRepositoryAbstract.java | 2 +-
.../dom/mixins/ApplicationUser_updatePassword.java | 2 +-
.../realm/CausewayModuleExtSecmanShiroRealm.java | 2 +-
.../services/PasswordEncoderUsingJBcrypt.java | 2 +-
.../CausewayModuleExtSecmanEncryptionSpring.java | 2 +-
.../authenticator/AuthenticatorSecman.java | 2 +-
.../AuthenticatorSecmanAutoConfiguration.java | 5 +-
.../spiimpl/ImpersonateMenuAdvisorForSecman.java | 3 +-
.../userreg/UserRegistrationServiceForSecman.java | 2 +-
.../sse/wicket/CausewayModuleExtSseWicket.java | 2 +
.../sse/wicket/services/SseServiceDefault.java | 35 +++++-------
.../webmodule/WebModuleServerSentEvents.java | 5 +-
.../bypass/CausewayModuleSecurityBypass.java | 2 +
.../bypass/authentication/AuthenticatorBypass.java | 5 +-
.../bypass/authorization/AuthorizorBypass.java | 5 +-
.../spring/CausewayModuleSecuritySpring.java | 2 +
.../spring/authentication/AuthenticatorSpring.java | 5 +-
.../spring/webmodule/WebModuleSpringSecurity.java | 9 ++--
.../fakedata/applib/services/FakeDataService.java | 2 +-
.../CausewayModuleValJodatimeIntegration.java | 3 ++
.../valuesemantics/JodaDateTimeValueSemantics.java | 5 +-
.../JodaLocalDateTimeValueSemantics.java | 5 +-
.../JodaLocalDateValueSemantics.java | 5 +-
.../JodaLocalTimeValueSemantics.java | 5 +-
.../service/swagger/internal/TaggerDefault.java | 62 +++++++++++++++++-----
.../swagger/internal/_OpenApiModelFactory.java | 2 +-
.../service/swagger/internal/TaggerTest.java | 4 +-
88 files changed, 226 insertions(+), 127 deletions(-)
diff --cc core/interaction/src/main/java/org/apache/causeway/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
index d9e925d9a6,d5164556c8..cbf39120b5
--- a/core/interaction/src/main/java/org/apache/causeway/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
+++ b/core/interaction/src/main/java/org/apache/causeway/core/interaction/integration/InteractionAwareTransactionalBoundaryHandler.java
@@@ -22,10 -22,11 +22,11 @@@ import java.util.List
import java.util.Optional;
import java.util.function.Consumer;
-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.apache.causeway.core.interaction.CausewayModuleCoreInteraction;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.transaction.PlatformTransactionManager;
diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/OidDtoValueSemantics.java
index 76f6780ce3,f6e63ba8e5..f455a9c6b3
--- 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,10 -18,12 +18,12 @@@
*/
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.apache.causeway.applib.CausewayModuleApplib;
+ import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
diff --cc core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/spring/SpringBeansService.java
index 20b18133f6,5c2a27268a..0477809013
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/spring/SpringBeansService.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/spring/SpringBeansService.java
@@@ -30,6 -31,6 +30,7 @@@ import org.springframework.context.Conf
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
++import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import lombok.experimental.UtilityClass;
@@@ -39,8 -40,8 +40,8 @@@
* @since 2.0 {@index}
*/
@Service
- @Named("causeway.sub.spring.SpringBeansService")
+ @Named(CausewayModuleCoreRuntimeServices.NAMESPACE + ".SpringBeansService")
-@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
+@jakarta.annotation.Priority(PriorityPrecedence.MIDPOINT)
@Qualifier("Default")
public class SpringBeansService {
diff --cc core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java
index e438d057c0,f18fa9889a..27c69e6479
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java
@@@ -22,10 -22,11 +22,11 @@@ import java.util.List
import java.util.Map;
import java.util.Optional;
-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.apache.causeway.core.security.CausewayModuleCoreSecurity;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
diff --cc core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/RandomCodeGeneratorDefault.java
index d7df2a75b7,cfe45dfcda..8c6b04681a
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/RandomCodeGeneratorDefault.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/RandomCodeGeneratorDefault.java
@@@ -20,9 -20,10 +20,10 @@@ package org.apache.causeway.core.securi
import java.security.SecureRandom;
-import javax.annotation.Priority;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
+ import org.apache.causeway.core.security.CausewayModuleCoreSecurity;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
diff --cc core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java
index 514aacd418,9978327339..3c8eae636b
--- a/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java
@@@ -21,10 -21,11 +21,11 @@@ package org.apache.causeway.core.securi
import java.util.List;
import java.util.Optional;
-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.apache.causeway.core.security.CausewayModuleCoreSecurity;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
diff --cc core/transaction/src/main/java/org/apache/causeway/core/transaction/changetracking/events/TimestampService.java
index ba86346078,cfb300364f..ca719342fe
--- a/core/transaction/src/main/java/org/apache/causeway/core/transaction/changetracking/events/TimestampService.java
+++ b/core/transaction/src/main/java/org/apache/causeway/core/transaction/changetracking/events/TimestampService.java
@@@ -18,10 -18,11 +18,11 @@@
*/
package org.apache.causeway.core.transaction.changetracking.events;
-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.apache.causeway.core.transaction.CausewayModuleCoreTransaction;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
diff --cc extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/causeway/extensions/secman/encryption/jbcrypt/services/PasswordEncoderUsingJBcrypt.java
index 6989ea5f70,d0c25516ab..e1292fa325
--- a/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/causeway/extensions/secman/encryption/jbcrypt/services/PasswordEncoderUsingJBcrypt.java
+++ b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/causeway/extensions/secman/encryption/jbcrypt/services/PasswordEncoderUsingJBcrypt.java
@@@ -33,8 -33,8 +33,8 @@@ import org.apache.causeway.extensions.s
*/
@Service
@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".PasswordEncoderUsingJBcrypt")
-@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
+@jakarta.annotation.Priority(PriorityPrecedence.MIDPOINT)
- @Qualifier("secman")
+ @Qualifier("Secman")
public class PasswordEncoderUsingJBcrypt
implements PasswordEncoder {
diff --cc extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/spiimpl/ImpersonateMenuAdvisorForSecman.java
index 8b2d376f00,4b5be54b5d..5dc8364c07
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/spiimpl/ImpersonateMenuAdvisorForSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/spiimpl/ImpersonateMenuAdvisorForSecman.java
@@@ -49,8 -49,8 +49,9 @@@ import lombok.val
@Service
@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".ImpersonateMenuAdvisorForSecman")
-@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
+@jakarta.annotation.Priority(PriorityPrecedence.MIDPOINT)
- @Qualifier("SecMan")
+ @Qualifier("Secman")
++
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class ImpersonateMenuAdvisorForSecman implements ImpersonateMenuAdvisor {
diff --cc extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
index bef184e55b,98ca54f720..93fbc98970
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/userreg/UserRegistrationServiceForSecman.java
@@@ -50,8 -50,8 +50,8 @@@ import lombok.val
*/
@Service
@Named(CausewayModuleExtSecmanApplib.NAMESPACE + ".UserRegistrationServiceForSecman")
-@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
+@jakarta.annotation.Priority(PriorityPrecedence.MIDPOINT)
- @Qualifier("SecMan")
+ @Qualifier("Secman")
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class UserRegistrationServiceForSecman implements UserRegistrationService {
diff --cc extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/services/SseServiceDefault.java
index 1fbdc22e07,efdf99c635..ea1edbfeb5
--- a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/services/SseServiceDefault.java
+++ b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/services/SseServiceDefault.java
@@@ -18,26 -18,20 +18,20 @@@
*/
package org.apache.causeway.extensions.sse.wicket.services;
- import java.util.List;
- import java.util.Map;
- import java.util.Objects;
- import java.util.Optional;
- import java.util.Queue;
- import java.util.UUID;
- import java.util.concurrent.CompletableFuture;
- import java.util.concurrent.ConcurrentHashMap;
- import java.util.concurrent.ConcurrentLinkedQueue;
- import java.util.concurrent.CountDownLatch;
- import java.util.concurrent.ForkJoinPool;
+ import lombok.Getter;
+ import lombok.RequiredArgsConstructor;
+ import lombok.Value;
+ import lombok.extern.log4j.Log4j2;
+ import lombok.val;
+
+ import java.util.*;
+ import java.util.concurrent.*;
import java.util.function.Predicate;
-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.beans.factory.annotation.Qualifier;
- import org.springframework.stereotype.Service;
-
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.xactn.TransactionService;
diff --cc extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java
index 5a017bc19b,f7a20c9a8e..680dc5ead0
--- a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java
+++ b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java
@@@ -18,12 -18,13 +18,13 @@@
*/
package org.apache.causeway.extensions.sse.wicket.webmodule;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletException;
+ import org.apache.causeway.extensions.sse.wicket.CausewayModuleExtSseWicket;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@@ -40,11 -41,13 +41,13 @@@ import lombok.Getter
* @since 2.0 {@index}
*/
@Service
- @Named("causeway.val.WebModuleServerSentEvents")
+ @Named(WebModuleServerSentEvents.LOGICAL_TYPE_NAME)
@Qualifier("ServerSentEvents")
-@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
+@jakarta.annotation.Priority(PriorityPrecedence.MIDPOINT)
public final class WebModuleServerSentEvents extends WebModuleAbstract {
+ public static final String LOGICAL_TYPE_NAME = CausewayModuleExtSseWicket.NAMESPACE + ".WebModuleServerSentEvents";
+
private static final String SERVLET_NAME = "ServerSentEventsServlet";
@Getter
diff --cc security/bypass/src/main/java/org/apache/causeway/security/bypass/authentication/AuthenticatorBypass.java
index e8256f3b8e,1c800b61ed..85e30405d8
--- a/security/bypass/src/main/java/org/apache/causeway/security/bypass/authentication/AuthenticatorBypass.java
+++ b/security/bypass/src/main/java/org/apache/causeway/security/bypass/authentication/AuthenticatorBypass.java
@@@ -26,6 -27,6 +26,7 @@@ import org.springframework.stereotype.S
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.core.security.authentication.AuthenticationRequest;
import org.apache.causeway.core.security.authentication.standard.AuthenticatorAbstract;
++import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
/**
* Implementation that bypasses authentication.
@@@ -33,8 -34,8 +34,8 @@@
* @since 1.x {@index}
*/
@Service
- @Named("causeway.security.AuthenticatorBypass")
+ @Named(AuthenticatorBypass.LOGICAL_TYPE_NAME)
-@javax.annotation.Priority(PriorityPrecedence.LATE)
+@jakarta.annotation.Priority(PriorityPrecedence.LATE)
@Qualifier("Bypass")
public class AuthenticatorBypass extends AuthenticatorAbstract {
diff --cc security/bypass/src/main/java/org/apache/causeway/security/bypass/authorization/AuthorizorBypass.java
index 712ae37c96,23b1a51d15..24bdf7e3f3
--- a/security/bypass/src/main/java/org/apache/causeway/security/bypass/authorization/AuthorizorBypass.java
+++ b/security/bypass/src/main/java/org/apache/causeway/security/bypass/authorization/AuthorizorBypass.java
@@@ -27,13 -28,13 +27,14 @@@ import org.apache.causeway.applib.Ident
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.core.security.authorization.Authorizor;
++import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
/**
* @since 1.x {@index}
*/
@Service
- @Named("causeway.security.AuthorizorBypass")
+ @Named(AuthorizorBypass.LOGICAL_TYPE_NAME)
-@javax.annotation.Priority(PriorityPrecedence.LATE)
+@jakarta.annotation.Priority(PriorityPrecedence.LATE)
@Qualifier("Bypass")
public class AuthorizorBypass implements Authorizor {
diff --cc security/spring/src/main/java/org/apache/causeway/security/spring/authentication/AuthenticatorSpring.java
index 267b4f5468,fd2ab1fb1a..514da454a3
--- a/security/spring/src/main/java/org/apache/causeway/security/spring/authentication/AuthenticatorSpring.java
+++ b/security/spring/src/main/java/org/apache/causeway/security/spring/authentication/AuthenticatorSpring.java
@@@ -29,13 -30,13 +29,14 @@@ import org.apache.causeway.applib.servi
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.core.security.authentication.AuthenticationRequest;
import org.apache.causeway.core.security.authentication.Authenticator;
++import org.apache.causeway.security.spring.CausewayModuleSecuritySpring;
/**
* @since 2.0 {@index}
*/
@Service
- @Named("causeway.security.AuthenticatorSpring")
+ @Named(AuthenticatorSpring.LOGICAL_TYPE_NAME)
-@javax.annotation.Priority(PriorityPrecedence.EARLY)
+@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
@Qualifier("Spring")
public class AuthenticatorSpring implements Authenticator {
diff --cc security/spring/src/main/java/org/apache/causeway/security/spring/webmodule/WebModuleSpringSecurity.java
index dfedddc91f,837204078b..7174736809
--- a/security/spring/src/main/java/org/apache/causeway/security/spring/webmodule/WebModuleSpringSecurity.java
+++ b/security/spring/src/main/java/org/apache/causeway/security/spring/webmodule/WebModuleSpringSecurity.java
@@@ -31,6 -32,6 +31,7 @@@ import org.apache.causeway.applib.annot
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.core.webapp.modules.WebModuleAbstract;
++import org.apache.causeway.security.spring.CausewayModuleSecuritySpring;
import lombok.Getter;
@@@ -40,8 -41,8 +41,8 @@@
* @since 2.0 {@index}
*/
@Service
- @Named("causeway.security.WebModuleSpringSecurity")
+ @Named(WebModuleSpringSecurity.LOGICAL_TYPE_NAME)
-@javax.annotation.Priority(PriorityPrecedence.FIRST + 100)
+@jakarta.annotation.Priority(PriorityPrecedence.FIRST + 100)
@Qualifier("Spring")
public final class WebModuleSpringSecurity extends WebModuleAbstract {
@@@ -49,12 -52,12 +52,12 @@@
private final String name = "Spring Security Integration";
@Inject
-- public WebModuleSpringSecurity(ServiceInjector serviceInjector) {
++ public WebModuleSpringSecurity(final ServiceInjector serviceInjector) {
super(serviceInjector);
}
@Override
-- public Can<ServletContextListener> init(ServletContext ctx) throws ServletException {
++ public Can<ServletContextListener> init(final ServletContext ctx) throws ServletException {
registerFilter(ctx, "SpringSecurityFilter", SpringSecurityFilter.class)
.ifPresent(filterReg -> {
diff --cc valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaDateTimeValueSemantics.java
index 71391a4094,0d758034d1..c519a7aec6
--- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaDateTimeValueSemantics.java
+++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaDateTimeValueSemantics.java
@@@ -20,9 -20,10 +20,10 @@@ package org.apache.causeway.valuetypes.
import java.time.ZonedDateTime;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+ import org.apache.causeway.valuetypes.jodatime.integration.CausewayModuleValJodatimeIntegration;
import org.joda.time.DateTime;
import org.springframework.stereotype.Component;
diff --cc valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateTimeValueSemantics.java
index b4bbdf612e,b286152982..0ba53bcb0e
--- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateTimeValueSemantics.java
+++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateTimeValueSemantics.java
@@@ -18,9 -18,10 +18,10 @@@
*/
package org.apache.causeway.valuetypes.jodatime.integration.valuesemantics;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+ import org.apache.causeway.valuetypes.jodatime.integration.CausewayModuleValJodatimeIntegration;
import org.joda.time.LocalDateTime;
import org.springframework.stereotype.Component;
diff --cc valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateValueSemantics.java
index a0cd3d7cb1,8c04aa5ba0..d163075e76
--- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateValueSemantics.java
+++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalDateValueSemantics.java
@@@ -18,9 -18,10 +18,10 @@@
*/
package org.apache.causeway.valuetypes.jodatime.integration.valuesemantics;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+ import org.apache.causeway.valuetypes.jodatime.integration.CausewayModuleValJodatimeIntegration;
import org.joda.time.LocalDate;
import org.springframework.stereotype.Component;
diff --cc valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalTimeValueSemantics.java
index 684fc4fab0,efa2df2de8..7b84e1dbab
--- a/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalTimeValueSemantics.java
+++ b/valuetypes/jodatime/integration/src/main/java/org/apache/causeway/valuetypes/jodatime/integration/valuesemantics/JodaLocalTimeValueSemantics.java
@@@ -18,9 -18,10 +18,10 @@@
*/
package org.apache.causeway.valuetypes.jodatime.integration.valuesemantics;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+ import org.apache.causeway.valuetypes.jodatime.integration.CausewayModuleValJodatimeIntegration;
import org.joda.time.LocalTime;
import org.springframework.stereotype.Component;
diff --cc viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
index 2c1b5bcb92,93799a305b..f54de23b9a
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
@@@ -23,8 -23,14 +23,14 @@@ import java.util.regex.Pattern
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.inject.Named;
+import jakarta.inject.Named;
+ import org.apache.causeway.applib.CausewayModuleApplib;
+ import org.apache.causeway.core.config.CausewayModuleCoreConfig;
+ import org.apache.causeway.core.metamodel.CausewayModuleCoreMetamodel;
+ import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
+ import org.apache.causeway.schema.CausewayModuleSchema;
+ import org.apache.causeway.viewer.restfulobjects.rendering.CausewayModuleRestfulObjectsRendering;
import org.springframework.stereotype.Component;
import org.apache.causeway.applib.annotation.Programmatic;