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 cbb908828319a7b9ebc0983a39a457e5f731f173
Merge: e61b067f95 cc09c2ce94
Author: Andi Huber <[email protected]>
AuthorDate: Tue Feb 21 06:21:13 2023 +0100

    Merge remote-tracking branch 'origin/master' into spring6

 .../apache/causeway/core/config/CausewayConfiguration.java | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --cc 
core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
index 46981c8431,0b60c19814..9ac189432a
--- 
a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
+++ 
b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
@@@ -41,20 -41,18 +41,18 @@@ import static java.lang.annotation.Elem
  import static java.lang.annotation.ElementType.PARAMETER;
  import static java.lang.annotation.RetentionPolicy.RUNTIME;
  
 -import javax.activation.DataSource;
 -import javax.inject.Named;
 -import javax.validation.Constraint;
 -import javax.validation.ConstraintValidator;
 -import javax.validation.ConstraintValidatorContext;
 -import javax.validation.Payload;
 -import javax.validation.Valid;
 -import javax.validation.constraints.Max;
 -import javax.validation.constraints.Min;
 -import javax.validation.constraints.NotEmpty;
 -import javax.validation.constraints.NotNull;
 +import jakarta.activation.DataSource;
 +import jakarta.inject.Named;
 +import jakarta.validation.Constraint;
 +import jakarta.validation.ConstraintValidator;
 +import jakarta.validation.ConstraintValidatorContext;
 +import jakarta.validation.Payload;
 +import jakarta.validation.Valid;
 +import jakarta.validation.constraints.Max;
 +import jakarta.validation.constraints.Min;
 +import jakarta.validation.constraints.NotEmpty;
 +import jakarta.validation.constraints.NotNull;
  
- import org.apache.causeway.applib.services.publishing.spi.CommandSubscriber;
- import org.apache.causeway.applib.services.publishing.spi.ExecutionSubscriber;
  import org.springframework.beans.factory.annotation.Autowired;
  import org.springframework.boot.context.properties.ConfigurationProperties;
  import org.springframework.core.env.ConfigurableEnvironment;

Reply via email to