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 19e048c046a377a6bbfbacac7b92d2e396d685dd
Merge: a95503b3bb 3881ffa078
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Fri Nov 25 07:11:04 2022 +0100
Merge remote-tracking branch 'origin/master' into spring6
.github/dependabot.yml | 9 +-
.../java/org/apache/causeway/applib/ViewModel.java | 38 +++++++--
.../services/appfeatui/ApplicationNamespace.java | 2 +
.../applib/services/appfeatui/ApplicationType.java | 2 +
.../services/appfeatui/ApplicationTypeAction.java | 2 +
.../appfeatui/ApplicationTypeCollection.java | 2 +
.../services/appfeatui/ApplicationTypeMember.java | 14 +--
.../appfeatui/ApplicationTypeProperty.java | 2 +
bom/pom.xml | 2 +-
commons/src/main/java/module-info.java | 2 +
.../commons/internal/reflection/_ClassCache.java | 14 +++
core/config/pom.xml | 4 +-
.../progmodel/ProgrammingModelConstants.java | 45 +++++++---
.../ViewModelSemanticCheckingFacetFactory.java | 22 +++--
.../ViewModelFacetForViewModelInterface.java | 99 +++++++++++++++++++---
.../dom/domain/_interactions/InteractionDtoVm.java | 2 +
.../feature/api/ApplicationFeatureChoices.java | 1 +
.../dom/mixins/perms/UserPermissionViewModel.java | 1 +
.../testdomain/factory/ViewModelFactoryTest.java | 70 +++++++++++----
starters/pom.xml | 4 +-
viewers/commons/prism/pom.xml | 2 +-
21 files changed, 263 insertions(+), 76 deletions(-)
diff --cc
api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java
index 4519e702ec,ef2588d797..9787920f95
---
a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationNamespace.java
@@@ -34,8 -37,6 +34,9 @@@ import org.apache.causeway.applib.annot
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureSort;
++import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
/**
* @since 2.x {@index}
*/
diff --cc
api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java
index 2fa344e8f9,a528b2ba52..89b77c8868
---
a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationType.java
@@@ -33,8 -36,6 +33,9 @@@ import org.apache.causeway.applib.annot
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
++import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
/**
* @since 2.x {@index}
*/
diff --cc
api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java
index 4328914177,6949732a87..d516d75510
---
a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeAction.java
@@@ -31,8 -34,6 +31,9 @@@ import org.apache.causeway.applib.annot
import org.apache.causeway.applib.annotation.SemanticsOf;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
++import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
/**
* @since 2.x {@index}
*/
diff --cc
api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java
index c6f7d0d497,85eaf3a5b1..432ab59db5
---
a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeCollection.java
@@@ -29,8 -32,6 +29,9 @@@ import org.apache.causeway.applib.annot
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
++import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
/**
* @since 2.x {@index}
*/
diff --cc
api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java
index 57ed3f440e,b80605b23e..bff7e144ec
---
a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationTypeProperty.java
@@@ -32,7 -35,6 +32,8 @@@ import org.apache.causeway.applib.annot
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
++import jakarta.inject.Inject;
+import jakarta.inject.Named;
import lombok.val;
/**
diff --cc bom/pom.xml
index a243ed0ac2,ca8a47112f..ab99fdb322
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -36,7 -36,7 +36,7 @@@ It is therefore a copy of org.apache:ap
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.0-RC2</version>
- <version>2.7.6</version>
++ <version>3.0.0</version>
<relativePath/>
</parent>
<groupId>org.apache.causeway</groupId>
diff --cc commons/src/main/java/module-info.java
index 2cdd00c6b8,2491d567a3..de57015e03
--- a/commons/src/main/java/module-info.java
+++ b/commons/src/main/java/module-info.java
@@@ -70,9 -71,9 +70,11 @@@ module org.apache.causeway.commons
requires transitive spring.beans;
requires transitive spring.context;
requires transitive spring.core;
- requires java.inject;
++
+ requires transitive jakarta.xml.bind;
++ requires transitive jakarta.inject;
// JAXB JUnit test
- opens org.apache.causeway.commons.internal.resources to java.xml.bind;
+ opens org.apache.causeway.commons.internal.resources to jakarta.xml.bind;
}
diff --cc
commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
index ee826c9297,773cb2cb7f..5227b1731e
---
a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
+++
b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
@@@ -27,6 -27,9 +27,7 @@@ import java.util.Optional
import java.util.function.Predicate;
import java.util.stream.Stream;
-import javax.inject.Inject;
-
+ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.lang.Nullable;
import org.springframework.util.ReflectionUtils;
@@@ -36,6 -40,6 +38,7 @@@ import org.apache.causeway.commons.inte
import org.apache.causeway.commons.internal.collections._Arrays;
import org.apache.causeway.commons.internal.context._Context;
++import jakarta.inject.Inject;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
diff --cc
examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java
index 5f57d003df,723ab3912d..2e3521ec20
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java
@@@ -21,7 -21,8 +21,8 @@@ package demoapp.dom.domain._interaction
import java.text.SimpleDateFormat;
import java.util.Date;
-import javax.inject.Inject;
-import javax.inject.Named;
++import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.causeway.applib.ViewModel;
import org.apache.causeway.applib.annotation.DomainObject;
diff --cc starters/pom.xml
index 8032718020,40e54e0b24..e4b927d226
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@@ -26,7 -26,7 +26,7 @@@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.0-RC2</version>
- <version>2.7.6</version>
++ <version>3.0.0</version>
<relativePath />
</parent>
@@@ -39,12 -39,12 +39,12 @@@
<properties>
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>17</maven.compiler.release>
- <spring-boot.version>3.0.0-RC2</spring-boot.version>
- <spring-boot.version>2.7.6</spring-boot.version>
++ <spring-boot.version>3.0.0</spring-boot.version>
<approvaltests.version>18.5.0</approvaltests.version>
- <resteasy.version>5.0.0.Final</resteasy.version> <!-- keep in
sync with property defined in resteasy-spring-boot-starter -->
+ <resteasy.version>6.0.0.Alpha2</resteasy.version> <!-- keep in
sync with property defined in resteasy-spring-boot-starter -->
</properties>
