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 d677f0bef8f7852d70cadda3e2fdb97a9405febb Author: Andi Huber <[email protected]> AuthorDate: Sun Nov 13 11:17:07 2022 +0100 ISIS-3275: migrate tooling --- tooling/metaprog/src/main/resources/$Templates.java | 14 +++++++------- .../src/main/resources/holder/$TemplateHolder.java | 2 +- .../holder/$TemplateHolder_actionReturningArray.java | 2 +- .../$TemplateHolder_actionReturningCollection.java | 2 +- ...er_updateReadOnlyOptionalPropertyWithChoices.java | 2 +- ...lateHolder_updateReadOnlyPropertyWithChoices.java | 2 +- .../resources/holder/$TemplateHolder~primitive.java | 2 +- .../src/main/resources/jdo/$TemplateJdo.java | 2 +- .../src/main/resources/jdo/$TemplateJdo~lob.java | 2 +- .../main/resources/jdo/$TemplateJdo~primitive.java | 2 +- .../src/main/resources/jpa/$TemplateJpa.java | 14 +++++++------- .../src/main/resources/jpa/$TemplateJpa~lob.java | 20 ++++++++++---------- .../main/resources/jpa/$TemplateJpa~primitive.java | 12 ++++++------ .../main/resources/persistence/$TemplateEntity.java | 2 +- .../main/resources/persistence/$TemplateSeeding.java | 2 +- .../metaprog/src/main/resources/vm/$TemplateVm.java | 12 ++++++------ .../src/main/resources/vm/$TemplateVm~primitive.java | 10 +++++----- tooling/pom.xml | 15 ++++++++++----- 18 files changed, 62 insertions(+), 57 deletions(-) diff --git a/tooling/metaprog/src/main/resources/$Templates.java b/tooling/metaprog/src/main/resources/$Templates.java index a92e5acbb4..6c54f3325b 100644 --- a/tooling/metaprog/src/main/resources/$Templates.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/holder/$TemplateHolder.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder.java index e24e96240e..713563b2f2 100644 --- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder.java +++ b/tooling/metaprog/src/main/resources/holder/$TemplateHolder.java @@ -18,7 +18,7 @@ */ package /*${java-package}*/; -import javax.inject.Named; +import jakarta.inject.Named; /*${generated-file-notice}*/ @Named("demo./*${showcase-name}*/Holder") diff --git a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturningArray.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturningArray.java index b791bd9e40..6468c5e5b9 100644 --- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturningArray.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturningCollection.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturningCollection.java index 4e8c6826ad..b30dd29610 100644 --- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturningCollection.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalPropertyWithChoices.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalPropertyWithChoices.java index 7e485d564a..cfa47c3234 100644 --- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalPropertyWithChoices.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices.java index 1c648d02c9..812693d7a8 100644 --- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/holder/$TemplateHolder~primitive.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder~primitive.java index 944e02eaa8..56aac7bde5 100644 --- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder~primitive.java +++ b/tooling/metaprog/src/main/resources/holder/$TemplateHolder~primitive.java @@ -18,7 +18,7 @@ */ package /*${java-package}*/; -import javax.inject.Named; +import jakarta.inject.Named; /*${generated-file-notice}*/ @Named("demo./*${showcase-name}*/Holder") diff --git a/tooling/metaprog/src/main/resources/jdo/$TemplateJdo.java b/tooling/metaprog/src/main/resources/jdo/$TemplateJdo.java index 970d3b15dc..01645698f4 100644 --- a/tooling/metaprog/src/main/resources/jdo/$TemplateJdo.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/jdo/$TemplateJdo~lob.java b/tooling/metaprog/src/main/resources/jdo/$TemplateJdo~lob.java index a9e4948e8a..305fae81d5 100644 --- a/tooling/metaprog/src/main/resources/jdo/$TemplateJdo~lob.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/jdo/$TemplateJdo~primitive.java b/tooling/metaprog/src/main/resources/jdo/$TemplateJdo~primitive.java index 6e3246657c..b2ff57b336 100644 --- a/tooling/metaprog/src/main/resources/jdo/$TemplateJdo~primitive.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java index 7739780393..ef2ae6cf6f 100644 --- a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~lob.java b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~lob.java index 9f371131a2..e6ba9a7f2c 100644 --- a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~lob.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~primitive.java b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~primitive.java index 5654af2ff4..8eb0c969dc 100644 --- a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa~primitive.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.java b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.java index 6de138a58f..95352f8e98 100644 --- a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/persistence/$TemplateSeeding.java b/tooling/metaprog/src/main/resources/persistence/$TemplateSeeding.java index d52d492e5c..985d56ce3d 100644 --- a/tooling/metaprog/src/main/resources/persistence/$TemplateSeeding.java +++ b/tooling/metaprog/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/tooling/metaprog/src/main/resources/vm/$TemplateVm.java b/tooling/metaprog/src/main/resources/vm/$TemplateVm.java index ae1f2302be..385e67ed7b 100644 --- a/tooling/metaprog/src/main/resources/vm/$TemplateVm.java +++ b/tooling/metaprog/src/main/resources/vm/$TemplateVm.java @@ -18,12 +18,12 @@ */ 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 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 org.apache.causeway.applib.annotation.DomainObject; import org.apache.causeway.applib.annotation.Editing; diff --git a/tooling/metaprog/src/main/resources/vm/$TemplateVm~primitive.java b/tooling/metaprog/src/main/resources/vm/$TemplateVm~primitive.java index 64fd3a2a4e..095f35838b 100644 --- a/tooling/metaprog/src/main/resources/vm/$TemplateVm~primitive.java +++ b/tooling/metaprog/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; diff --git a/tooling/pom.xml b/tooling/pom.xml index 2c99609a3b..a8f8198c59 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -28,14 +28,14 @@ <description> Libraries and tools not depending on the _Apache Causeway Core_ ecosystem, eg. code mining, automated documentation. - (Targeted for JVM 11+) + (Targeted for JVM 17+) </description> <packaging>pom</packaging> <properties> - <maven.compiler.release>11</maven.compiler.release> + <maven.compiler.release>17</maven.compiler.release> <jar-plugin.automaticModuleName>org.apache.causeway.tooling</jar-plugin.automaticModuleName> <git-plugin.propertiesDir>org/apache/causeway/tooling</git-plugin.propertiesDir> @@ -47,6 +47,13 @@ </properties> <repositories> + <!-- temporary till Nov 24, 2022 --> + <repository> + <id>spring.snapshots</id> + <name>Spring Milestones Repository</name> + <url>https://repo.spring.io/milestone/</url> + <snapshots><enabled>false</enabled></snapshots> + </repository> <repository> <id>gradle-repo</id> <url>https://repo.gradle.org/gradle/libs-releases-local/</url> @@ -57,7 +64,7 @@ <enabled>false</enabled> </snapshots> </repository> - </repositories> + </repositories> <build> <resources> @@ -316,8 +323,6 @@ <module>cli</module> </modules> - <profiles> - </profiles> </project>
