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
The following commit(s) were added to refs/heads/spring6 by this push:
new 1c2e9971da ISIS-3275: migrate testing
1c2e9971da is described below
commit 1c2e9971dafd8007362544318f129f1b684cfd9c
Author: Andi Huber <[email protected]>
AuthorDate: Sun Nov 13 11:27:14 2022 +0100
ISIS-3275: migrate testing
---
.../applib/classrules/ArchitectureDomainRules.java | 14 ++++-----
.../applib/classrules/ArchitectureJdoRules.java | 4 +--
.../applib/classrules/ArchitectureJpaRules.java | 24 +++++++--------
.../applib/classrules/CommonPredicates.java | 2 +-
.../applib/classrules/_LogicalNaming.java | 2 +-
.../applib/domain/dom/JaxbViewModel.java | 6 ++--
.../applib/domain/dom/SerializableViewModel.java | 4 +--
.../applib/domain/dom/SomeDomainObject.java | 2 +-
.../applib/domain/dom/SomeDomainService.java | 2 +-
.../applib/entity/jdo/dom/JdoEntity.java | 4 +--
.../applib/entity/jdo/dom/JdoEntity2.java | 2 +-
.../applib/entity/jdo/dom/JdoEntitySubtype.java | 2 +-
.../applib/entity/jpa/dom/JpaEntity.java | 20 ++++++-------
.../applib/entity/jpa/dom/JpaEntity2.java | 16 +++++-----
.../applib/modules/customer/dom/CustomerJpa.java | 2 +-
.../fakedata/applib/services/FakeDataService.java | 8 ++---
.../demomodule/dom/FakeDataDemoObjectWithAll.java | 2 +-
.../dom/FakeDataDemoObjectWithAllMenu.java | 6 ++--
.../FakeDataDemoObjectWithAll_create3.java | 2 +-
...eDataDemoObjectWithAll_create_withFakeData.java | 4 +--
...eDataDemoObjectWithAll_update_withFakeData.java | 2 +-
.../fakedata/integtests/tests/Smoke_IntegTest.java | 2 +-
...ausewayIntegrationTestAbstractWithFixtures.java | 2 +-
.../applib/fixturescripts/FixtureResult.java | 14 ++++-----
.../applib/fixturescripts/FixtureScript.java | 2 +-
.../applib/fixturescripts/FixtureScripts.java | 8 ++---
.../applib/modules/ModuleWithFixturesService.java | 6 ++--
.../QueryResultsCacheControlForFixtures.java | 4 +--
.../services/InitialFixtureScriptsInstaller.java | 6 ++--
.../teardown/jdo/TeardownFixtureJdoAbstract.java | 2 +-
.../personas/fixtures/CustomerBuilderScript.java | 2 +-
.../personas/fixtures/PersonBuilderScript.java | 2 +-
testing/h2console/ui/pom.xml | 4 +--
.../h2console/ui/services/H2ManagerMenu.java | 6 ++--
.../h2console/ui/webmodule/H2WebServerWrapper.java | 20 ++++---------
.../h2console/ui/webmodule/WebModuleH2Console.java | 35 ++++++++++++----------
.../hsqldbmgr/dom/services/HsqlDbManagerMenu.java | 6 ++--
.../applib/CausewayIntegrationTestAbstract.java | 6 ++--
.../applib/swagger/SwaggerExporter.java | 2 +-
.../applib/validate/DomainModelValidator.java | 2 +-
testing/pom.xml | 2 +-
.../applib/matchers/JaxbMatchers.java | 8 ++---
.../unittestsupport/applib/soap/SoapEndpoint.java | 4 +--
43 files changed, 136 insertions(+), 139 deletions(-)
diff --git
a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureDomainRules.java
b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureDomainRules.java
index 15b3d8966c..4ce0e82512 100644
---
a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureDomainRules.java
+++
b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureDomainRules.java
@@ -25,9 +25,9 @@ import java.util.TreeMap;
import java.util.function.Function;
import java.util.function.Predicate;
-import javax.inject.Inject;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.inject.Inject;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
import com.tngtech.archunit.base.DescribedPredicate;
import com.tngtech.archunit.core.domain.JavaAnnotation;
@@ -351,8 +351,8 @@ public class ArchitectureDomainRules {
/**
* This rule requires that injected fields in jaxb view models (that is,
classes annotated with the JAXB
- * {@link javax.xml.bind.annotation.XmlRootElement} annotation) must also
be annotated with JAXB
- * {@link javax.xml.bind.annotation.XmlTransient} annotation.
+ * {@link jakarta.xml.bind.annotation.XmlRootElement} annotation) must
also be annotated with JAXB
+ * {@link jakarta.xml.bind.annotation.XmlTransient} annotation.
*
* <p>
* The rationale here is that injected services are managed by the runtime
and are not/cannot be serialized to
@@ -378,8 +378,8 @@ public class ArchitectureDomainRules {
/**
* This rule requires that injected fields in jaxb view models (that is,
classes annotated with the JAXB
- * {@link javax.xml.bind.annotation.XmlRootElement} annotation) must also
be annotated with JAXB
- * {@link javax.xml.bind.annotation.XmlTransient} annotation.
+ * {@link jakarta.xml.bind.annotation.XmlRootElement} annotation) must
also be annotated with JAXB
+ * {@link jakarta.xml.bind.annotation.XmlTransient} annotation.
*
* <p>
* The rationale here is that injected services are managed by the runtime
and are not/cannot be serialized to
diff --git
a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJdoRules.java
b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJdoRules.java
index 2af20d73a7..528aeb716a 100644
---
a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJdoRules.java
+++
b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJdoRules.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.testing.archtestsupport.applib.classrules;
import java.util.Objects;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.jdo.annotations.Discriminator;
import javax.jdo.annotations.NotPersistent;
import javax.jdo.annotations.PersistenceCapable;
@@ -113,7 +113,7 @@ public class ArchitectureJdoRules {
/**
* This rule requires that classes annotated with the JDO {@link
javax.jdo.annotations.PersistenceCapable} annotation
- * must also be annotated with the Apache Causeway {@link
javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter} annotation
+ * must also be annotated with the Apache Causeway {@link
jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter} annotation
* with a value of {@link
org.apache.causeway.applib.jaxb.PersistentEntityAdapter}<code>.class</code>.
*
* <p>
diff --git
a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJpaRules.java
b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJpaRules.java
index 590bb814ab..de841b81b5 100644
---
a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJpaRules.java
+++
b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/ArchitectureJpaRules.java
@@ -22,14 +22,14 @@ import java.lang.annotation.Annotation;
import java.util.Arrays;
import java.util.Objects;
-import javax.inject.Inject;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.Version;
+import jakarta.inject.Inject;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.persistence.Version;
import com.tngtech.archunit.base.DescribedPredicate;
import com.tngtech.archunit.core.domain.JavaAnnotation;
@@ -77,7 +77,7 @@ public class ArchitectureJpaRules {
/**
* This rule requires that classes annotated with the JPA {@link Entity}
annotation must also be
- * annotated with the Apache Causeway {@link
javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter} annotation
+ * annotated with the Apache Causeway {@link
jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter} annotation
* with a value of {@link
org.apache.causeway.applib.jaxb.PersistentEntityAdapter}<code>.class</code>.
*
* <p>
@@ -92,7 +92,7 @@ public class ArchitectureJpaRules {
/**
* This rule requires that classes annotated with the JPA {@link Entity}
annotation must also be
- * annotated with the {@link javax.persistence.EntityListeners} annotation
that includes
+ * annotated with the {@link jakarta.persistence.EntityListeners}
annotation that includes
* a value of
<code>org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener.class</code>.
*
* <p>
@@ -174,7 +174,7 @@ public class ArchitectureJpaRules {
/**
* This rule requires that enum fields in classes annotated with the JPA
{@link Entity} annotation must also be
* annotated with the JPA {@link Enumerated} annotation indicating that
they should be persisted as
- * {@link javax.persistence.EnumType#STRING string}s (rather than ordinal
numbers).
+ * {@link jakarta.persistence.EnumType#STRING string}s (rather than
ordinal numbers).
*
* <p>
* The rationale here is that a string is (arguably) more stable than an
ordinal number, and is certainly easier
@@ -221,7 +221,7 @@ public class ArchitectureJpaRules {
/**
* This rule requires that classes annotated with the JPA {@link Entity}
annotation must contain a
- * <code>version</code> field that is itself annotated with {@link
javax.persistence.Version}.
+ * <code>version</code> field that is itself annotated with {@link
jakarta.persistence.Version}.
*
* <p>
* This is good practice for JPA entities to implement optimistic locking
diff --git
a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/CommonPredicates.java
b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/CommonPredicates.java
index 90d6878422..decb324e8d 100644
---
a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/CommonPredicates.java
+++
b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/CommonPredicates.java
@@ -21,7 +21,7 @@ package
org.apache.causeway.testing.archtestsupport.applib.classrules;
import java.util.Objects;
import java.util.Optional;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.tngtech.archunit.base.DescribedPredicate;
import com.tngtech.archunit.core.domain.JavaAnnotation;
diff --git
a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/_LogicalNaming.java
b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/_LogicalNaming.java
index 54b2296815..cbf0d9b8db 100644
---
a/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/_LogicalNaming.java
+++
b/testing/archtestsupport/applib/src/main/java/org/apache/causeway/testing/archtestsupport/applib/classrules/_LogicalNaming.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.testing.archtestsupport.applib.classrules;
import java.util.Optional;
-import javax.inject.Named;
+import jakarta.inject.Named;
import com.tngtech.archunit.core.domain.JavaClass;
diff --git
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/JaxbViewModel.java
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/JaxbViewModel.java
index fce9aa16b8..e5e630ce3a 100644
---
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/JaxbViewModel.java
+++
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/JaxbViewModel.java
@@ -18,9 +18,9 @@
*/
package org.apache.causeway.testing.archtestsupport.applib.domain.dom;
-import javax.inject.Inject;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.inject.Inject;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
@XmlRootElement(name = "JaxbViewModel")
public class JaxbViewModel {
diff --git
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/SerializableViewModel.java
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/SerializableViewModel.java
index d345c936d9..eb6f1cf99d 100644
---
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/SerializableViewModel.java
+++
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/SerializableViewModel.java
@@ -20,8 +20,8 @@ package
org.apache.causeway.testing.archtestsupport.applib.domain.dom;
import java.io.Serializable;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/SomeDomainObject.java
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/SomeDomainObject.java
index 5927741c9e..cb27f2dcdf 100644
---
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/SomeDomainObject.java
+++
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/SomeDomainObject.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.testing.archtestsupport.applib.domain.dom;
-import javax.inject.Named;
+import jakarta.inject.Named;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/SomeDomainService.java
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/SomeDomainService.java
index 6cb36f3e8f..a318b6b226 100644
---
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/SomeDomainService.java
+++
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/domain/dom/SomeDomainService.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.testing.archtestsupport.applib.domain.dom;
-import javax.inject.Named;
+import jakarta.inject.Named;
import org.apache.causeway.applib.annotation.DomainService;
import org.apache.causeway.applib.annotation.DomainServiceLayout;
diff --git
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity.java
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity.java
index da484f8fa3..d746ba3c1b 100644
---
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity.java
+++
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.testing.archtestsupport.applib.entity.jdo.dom;
import java.util.Comparator;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.jdo.annotations.DatastoreIdentity;
import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.IdentityType;
@@ -30,7 +30,7 @@ import javax.jdo.annotations.Unique;
import javax.jdo.annotations.Uniques;
import javax.jdo.annotations.Version;
import javax.jdo.annotations.VersionStrategy;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
diff --git
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity2.java
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity2.java
index 22e51d7135..2d48ccf664 100644
---
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity2.java
+++
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntity2.java
@@ -25,7 +25,7 @@ import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Unique;
import javax.jdo.annotations.Version;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
diff --git
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntitySubtype.java
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntitySubtype.java
index 4ff77f5c74..e858aebadc 100644
---
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntitySubtype.java
+++
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jdo/dom/JdoEntitySubtype.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.testing.archtestsupport.applib.entity.jdo.dom;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
diff --git
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity.java
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity.java
index e9cab3df27..5adcbba8d4 100644
---
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity.java
+++
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity.java
@@ -20,16 +20,16 @@ package
org.apache.causeway.testing.archtestsupport.applib.entity.jpa.dom;
import java.util.Comparator;
-import javax.inject.Inject;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.UniqueConstraint;
-import javax.persistence.Version;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.inject.Inject;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.persistence.Version;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
diff --git
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity2.java
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity2.java
index 6911200da3..279f1388b7 100644
---
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity2.java
+++
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity2.java
@@ -20,14 +20,14 @@ package
org.apache.causeway.testing.archtestsupport.applib.entity.jpa.dom;
import java.util.Comparator;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import javax.persistence.Version;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.persistence.Version;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
diff --git
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/customer/dom/CustomerJpa.java
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/customer/dom/CustomerJpa.java
index 7ed285e83b..7d7f264e1e 100644
---
a/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/customer/dom/CustomerJpa.java
+++
b/testing/archtestsupport/applib/src/test/java/org/apache/causeway/testing/archtestsupport/applib/modules/customer/dom/CustomerJpa.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.testing.archtestsupport.applib.modules.customer.dom;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import
org.apache.causeway.testing.archtestsupport.applib.modules.base.api.BaseJpa;
import
org.apache.causeway.testing.archtestsupport.applib.modules.customer.api.Customer;
diff --git
a/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/FakeDataService.java
b/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/FakeDataService.java
index 5a2547f5e1..a71412770b 100644
---
a/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/FakeDataService.java
+++
b/testing/fakedata/applib/src/main/java/org/apache/causeway/testing/fakedata/applib/services/FakeDataService.java
@@ -21,10 +21,10 @@ package
org.apache.causeway.testing.fakedata.applib.services;
import java.util.Locale;
import java.util.Random;
-import javax.annotation.PostConstruct;
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import com.github.javafaker.Faker;
import com.github.javafaker.service.FakeValuesService;
diff --git
a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
index dc3211d67f..9065f8e7c1 100644
---
a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
+++
b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
@@ -28,7 +28,7 @@ import java.util.UUID;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.VersionStrategy;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
diff --git
a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
index fab3027ad2..cb2ea35e49 100644
---
a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
+++
b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
@@ -20,8 +20,8 @@ package
org.apache.causeway.testing.fakedata.fixtures.demoapp.demomodule.dom;
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;
@@ -42,7 +42,7 @@ import lombok.val;
@DomainServiceLayout(
named = "Demo"
)
[email protected](PriorityPrecedence.EARLY)
[email protected](PriorityPrecedence.EARLY)
public class FakeDataDemoObjectWithAllMenu {
diff --git
a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
index 5983eb1739..9d2b67f29e 100644
---
a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
+++
b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
@@ -20,7 +20,7 @@ package
org.apache.causeway.testing.fakedata.fixtures.demoapp.demomodule.fixture
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.commons.internal.collections._Lists;
diff --git
a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
index 4e92fec212..2452a01cc7 100644
---
a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
+++
b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
@@ -87,9 +87,9 @@ public class FakeDataDemoObjectWithAll_create_withFakeData
extends FixtureScript
executionContext.addResult(this, fakeDataDemoObject);
}
- @javax.inject.Inject
+ @jakarta.inject.Inject
FakeDataDemoObjectWithAllMenu demoObjectWithAllMenu;
- @javax.inject.Inject
+ @jakarta.inject.Inject
FakeDataService fakeDataService;
}
diff --git
a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
index 7f0799b712..aaf492a6dc 100644
---
a/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
+++
b/testing/fakedata/fixtures/src/main/java/org/apache/causeway/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
@@ -25,7 +25,7 @@ import java.sql.Timestamp;
import java.util.Date;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
diff --git
a/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/tests/Smoke_IntegTest.java
b/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/tests/Smoke_IntegTest.java
index 31b7861054..c0844453b2 100644
---
a/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/tests/Smoke_IntegTest.java
+++
b/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/tests/Smoke_IntegTest.java
@@ -25,7 +25,7 @@ import java.util.Date;
import java.util.List;
import java.util.UUID;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.assertj.core.api.Assertions;
import org.joda.time.DateTime;
diff --git
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationTestAbstractWithFixtures.java
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationTestAbstractWithFixtures.java
index 514cda7558..f79d812bc9 100644
---
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationTestAbstractWithFixtures.java
+++
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationTestAbstractWithFixtures.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.testing.fixtures.applib;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureResult.java
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureResult.java
index 45a667549e..2a07ea71d5 100644
---
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureResult.java
+++
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureResult.java
@@ -18,13 +18,13 @@
*/
package org.apache.causeway.testing.fixtures.applib.fixturescripts;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScript.java
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScript.java
index 455f0394e4..c550d0d75f 100644
---
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScript.java
+++
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScript.java
@@ -29,7 +29,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Stream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
diff --git
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index 8e1ad0763f..26a0ecd623 100644
---
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -27,9 +27,9 @@ import java.util.TreeMap;
import java.util.function.Function;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlRootElement;
import org.apache.causeway.applib.ViewModel;
import org.apache.causeway.applib.annotation.Action;
@@ -81,7 +81,7 @@ import lombok.val;
named="Prototyping",
menuBar = DomainServiceLayout.MenuBar.SECONDARY
)
[email protected](PriorityPrecedence.EARLY)
[email protected](PriorityPrecedence.EARLY)
public class FixtureScripts {
public static final String LOGICAL_TYPE_NAME =
CausewayModuleTestingFixturesApplib.NAMESPACE + ".FixtureScripts"; // secman
seeding
diff --git
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/modules/ModuleWithFixturesService.java
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/modules/ModuleWithFixturesService.java
index 4147cee9e7..7d3ed591af 100644
---
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/modules/ModuleWithFixturesService.java
+++
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/modules/ModuleWithFixturesService.java
@@ -27,9 +27,9 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-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.context.ConfigurableApplicationContext;
diff --git
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/queryresultscache/QueryResultsCacheControlForFixtures.java
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/queryresultscache/QueryResultsCacheControlForFixtures.java
index 6ea231f2a7..15fe3eb367 100644
---
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/queryresultscache/QueryResultsCacheControlForFixtures.java
+++
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/queryresultscache/QueryResultsCacheControlForFixtures.java
@@ -18,8 +18,8 @@
*/
package org.apache.causeway.testing.fixtures.applib.queryresultscache;
-import javax.annotation.Priority;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Named;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.event.EventListener;
diff --git
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
index 4442ecaecd..e58097914e 100644
---
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
+++
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
@@ -20,9 +20,9 @@ package org.apache.causeway.testing.fixtures.applib.services;
import java.lang.reflect.InvocationTargetException;
-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.context.event.EventListener;
diff --git
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/teardown/jdo/TeardownFixtureJdoAbstract.java
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/teardown/jdo/TeardownFixtureJdoAbstract.java
index ef6d97722e..0d81954496 100644
---
a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/teardown/jdo/TeardownFixtureJdoAbstract.java
+++
b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/teardown/jdo/TeardownFixtureJdoAbstract.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.testing.fixtures.applib.teardown.jdo;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.annotations.DiscriminatorStrategy;
import javax.jdo.annotations.InheritanceStrategy;
diff --git
a/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/personas/fixtures/CustomerBuilderScript.java
b/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/personas/fixtures/CustomerBuilderScript.java
index 361802e96a..96409f41f7 100644
---
a/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/personas/fixtures/CustomerBuilderScript.java
+++
b/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/personas/fixtures/CustomerBuilderScript.java
@@ -20,7 +20,7 @@
package org.apache.causeway.testing.fixtures.applib.personas.fixtures;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import
org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptWithResult;
import org.apache.causeway.testing.fixtures.applib.personas.dom.Customer;
diff --git
a/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/personas/fixtures/PersonBuilderScript.java
b/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/personas/fixtures/PersonBuilderScript.java
index e3eb3c51b8..0bfbc0fcc6 100644
---
a/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/personas/fixtures/PersonBuilderScript.java
+++
b/testing/fixtures/applib/src/test/java/org/apache/causeway/testing/fixtures/applib/personas/fixtures/PersonBuilderScript.java
@@ -20,7 +20,7 @@
package org.apache.causeway.testing.fixtures.applib.personas.fixtures;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import
org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptWithResult;
import org.apache.causeway.testing.fixtures.applib.personas.dom.Person;
diff --git a/testing/h2console/ui/pom.xml b/testing/h2console/ui/pom.xml
index 14fd1c55db..d31fd850e1 100644
--- a/testing/h2console/ui/pom.xml
+++ b/testing/h2console/ui/pom.xml
@@ -41,8 +41,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git
a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/services/H2ManagerMenu.java
b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/services/H2ManagerMenu.java
index b80b6aa592..8b5d6d64a9 100644
---
a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/services/H2ManagerMenu.java
+++
b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/services/H2ManagerMenu.java
@@ -20,8 +20,8 @@ package org.apache.causeway.testing.h2console.ui.services;
import java.util.Optional;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;
@@ -48,7 +48,7 @@ import
org.apache.causeway.testing.h2console.ui.webmodule.WebModuleH2Console;
named = "Prototyping",
menuBar = DomainServiceLayout.MenuBar.SECONDARY
)
[email protected](PriorityPrecedence.EARLY)
[email protected](PriorityPrecedence.EARLY)
public class H2ManagerMenu {
private final WebModuleH2Console webModule;
diff --git
a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/H2WebServerWrapper.java
b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/H2WebServerWrapper.java
index 8348061ebf..1b3e6b37c0 100644
---
a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/H2WebServerWrapper.java
+++
b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/H2WebServerWrapper.java
@@ -18,20 +18,9 @@
*/
package org.apache.causeway.testing.h2console.ui.webmodule;
-import java.util.function.Consumer;
-
import org.h2.server.web.ConnectionInfo;
-import org.h2.server.web.WebServer;
-import org.h2.server.web.WebServlet;
-
-import org.apache.causeway.commons.internal._Constants;
-import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.commons.internal.reflection._Reflect;
-
-import lombok.NonNull;
-import lombok.SneakyThrows;
-import lombok.val;
+//import org.h2.server.web.WebServer;
+//import org.h2.server.web.WebServlet;
/**
* Provides programmatic access to otherwise protected H2 {@link WebServer}
configuration.
@@ -60,6 +49,9 @@ public interface H2WebServerWrapper {
// -- UTILITY
+ //TODO[ISIS-3275] H2WebServlet (com.h2database:h2) does not support jakarta
API
+ /*
+
@SneakyThrows
static void withH2WebServerWrapperDo(
final @NonNull WebServlet webServlet,
@@ -123,6 +115,6 @@ public interface H2WebServerWrapper {
};
}
-
+*/
}
diff --git
a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
index 23d5bd7bf3..96072c076a 100644
---
a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
+++
b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
@@ -18,34 +18,25 @@
*/
package org.apache.causeway.testing.h2console.ui.webmodule;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
-
-import org.h2.server.web.ConnectionInfo;
-import org.h2.server.web.WebServlet;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.stereotype.Service;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.value.LocalResourcePath;
import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.core.config.CausewayConfiguration;
import
org.apache.causeway.core.config.datasources.DataSourceIntrospectionService;
import
org.apache.causeway.core.config.datasources.DataSourceIntrospectionService.DataSourceInfo;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
-import
org.apache.causeway.core.security.authentication.standard.RandomCodeGenerator;
import org.apache.causeway.core.webapp.modules.WebModuleAbstract;
import org.apache.causeway.core.webapp.modules.WebModuleContext;
-import
org.apache.causeway.testing.h2console.ui.webmodule.WebModuleH2Console.H2WebServlet;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletException;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
/**
@@ -53,7 +44,7 @@ import lombok.extern.log4j.Log4j2;
*/
@Service
@Named("causeway.test.WebModuleH2Console")
[email protected](PriorityPrecedence.MIDPOINT)
[email protected](PriorityPrecedence.MIDPOINT)
@Qualifier("H2Console")
@Log4j2
public class WebModuleH2Console extends WebModuleAbstract {
@@ -87,9 +78,15 @@ public class WebModuleH2Console extends WebModuleAbstract {
@Getter
private final String name = "H2Console";
+
+
@Override
public Can<ServletContextListener> init(final ServletContext ctx) throws
ServletException {
+ /*
+
+ //TODO[ISIS-3275] H2WebServlet (com.h2database:h2) does not
support jakarta API
+
registerServlet(ctx, SERVLET_NAME, H2WebServlet.class)
.ifPresent(servletReg -> {
servletReg.addMapping(CONSOLE_PATH + "/*");
@@ -100,6 +97,8 @@ public class WebModuleH2Console extends WebModuleAbstract {
});
+ */
+
return Can.empty(); // registers no listeners
}
@@ -110,6 +109,8 @@ public class WebModuleH2Console extends WebModuleAbstract {
// -- WRAPPER AROUND H2'S SERVLET
+ //TODO[ISIS-3275] H2WebServlet (com.h2database:h2) does not support jakarta
API
+ /*
public static class H2WebServlet extends WebServlet {
private static final long serialVersionUID = 1L;
@@ -164,6 +165,7 @@ public class WebModuleH2Console extends WebModuleAbstract {
}
}
+ */
// -- HELPER
@@ -179,7 +181,10 @@ public class WebModuleH2Console extends WebModuleAbstract {
.anyMatch(jdbcUrl->{
if(jdbcUrl.contains(":h2:mem:")) {
log.info("found h2 in-memory data-source: {}", jdbcUrl);
+ //TODO[ISIS-3275] H2WebServlet (com.h2database:h2) does not
support jakarta API
+ /*
H2WebServlet.configure(jdbcUrl);
+ */
return true;
}
return false;
diff --git
a/testing/hsqldbmgr/ui/src/main/java/org/apache/causeway/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
b/testing/hsqldbmgr/ui/src/main/java/org/apache/causeway/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
index 3034d7d3c5..661a9aa368 100644
---
a/testing/hsqldbmgr/ui/src/main/java/org/apache/causeway/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
+++
b/testing/hsqldbmgr/ui/src/main/java/org/apache/causeway/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
@@ -18,8 +18,8 @@
*/
package org.apache.causeway.extensions.hsqldbmgr.dom.services;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.hsqldb.util.DatabaseManagerSwing;
@@ -51,7 +51,7 @@ import lombok.extern.log4j.Log4j2;
named = "Prototyping",
menuBar = DomainServiceLayout.MenuBar.SECONDARY
)
[email protected](PriorityPrecedence.EARLY)
[email protected](PriorityPrecedence.EARLY)
@Log4j2
public class HsqlDbManagerMenu {
diff --git
a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java
b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java
index cb8e6ea2ee..fa5b5277a6 100644
---
a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java
+++
b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java
@@ -18,8 +18,8 @@
*/
package org.apache.causeway.testing.integtestsupport.applib;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.stereotype.Service;
@@ -56,7 +56,7 @@ public abstract class CausewayIntegrationTestAbstract {
* therefore also {@link Command}s (currently unused).
*/
@Service
- @javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
+ @jakarta.annotation.Priority(PriorityPrecedence.MIDPOINT)
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public static class InteractionSupport {
diff --git
a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/swagger/SwaggerExporter.java
b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/swagger/SwaggerExporter.java
index 5e815f4aeb..ebfe68389a 100644
---
a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/swagger/SwaggerExporter.java
+++
b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/swagger/SwaggerExporter.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.util.Collections;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.applib.services.swagger.Format;
diff --git
a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java
b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java
index 70b3ef493f..8a21da4b25 100644
---
a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java
+++
b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java
@@ -26,7 +26,7 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.Assertions;
import org.opentest4j.AssertionFailedError;
diff --git a/testing/pom.xml b/testing/pom.xml
index b83a226197..c44eaafc86 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>17</maven.compiler.release>
<jar-plugin.automaticModuleName>org.apache.causeway.testing</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/causeway/testing</git-plugin.propertiesDir>
diff --git
a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/matchers/JaxbMatchers.java
b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/matchers/JaxbMatchers.java
index a8ae180ee8..87e2b00432 100644
---
a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/matchers/JaxbMatchers.java
+++
b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/matchers/JaxbMatchers.java
@@ -24,9 +24,9 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -43,7 +43,7 @@ public class JaxbMatchers {
private JaxbMatchers(){}
/**
- * Performs an equality comparison of a {@link
javax.xml.bind.annotation.XmlRootElement}-annotated class
+ * Performs an equality comparison of a {@link
jakarta.xml.bind.annotation.XmlRootElement}-annotated class
* to another by converting into XML first.
*/
public static <T> Matcher<? super T> isEquivalentTo(final T expected) {
diff --git
a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/soap/SoapEndpoint.java
b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/soap/SoapEndpoint.java
index 2305d15e02..c8d136a30e 100644
---
a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/soap/SoapEndpoint.java
+++
b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/soap/SoapEndpoint.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.testing.unittestsupport.applib.soap;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
class SoapEndpoint {
@@ -39,7 +39,7 @@ class SoapEndpoint {
return implementor;
}
- int publish(int port) {
+ int publish(final int port) {
if (implementor == null) {
this.implementor = getSpec().getEndpointImplementorFactory().get();
