This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/isis.git
commit 18810392330118f55185a0ee76e92f57c52c2273 Author: Andi Huber <[email protected]> AuthorDate: Sun Nov 13 12:18:30 2022 +0100 ISIS-3275: migrate remaining incubators --- .../examples/facets/jsr303/Jsr303PropertyValidationFacet.java | 6 +++--- .../metamodel/examples/facets/jsr303/CustomPattern.java | 2 +- .../examples/facets/jsr303/CustomPatternValidator.java | 2 +- .../facets/jsr303/DomainObjectWithBuiltInValidation.java | 4 ++-- .../src/main/java/demoapp/web/replay/DemoReplayController.java | 4 ++-- .../extensions/commandreplay/primary/config/PrimaryConfig.java | 6 +++--- .../commandreplay/primary/mixins/Object_openOnSecondary.java | 2 +- .../primary/restapi/CommandRetrievalOnPrimaryService.java | 6 +++--- .../commandreplay/primary/spiimpl/CaptureResultOfCommand.java | 4 ++-- .../primary/ui/CommandReplayOnPrimaryService.java | 6 +++--- incubator/extensions/core/commandreplay/secondary/pom.xml | 2 +- .../secondary/CausewayModuleExtCommandReplaySecondary.java | 2 +- .../secondary/analyser/CommandReplayAnalyserException.java | 6 +++--- .../secondary/analyser/CommandReplayAnalyserResult.java | 6 +++--- .../secondary/analysis/CommandReplayAnalysisService.java | 6 +++--- .../commandreplay/secondary/config/SecondaryConfig.java | 6 +++--- .../commandreplay/secondary/fetch/CommandFetcher.java | 10 +++++----- .../commandreplay/secondary/job/ReplicateAndReplayJob.java | 2 +- .../secondary/jobcallables/ReplicateAndRunCommands.java | 2 +- .../secondary/mixins/CommandLogEntry_exclude.java | 2 +- .../secondary/mixins/CommandLogEntry_replayQueue.java | 2 +- .../commandreplay/secondary/mixins/Object_openOnPrimary.java | 2 +- .../secondary/ui/CommandReplayOnSecondaryService.java | 6 +++--- 23 files changed, 48 insertions(+), 48 deletions(-) diff --git a/incubator/core/jsr303/src/main/java/org/apache/causeway/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java b/incubator/core/jsr303/src/main/java/org/apache/causeway/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java index 445aa6f52e..4eb439bc41 100644 --- a/incubator/core/jsr303/src/main/java/org/apache/causeway/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java +++ b/incubator/core/jsr303/src/main/java/org/apache/causeway/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java @@ -21,9 +21,9 @@ package org.apache.causeway.core.metamodel.examples.facets.jsr303; import java.util.Set; -import javax.validation.InvalidConstraint; -import javax.validation.ValidationProviderFactory; -import javax.validation.Validator; +import jakarta.validation.InvalidConstraint; +import jakarta.validation.ValidationProviderFactory; +import jakarta.validation.Validator; import org.apache.causeway.applib.events.ValidityEvent; import org.apache.causeway.core.metamodel.adapter.ObjectAdapter; diff --git a/incubator/core/jsr303/src/test/java/org/apache/causeway/metamodel/examples/facets/jsr303/CustomPattern.java b/incubator/core/jsr303/src/test/java/org/apache/causeway/metamodel/examples/facets/jsr303/CustomPattern.java index 8becaf7f84..ceb26102e3 100644 --- a/incubator/core/jsr303/src/test/java/org/apache/causeway/metamodel/examples/facets/jsr303/CustomPattern.java +++ b/incubator/core/jsr303/src/test/java/org/apache/causeway/metamodel/examples/facets/jsr303/CustomPattern.java @@ -27,7 +27,7 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import javax.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidator; @Documented diff --git a/incubator/core/jsr303/src/test/java/org/apache/causeway/metamodel/examples/facets/jsr303/CustomPatternValidator.java b/incubator/core/jsr303/src/test/java/org/apache/causeway/metamodel/examples/facets/jsr303/CustomPatternValidator.java index 214ab2dce2..c0e22cfad4 100644 --- a/incubator/core/jsr303/src/test/java/org/apache/causeway/metamodel/examples/facets/jsr303/CustomPatternValidator.java +++ b/incubator/core/jsr303/src/test/java/org/apache/causeway/metamodel/examples/facets/jsr303/CustomPatternValidator.java @@ -19,7 +19,7 @@ package org.apache.causeway.core.metamodel.examples.facets.jsr303; -import javax.validation.Constraint; +import jakarta.validation.Constraint; public class CustomPatternValidator implements Constraint<CustomPattern> { diff --git a/incubator/core/jsr303/src/test/java/org/apache/causeway/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java b/incubator/core/jsr303/src/test/java/org/apache/causeway/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java index 93708e71b2..410300caae 100644 --- a/incubator/core/jsr303/src/test/java/org/apache/causeway/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java +++ b/incubator/core/jsr303/src/test/java/org/apache/causeway/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java @@ -19,8 +19,8 @@ package org.apache.causeway.core.metamodel.examples.facets.jsr303; -import javax.validation.Pattern; -import javax.validation.Patterns; +import jakarta.validation.Pattern; +import jakarta.validation.Patterns; public class DomainObjectWithBuiltInValidation { diff --git a/incubator/examples/demo/web/src/main/java/demoapp/web/replay/DemoReplayController.java b/incubator/examples/demo/web/src/main/java/demoapp/web/replay/DemoReplayController.java index 08ae14bb96..f47616e746 100644 --- a/incubator/examples/demo/web/src/main/java/demoapp/web/replay/DemoReplayController.java +++ b/incubator/examples/demo/web/src/main/java/demoapp/web/replay/DemoReplayController.java @@ -18,7 +18,7 @@ */ package demoapp.web.replay; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.context.annotation.Profile; @@ -34,7 +34,7 @@ import org.apache.causeway.extensions.commandreplay.secondary.spi.ReplayCommandE @DomainService( nature = NatureOfService.VIEW ) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @Profile("commandreplay-secondary") public class DemoReplayController implements ReplayCommandExecutionController { diff --git a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/config/PrimaryConfig.java b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/config/PrimaryConfig.java index c0e371812c..4e51c3dfbf 100644 --- a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/config/PrimaryConfig.java +++ b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/config/PrimaryConfig.java @@ -18,8 +18,8 @@ */ package org.apache.causeway.extensions.commandreplay.primary.config; -import javax.inject.Named; -import javax.validation.constraints.NotNull; +import jakarta.inject.Named; +import jakarta.validation.constraints.NotNull; import org.springframework.stereotype.Service; @@ -35,7 +35,7 @@ import lombok.val; */ @Service @Named(CausewayModuleExtCommandReplayPrimary.NAMESPACE + ".PrimaryConfig") [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) //@Log4j2 public class PrimaryConfig { diff --git a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/mixins/Object_openOnSecondary.java b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/mixins/Object_openOnSecondary.java index 6d6da0905e..e1eab12067 100644 --- a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/mixins/Object_openOnSecondary.java +++ b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/mixins/Object_openOnSecondary.java @@ -21,7 +21,7 @@ package org.apache.causeway.extensions.commandreplay.primary.mixins; import java.net.MalformedURLException; import java.net.URL; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; diff --git a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.java b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.java index 3dc054d5cd..b73a139dc8 100644 --- a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.java +++ b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.context.annotation.Profile; @@ -50,7 +50,7 @@ import org.apache.causeway.schema.cmd.v2.CommandDto; nature = NatureOfService.REST ) @Named(CausewayModuleExtCommandReplayPrimary.NAMESPACE + ".CommandRetrievalOnPrimaryService") [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @Profile("commandreplay-primary") public class CommandRetrievalOnPrimaryService { diff --git a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/spiimpl/CaptureResultOfCommand.java b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/spiimpl/CaptureResultOfCommand.java index 69a8b3a9bc..f38253c4e0 100644 --- a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/spiimpl/CaptureResultOfCommand.java +++ b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/spiimpl/CaptureResultOfCommand.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.extensions.commandreplay.primary.spiimpl; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.stereotype.Service; @@ -46,7 +46,7 @@ import lombok.val; @Named(CausewayModuleExtCommandReplayPrimary.NAMESPACE + ".CaptureResultOfCommand") // specify quite a high priority since custom processors will probably want to run after this one // (but can choose to run before if they wish) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) public class CaptureResultOfCommand implements CommandDtoProcessorService { @Override diff --git a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/ui/CommandReplayOnPrimaryService.java b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/ui/CommandReplayOnPrimaryService.java index 2e63dd0fd7..6019fa5998 100644 --- a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/ui/CommandReplayOnPrimaryService.java +++ b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/ui/CommandReplayOnPrimaryService.java @@ -21,8 +21,8 @@ package org.apache.causeway.extensions.commandreplay.primary.ui; import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.context.annotation.Profile; import org.springframework.lang.Nullable; @@ -61,7 +61,7 @@ import lombok.RequiredArgsConstructor; menuBar = DomainServiceLayout.MenuBar.SECONDARY ) @Named(CausewayModuleExtCommandReplayPrimary.NAMESPACE + ".CommandReplayOnPrimaryService") [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @Profile("commandreplay-primary") @RequiredArgsConstructor //@Log4j2 diff --git a/incubator/extensions/core/commandreplay/secondary/pom.xml b/incubator/extensions/core/commandreplay/secondary/pom.xml index 5478f02545..6b22154ee0 100644 --- a/incubator/extensions/core/commandreplay/secondary/pom.xml +++ b/incubator/extensions/core/commandreplay/secondary/pom.xml @@ -83,7 +83,7 @@ <dependency> <groupId>org.glassfish.jersey.ext</groupId> - <artifactId>jersey-spring5</artifactId> + <artifactId>jersey-spring6</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/CausewayModuleExtCommandReplaySecondary.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/CausewayModuleExtCommandReplaySecondary.java index 0b9e19af02..42a080b4e8 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/CausewayModuleExtCommandReplaySecondary.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/CausewayModuleExtCommandReplaySecondary.java @@ -21,7 +21,7 @@ package org.apache.causeway.extensions.commandreplay.secondary; import lombok.val; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.causeway.core.config.CausewayConfiguration; import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime; diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java index 2cee28b78b..42a297ac11 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java @@ -20,8 +20,8 @@ package org.apache.causeway.extensions.commandreplay.secondary.analyser; import java.util.Objects; -import javax.annotation.PostConstruct; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; import org.springframework.stereotype.Service; @@ -42,7 +42,7 @@ import lombok.val; */ @Service @Named(CausewayModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayAnalyserException") [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) @RequiredArgsConstructor public class CommandReplayAnalyserException implements CommandReplayAnalyser { diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java index 81d6ea9b0d..60faf9cf7a 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java @@ -20,8 +20,8 @@ package org.apache.causeway.extensions.commandreplay.secondary.analyser; import java.util.Objects; -import javax.annotation.PostConstruct; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Named; import org.springframework.stereotype.Service; @@ -41,7 +41,7 @@ import lombok.val; */ @Service @Named(CausewayModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayAnalyserResult") [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) @RequiredArgsConstructor public class CommandReplayAnalyserResult implements CommandReplayAnalyser { diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java index df029b8a72..af62ac6b80 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java @@ -20,8 +20,8 @@ package org.apache.causeway.extensions.commandreplay.secondary.analysis; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.stereotype.Service; @@ -38,7 +38,7 @@ import lombok.extern.log4j.Log4j2; */ @Service @Named(CausewayModuleExtCommandReplaySecondary.NAMESPACE + ".CommandReplayAnalysisService") [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) @Log4j2 public class CommandReplayAnalysisService { diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/config/SecondaryConfig.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/config/SecondaryConfig.java index d2bfe2d03d..ada3d285f8 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/config/SecondaryConfig.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/config/SecondaryConfig.java @@ -20,8 +20,8 @@ package org.apache.causeway.extensions.commandreplay.secondary.config; import java.util.List; -import javax.inject.Named; -import javax.validation.constraints.NotNull; +import jakarta.inject.Named; +import jakarta.validation.constraints.NotNull; import org.springframework.stereotype.Service; @@ -36,7 +36,7 @@ import lombok.val; */ @Service @Named("causeway.ext.commandReplaySecondary.SecondaryConfig") [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) //@Log4j2 public class SecondaryConfig { diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher.java index ab022ac5c2..db040d9089 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher.java @@ -21,10 +21,10 @@ package org.apache.causeway.extensions.commandreplay.secondary.fetch; import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.springframework.lang.Nullable; import org.springframework.stereotype.Service; @@ -52,7 +52,7 @@ import lombok.extern.log4j.Log4j2; */ @Service() @Named(CausewayModuleExtCommandLogApplib.NAMESPACE_REPLAY_SECONDARY + ".CommandFetcher") [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) @RequiredArgsConstructor(access = AccessLevel.PACKAGE) // JUnit Support @Log4j2 public class CommandFetcher { diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java index 42c92ed7d3..9dc726bd42 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java @@ -18,7 +18,7 @@ */ package org.apache.causeway.extensions.commandreplay.secondary.job; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.DisallowConcurrentExecution; import org.quartz.Job; diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.java index c33211c5d0..daafcf692a 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.java @@ -24,7 +24,7 @@ import java.util.Optional; import java.util.concurrent.Callable; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.causeway.applib.services.command.CommandExecutorService; import org.apache.causeway.applib.services.xactn.TransactionService; diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/mixins/CommandLogEntry_exclude.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/mixins/CommandLogEntry_exclude.java index 853ad737aa..299efc4fef 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/mixins/CommandLogEntry_exclude.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/mixins/CommandLogEntry_exclude.java @@ -20,7 +20,7 @@ package org.apache.causeway.extensions.commandreplay.secondary.mixins; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/mixins/CommandLogEntry_replayQueue.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/mixins/CommandLogEntry_replayQueue.java index 1ed15c94f2..7155c0bad4 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/mixins/CommandLogEntry_replayQueue.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/mixins/CommandLogEntry_replayQueue.java @@ -20,7 +20,7 @@ package org.apache.causeway.extensions.commandreplay.secondary.mixins; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.causeway.applib.annotation.Collection; import org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry; diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/mixins/Object_openOnPrimary.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/mixins/Object_openOnPrimary.java index 7ee1308680..56b09c8a5d 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/mixins/Object_openOnPrimary.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/mixins/Object_openOnPrimary.java @@ -21,7 +21,7 @@ package org.apache.causeway.extensions.commandreplay.secondary.mixins; import java.net.MalformedURLException; import java.net.URL; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java index 8fed2d09fa..ce4922426c 100644 --- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java +++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java @@ -21,8 +21,8 @@ package org.apache.causeway.extensions.commandreplay.secondary.ui; import java.util.Collections; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; @@ -54,7 +54,7 @@ import lombok.val; named = "Activity", menuBar = DomainServiceLayout.MenuBar.SECONDARY ) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor //@Log4j2 public class CommandReplayOnSecondaryService {
