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 af0efb733a16a5e606215ce7119c75489a2e6e6d Merge: 1c6de6c406 f8dd79967c Author: Andi Huber <[email protected]> AuthorDate: Mon Dec 12 04:07:48 2022 +0100 ISIS-3303: Merge remote-tracking branch 'origin/master' into spring6 .../causeway/applib/services/user/RoleMemento.java | 15 ++++-- .../causeway/applib/services/user/UserMemento.java | 31 +++++++++-- .../causeway/applib/services/user/UserService.java | 4 +- .../services/user/RoleMemento_value_Test.java | 28 ++++++++++ .../services/user/UserMemento_contains_Test.java | 41 ++++++++++++++ .../services/user/UserMemento_value_Test.java | 63 ++++++++++++++++++++++ build.sh | 9 +++- .../contract/ValueTypeContractTestAbstract.java | 40 +++++++------- .../facets/TenantedAuthorizationFacetDefault.java | 51 ++++++++---------- regressiontests/pom.xml | 10 +++- regressiontests/stable-bootstrapping/pom.xml | 7 ++- .../stable-cmdexecauditsess/generic/pom.xml | 17 +++--- .../persistence-jdo/pom.xml | 11 ++-- .../persistence-jpa/pom.xml | 9 ++-- regressiontests/stable-cmdexecauditsess/pom.xml | 13 ++++- regressiontests/stable-config/pom.xml | 5 +- regressiontests/stable-core-wrapperfactory/pom.xml | 9 ++-- regressiontests/stable-cucumber/pom.xml | 31 ++++++----- regressiontests/stable-domainmodel/pom.xml | 5 +- regressiontests/stable-eventhandling/pom.xml | 5 +- regressiontests/stable-factory/pom.xml | 5 +- regressiontests/stable-interact/pom.xml | 5 +- .../testdomain/interact/CustomContextTest.java | 3 +- ...> CustomContextWithNoPermissionChecksTest.java} | 50 ++++++----------- regressiontests/stable-layouts/pom.xml | 3 ++ regressiontests/stable-persistence-jdo/pom.xml | 23 ++++---- regressiontests/stable-persistence-jpa/pom.xml | 27 +++++----- regressiontests/stable-publishing-jpa/pom.xml | 23 ++++---- regressiontests/stable-rest/pom.xml | 7 ++- regressiontests/stable-value/pom.xml | 5 +- regressiontests/stable-viewers-common/pom.xml | 23 ++++---- regressiontests/stable-viewers-jdo/pom.xml | 25 +++++---- regressiontests/stable-viewers-jpa/pom.xml | 25 +++++---- regressiontests/stable/pom.xml | 29 +++++----- 34 files changed, 436 insertions(+), 221 deletions(-) diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java index 23b8385991,4e18f09dfa..e4122b51c2 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java @@@ -20,6 -20,8 +20,8 @@@ package org.apache.causeway.applib.serv import java.io.Serializable; -import javax.inject.Named; ++import jakarta.inject.Named; + import org.springframework.context.event.EventListener; import org.springframework.core.annotation.Order; @@@ -30,11 -32,7 +32,10 @@@ import org.apache.causeway.applib.annot import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.annotation.PropertyLayout; - import jakarta.inject.Named; -import lombok.*; +import lombok.Getter; +import lombok.NonNull; +import lombok.Value; +import lombok.val; /** * Immutable serializable value held by {@link UserMemento}. diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java index 11edcaa6c4,76b4cdca6d..9c9e0472f6 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java @@@ -24,9 -24,11 +24,10 @@@ import java.io.Serializable import java.net.URL; import java.util.List; import java.util.Locale; - import java.util.Objects; import java.util.stream.Stream; -import javax.inject.Named; ++import jakarta.inject.Named; + -import org.apache.causeway.applib.services.sudo.SudoService; import org.springframework.context.event.EventListener; import org.springframework.core.annotation.Order; import org.springframework.lang.Nullable; @@@ -48,12 -50,7 +49,11 @@@ import org.apache.causeway.applib.servi import org.apache.causeway.commons.collections.Can; import org.apache.causeway.commons.internal.base._Strings; - import jakarta.inject.Named; -import lombok.*; +import lombok.Builder; +import lombok.Getter; +import lombok.NonNull; +import lombok.With; +import lombok.val; /** * Immutable serializable value holding details about a user and its roles. diff --cc extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/facets/TenantedAuthorizationFacetDefault.java index 58812c326f,fd3ebf15f6..e857315335 --- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/facets/TenantedAuthorizationFacetDefault.java +++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/facets/TenantedAuthorizationFacetDefault.java @@@ -18,9 -18,11 +18,11 @@@ */ package org.apache.causeway.extensions.secman.integration.facets; + import lombok.val; + import java.util.List; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.apache.causeway.applib.services.queryresultscache.QueryResultsCache; import org.apache.causeway.applib.services.user.UserService; diff --cc regressiontests/pom.xml index d61623030c,13aa3bfab1..65193a79df --- a/regressiontests/pom.xml +++ b/regressiontests/pom.xml @@@ -34,10 -34,15 +34,18 @@@ <properties> <skip.regressionTests>false</skip.regressionTests> <skipTests>${skip.regressionTests}</skipTests> + + <maven.install.skip>true</maven.install.skip> + <maven.deploy.skip>true</maven.deploy.skip> + + <jar-plugin.automaticModuleName>org.apache.causeway.regressiontests</jar-plugin.automaticModuleName> + <git-plugin.propertiesDir>org/apache/causeway/regressiontests</git-plugin.propertiesDir> ++ + <!-- override surefire defaults from bom, as this is not a Java module yet --> + <surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine> </properties> + <build> <resources> <resource> diff --cc regressiontests/stable-cmdexecauditsess/generic/pom.xml index 9318133cb4,b63d0fcda0..a3168b39ab --- a/regressiontests/stable-cmdexecauditsess/generic/pom.xml +++ b/regressiontests/stable-cmdexecauditsess/generic/pom.xml @@@ -15,18 -15,21 +15,21 @@@ <parent> <groupId>org.apache.causeway.regressiontests</groupId> - <artifactId>causeway-regressiontests-cmdexecauditsess</artifactId> + <artifactId>causeway-regressiontests-stable-cmdexecauditsess</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> - <artifactId>causeway-regressiontests-cmdexecauditsess-generic</artifactId> + <artifactId>causeway-regressiontests-stable-cmdexecauditsess-generic</artifactId> <name>Apache Causeway - Regression Tests (stable) - Cmd/Exec/Audit/Session - Generic</name> - <properties> - <jar-plugin.automaticModuleName>org.apache.causeway.regressiontests.cmdexecauditsess.generic</jar-plugin.automaticModuleName> - <git-plugin.propertiesDir>org/apache/causeway/regressiontests/cmdexecauditsess/generic</git-plugin.propertiesDir> - </properties> - + <properties> + <maven.install.skip>true</maven.install.skip> + <maven.deploy.skip>true</maven.deploy.skip> + + <jar-plugin.automaticModuleName>org.apache.causeway.regressiontests.stable.cmdexecauditsess.generic</jar-plugin.automaticModuleName> + <git-plugin.propertiesDir>org/apache/causeway/regressiontests/stable-cmdexecauditsess/generic</git-plugin.propertiesDir> + </properties> + <dependencies> <dependency> diff --cc regressiontests/stable-cmdexecauditsess/persistence-jdo/pom.xml index ab41524bd0,dc73f5db16..13248b901e --- a/regressiontests/stable-cmdexecauditsess/persistence-jdo/pom.xml +++ b/regressiontests/stable-cmdexecauditsess/persistence-jdo/pom.xml @@@ -15,13 -15,13 +15,13 @@@ <parent> <groupId>org.apache.causeway.regressiontests</groupId> - <artifactId>causeway-regressiontests-cmdexecauditsess</artifactId> + <artifactId>causeway-regressiontests-stable-cmdexecauditsess</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> - <artifactId>causeway-regressiontests-cmdexecauditsess-persistence-jdo</artifactId> + <artifactId>causeway-regressiontests-stable-cmdexecauditsess-persistence-jdo</artifactId> <name>Apache Causeway - Regression Tests (stable) - Cmd/Exec/Audit/Session - JDO</name> - + <properties> <maven.install.skip>true</maven.install.skip> <maven.deploy.skip>true</maven.deploy.skip> diff --cc regressiontests/stable-cmdexecauditsess/persistence-jpa/pom.xml index 11de674e28,24ee580200..adb8cf8df3 --- a/regressiontests/stable-cmdexecauditsess/persistence-jpa/pom.xml +++ b/regressiontests/stable-cmdexecauditsess/persistence-jpa/pom.xml @@@ -15,11 -15,11 +15,11 @@@ <parent> <groupId>org.apache.causeway.regressiontests</groupId> - <artifactId>causeway-regressiontests-cmdexecauditsess</artifactId> + <artifactId>causeway-regressiontests-stable-cmdexecauditsess</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> - <artifactId>causeway-regressiontests-cmdexecauditsess-persistence-jpa</artifactId> + <artifactId>causeway-regressiontests-stable-cmdexecauditsess-persistence-jpa</artifactId> <name>Apache Causeway - Regression Tests (stable) - Cmd/Exec/Audit/Session - JPA</name> <properties> diff --cc regressiontests/stable-cmdexecauditsess/pom.xml index 755cd7f7c4,d9abdebb94..34a72b7593 --- a/regressiontests/stable-cmdexecauditsess/pom.xml +++ b/regressiontests/stable-cmdexecauditsess/pom.xml @@@ -16,10 -16,11 +16,11 @@@ <parent> <groupId>org.apache.causeway.regressiontests</groupId> <artifactId>causeway-regressiontests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <artifactId>causeway-regressiontests-cmdexecauditsess</artifactId> + <artifactId>causeway-regressiontests-stable-cmdexecauditsess</artifactId> <name>Apache Causeway - Regression Tests (stable) - Cmd/Exec/Audit/Session</name> <packaging>pom</packaging> @@@ -43,8 -52,8 +52,8 @@@ <dependency> <groupId>org.apache.causeway.regressiontests</groupId> - <artifactId>causeway-regressiontests-cmdexecauditsess-generic</artifactId> + <artifactId>causeway-regressiontests-stable-cmdexecauditsess-generic</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </dependency> </dependencies> </dependencyManagement> diff --cc regressiontests/stable-core-wrapperfactory/pom.xml index 19898eaf7a,078248ded2..e6c0a08f32 --- a/regressiontests/stable-core-wrapperfactory/pom.xml +++ b/regressiontests/stable-core-wrapperfactory/pom.xml @@@ -16,10 -16,10 +16,10 @@@ <parent> <groupId>org.apache.causeway.regressiontests</groupId> <artifactId>causeway-regressiontests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> </parent> - <artifactId>causeway-regressiontests-core-wrapperfactory</artifactId> + <artifactId>causeway-regressiontests-stable-core-wrapperfactory</artifactId> <name>Apache Causeway - Regression Tests (stable) - Core WrapperFactory</name> <properties>
