This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway-app-referenceapp.git
The following commit(s) were added to refs/heads/v3 by this push:
new 9134a25 codegen: brings in jakarta templates
9134a25 is described below
commit 9134a25dce69c44bcf9d3eb1a742963b5011c437
Author: andi-huber <[email protected]>
AuthorDate: Tue Apr 2 07:07:10 2024 +0200
codegen: brings in jakarta templates
---
codegen/src/main/resources/$Templates.java | 14 +++++++-------
codegen/src/main/resources/$Templates~primitive.java | 14 +++++++-------
.../src/main/resources/holder/$TemplateHolder.java | 2 +-
.../holder/$TemplateHolder_actionReturningArray.java | 2 +-
...emplateHolder_actionReturningArray~primitive.java | 2 +-
.../$TemplateHolder_actionReturningCollection.java | 2 +-
...teHolder_actionReturningCollection~primitive.java | 2 +-
...er_updateReadOnlyOptionalPropertyWithChoices.java | 2 +-
...lateHolder_updateReadOnlyPropertyWithChoices.java | 2 +-
..._updateReadOnlyPropertyWithChoices~primitive.java | 2 +-
.../resources/holder/$TemplateHolder~primitive.java | 2 +-
codegen/src/main/resources/jdo/$TemplateJdo.java | 2 +-
codegen/src/main/resources/jdo/$TemplateJdo~lob.java | 2 +-
.../main/resources/jdo/$TemplateJdo~primitive.java | 2 +-
codegen/src/main/resources/jpa/$TemplateJpa.java | 14 +++++++-------
codegen/src/main/resources/jpa/$TemplateJpa~lob.java | 20 ++++++++++----------
.../main/resources/jpa/$TemplateJpa~primitive.java | 12 ++++++------
.../main/resources/persistence/$TemplateEntity.java | 2 +-
.../persistence/$TemplateEntity~primitive.java | 2 +-
.../main/resources/persistence/$TemplateSeeding.java | 2 +-
.../persistence/$TemplateSeeding~primitive.java | 2 +-
codegen/src/main/resources/vm/$TemplateVm.java | 14 +++++++-------
.../src/main/resources/vm/$TemplateVm~primitive.java | 10 +++++-----
23 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/codegen/src/main/resources/$Templates.java
b/codegen/src/main/resources/$Templates.java
index 3a7cf00..e1c343a 100644
--- a/codegen/src/main/resources/$Templates.java
+++ b/codegen/src/main/resources/$Templates.java
@@ -20,13 +20,13 @@ package /*${java-package}*/;
import java.util.List;
-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.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/codegen/src/main/resources/$Templates~primitive.java
b/codegen/src/main/resources/$Templates~primitive.java
index 4281037..20feb33 100644
--- a/codegen/src/main/resources/$Templates~primitive.java
+++ b/codegen/src/main/resources/$Templates~primitive.java
@@ -20,13 +20,13 @@ package /*${java-package}*/;
import java.util.List;
-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.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/codegen/src/main/resources/holder/$TemplateHolder.java
b/codegen/src/main/resources/holder/$TemplateHolder.java
index b5ea49f..2cd7603 100644
--- a/codegen/src/main/resources/holder/$TemplateHolder.java
+++ b/codegen/src/main/resources/holder/$TemplateHolder.java
@@ -18,7 +18,7 @@
*/
package /*${java-package}*/;
-import javax.inject.Named;
+import jakarta.inject.Named;
import /*${showcase-fully-qualified-type}*/;
diff --git
a/codegen/src/main/resources/holder/$TemplateHolder_actionReturningArray.java
b/codegen/src/main/resources/holder/$TemplateHolder_actionReturningArray.java
index 5d7079f..a33e171 100644
---
a/codegen/src/main/resources/holder/$TemplateHolder_actionReturningArray.java
+++
b/codegen/src/main/resources/holder/$TemplateHolder_actionReturningArray.java
@@ -18,7 +18,7 @@
*/
package /*${java-package}*/;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git
a/codegen/src/main/resources/holder/$TemplateHolder_actionReturningArray~primitive.java
b/codegen/src/main/resources/holder/$TemplateHolder_actionReturningArray~primitive.java
index 511ac2e..c9fb3bc 100644
---
a/codegen/src/main/resources/holder/$TemplateHolder_actionReturningArray~primitive.java
+++
b/codegen/src/main/resources/holder/$TemplateHolder_actionReturningArray~primitive.java
@@ -18,7 +18,7 @@
*/
package /*${java-package}*/;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git
a/codegen/src/main/resources/holder/$TemplateHolder_actionReturningCollection.java
b/codegen/src/main/resources/holder/$TemplateHolder_actionReturningCollection.java
index 2f3de07..26a57e8 100644
---
a/codegen/src/main/resources/holder/$TemplateHolder_actionReturningCollection.java
+++
b/codegen/src/main/resources/holder/$TemplateHolder_actionReturningCollection.java
@@ -21,7 +21,7 @@ package /*${java-package}*/;
import java.util.Collection;
import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git
a/codegen/src/main/resources/holder/$TemplateHolder_actionReturningCollection~primitive.java
b/codegen/src/main/resources/holder/$TemplateHolder_actionReturningCollection~primitive.java
index c373a76..908f1fb 100644
---
a/codegen/src/main/resources/holder/$TemplateHolder_actionReturningCollection~primitive.java
+++
b/codegen/src/main/resources/holder/$TemplateHolder_actionReturningCollection~primitive.java
@@ -21,7 +21,7 @@ package /*${java-package}*/;
import java.util.Collection;
import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git
a/codegen/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalPropertyWithChoices.java
b/codegen/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalPropertyWithChoices.java
index a2f17c1..f6d516d 100644
---
a/codegen/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++
b/codegen/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -21,7 +21,7 @@ package /*${java-package}*/;
import java.util.List;
import java.util.stream.Collectors;
-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/codegen/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices.java
b/codegen/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices.java
index 76bcf8b..04690a8 100644
---
a/codegen/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices.java
+++
b/codegen/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,7 +21,7 @@ package /*${java-package}*/;
import java.util.List;
import java.util.stream.Collectors;
-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/codegen/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices~primitive.java
b/codegen/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices~primitive.java
index 88951fe..9e70fac 100644
---
a/codegen/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices~primitive.java
+++
b/codegen/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices~primitive.java
@@ -21,7 +21,7 @@ package /*${java-package}*/;
import java.util.List;
import java.util.stream.Collectors;
-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/codegen/src/main/resources/holder/$TemplateHolder~primitive.java
b/codegen/src/main/resources/holder/$TemplateHolder~primitive.java
index 3baf1f3..04e0b40 100644
--- a/codegen/src/main/resources/holder/$TemplateHolder~primitive.java
+++ b/codegen/src/main/resources/holder/$TemplateHolder~primitive.java
@@ -18,7 +18,7 @@
*/
package /*${java-package}*/;
-import javax.inject.Named;
+import jakarta.inject.Named;
@Named("demo./*${showcase-name}*/Holder")
//tag::class[]
diff --git a/codegen/src/main/resources/jdo/$TemplateJdo.java
b/codegen/src/main/resources/jdo/$TemplateJdo.java
index 5c0f9b9..ed812f1 100644
--- a/codegen/src/main/resources/jdo/$TemplateJdo.java
+++ b/codegen/src/main/resources/jdo/$TemplateJdo.java
@@ -18,7 +18,7 @@
*/
package /*${java-package}*/;
-import javax.inject.Named;
+import jakarta.inject.Named;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.DatastoreIdentity;
import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/codegen/src/main/resources/jdo/$TemplateJdo~lob.java
b/codegen/src/main/resources/jdo/$TemplateJdo~lob.java
index 12d3e85..e4e60f0 100644
--- a/codegen/src/main/resources/jdo/$TemplateJdo~lob.java
+++ b/codegen/src/main/resources/jdo/$TemplateJdo~lob.java
@@ -18,7 +18,7 @@
*/
package /*${java-package}*/;
-import javax.inject.Named;
+import jakarta.inject.Named;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.DatastoreIdentity;
import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/codegen/src/main/resources/jdo/$TemplateJdo~primitive.java
b/codegen/src/main/resources/jdo/$TemplateJdo~primitive.java
index f17dc4a..0bb24ff 100644
--- a/codegen/src/main/resources/jdo/$TemplateJdo~primitive.java
+++ b/codegen/src/main/resources/jdo/$TemplateJdo~primitive.java
@@ -18,7 +18,7 @@
*/
package /*${java-package}*/;
-import javax.inject.Named;
+import jakarta.inject.Named;
import javax.jdo.annotations.DatastoreIdentity;
import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.IdentityType;
diff --git a/codegen/src/main/resources/jpa/$TemplateJpa.java
b/codegen/src/main/resources/jpa/$TemplateJpa.java
index 1b2658f..41c5baa 100644
--- a/codegen/src/main/resources/jpa/$TemplateJpa.java
+++ b/codegen/src/main/resources/jpa/$TemplateJpa.java
@@ -18,13 +18,13 @@
*/
package /*${java-package}*/;
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
import org.springframework.context.annotation.Profile;
diff --git a/codegen/src/main/resources/jpa/$TemplateJpa~lob.java
b/codegen/src/main/resources/jpa/$TemplateJpa~lob.java
index 9662d75..fc4b362 100644
--- a/codegen/src/main/resources/jpa/$TemplateJpa~lob.java
+++ b/codegen/src/main/resources/jpa/$TemplateJpa~lob.java
@@ -18,16 +18,16 @@
*/
package /*${java-package}*/;
-import javax.inject.Named;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Table;
import org.springframework.context.annotation.Profile;
diff --git a/codegen/src/main/resources/jpa/$TemplateJpa~primitive.java
b/codegen/src/main/resources/jpa/$TemplateJpa~primitive.java
index e5b28c2..3e03b91 100644
--- a/codegen/src/main/resources/jpa/$TemplateJpa~primitive.java
+++ b/codegen/src/main/resources/jpa/$TemplateJpa~primitive.java
@@ -18,12 +18,12 @@
*/
package /*${java-package}*/;
-import javax.inject.Named;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.inject.Named;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
import org.springframework.context.annotation.Profile;
diff --git a/codegen/src/main/resources/persistence/$TemplateEntity.java
b/codegen/src/main/resources/persistence/$TemplateEntity.java
index 7ed9677..633cb63 100644
--- a/codegen/src/main/resources/persistence/$TemplateEntity.java
+++ b/codegen/src/main/resources/persistence/$TemplateEntity.java
@@ -18,7 +18,7 @@
*/
package /*${java-package}*/;
-import javax.inject.Named;
+import jakarta.inject.Named;
import org.apache.causeway.applib.annotation.DomainObject;
diff --git
a/codegen/src/main/resources/persistence/$TemplateEntity~primitive.java
b/codegen/src/main/resources/persistence/$TemplateEntity~primitive.java
index 01e35f5..1777d85 100644
--- a/codegen/src/main/resources/persistence/$TemplateEntity~primitive.java
+++ b/codegen/src/main/resources/persistence/$TemplateEntity~primitive.java
@@ -18,7 +18,7 @@
*/
package /*${java-package}*/;
-import javax.inject.Named;
+import jakarta.inject.Named;
import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/codegen/src/main/resources/persistence/$TemplateSeeding.java
b/codegen/src/main/resources/persistence/$TemplateSeeding.java
index 34fc13a..162ae51 100644
--- a/codegen/src/main/resources/persistence/$TemplateSeeding.java
+++ b/codegen/src/main/resources/persistence/$TemplateSeeding.java
@@ -18,7 +18,7 @@
*/
package /*${java-package}*/;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Service;
diff --git
a/codegen/src/main/resources/persistence/$TemplateSeeding~primitive.java
b/codegen/src/main/resources/persistence/$TemplateSeeding~primitive.java
index a45e427..8688b37 100644
--- a/codegen/src/main/resources/persistence/$TemplateSeeding~primitive.java
+++ b/codegen/src/main/resources/persistence/$TemplateSeeding~primitive.java
@@ -18,7 +18,7 @@
*/
package /*${java-package}*/;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.stereotype.Service;
diff --git a/codegen/src/main/resources/vm/$TemplateVm.java
b/codegen/src/main/resources/vm/$TemplateVm.java
index 8545d39..b757a00 100644
--- a/codegen/src/main/resources/vm/$TemplateVm.java
+++ b/codegen/src/main/resources/vm/$TemplateVm.java
@@ -18,13 +18,13 @@
*/
package /*${java-package}*/;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
diff --git a/codegen/src/main/resources/vm/$TemplateVm~primitive.java
b/codegen/src/main/resources/vm/$TemplateVm~primitive.java
index 71190ce..7c6a108 100644
--- a/codegen/src/main/resources/vm/$TemplateVm~primitive.java
+++ b/codegen/src/main/resources/vm/$TemplateVm~primitive.java
@@ -18,11 +18,11 @@
*/
package /*${java-package}*/;
-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.XmlType;
+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.XmlType;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
