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
commit 418f8f589f3ba6a4b45f768c94be97ddb98f120e Author: Andi Huber <[email protected]> AuthorDate: Tue Jul 4 06:01:53 2023 +0200 build fixes for spring6 branch --- wicket/jdo/pom.xml | 5 +---- .../src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java | 8 ++++---- wicket/jpa/pom.xml | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/wicket/jdo/pom.xml b/wicket/jdo/pom.xml index 348afee..2857f6a 100644 --- a/wicket/jdo/pom.xml +++ b/wicket/jdo/pom.xml @@ -40,7 +40,6 @@ <dependency> <groupId>org.apache.causeway.examples.apps</groupId> <artifactId>demo-wicket-common</artifactId> - <version>${project.version}</version> </dependency> <!-- PERSISTENCE --> @@ -50,8 +49,6 @@ <artifactId>causeway-persistence-jdo-datanucleus</artifactId> </dependency> - - </dependencies> <profiles> @@ -118,7 +115,7 @@ <artifactId>jib-maven-plugin</artifactId> <configuration> <from> - <image>openjdk:18-jdk-slim-bullseye</image> + <image>openjdk:20-jdk-slim-bullseye</image> </from> <container> <jvmFlags> diff --git a/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java b/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java index 76068a0..edb7c22 100644 --- a/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java +++ b/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java @@ -30,10 +30,10 @@ import org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommand import org.apache.causeway.extensions.pdfjs.wkt.ui.CausewayModuleExtPdfjsWicketUi; import org.apache.causeway.extensions.sse.wicket.CausewayModuleExtSseWicket; import org.apache.causeway.valuetypes.asciidoc.metamodel.CausewayModuleValAsciidocMetaModel; -import org.apache.causeway.valuetypes.asciidoc.persistence.jdo.dn.CausewayModuleValAsciidocPersistenceJdoDn; +import org.apache.causeway.valuetypes.asciidoc.persistence.jdo.CausewayModuleValAsciidocPersistenceJdo; import org.apache.causeway.valuetypes.asciidoc.ui.wkt.CausewayModuleValAsciidocUiWkt; import org.apache.causeway.valuetypes.markdown.metamodel.CausewayModuleValMarkdownMetaModel; -import org.apache.causeway.valuetypes.markdown.persistence.jdo.dn.CausewayModuleValMarkdownPersistenceJdoDn; +import org.apache.causeway.valuetypes.markdown.persistence.jdo.CausewayModuleValMarkdownPersistenceJdo; import org.apache.causeway.valuetypes.markdown.ui.wkt.CausewayModuleValMarkdownUiWkt; import org.apache.causeway.valuetypes.vega.metamodel.CausewayModuleValVegaMetaModel; import org.apache.causeway.valuetypes.vega.persistence.jdo.dn.CausewayModuleValVegaPersistenceJdoDn; @@ -70,8 +70,8 @@ import demoapp.webapp.wicket.common.DemoAppWicketCommon; DemoAppWicketCommon.class, // Persistence (JDO/DN5) - CausewayModuleValAsciidocPersistenceJdoDn.class, - CausewayModuleValMarkdownPersistenceJdoDn.class, + CausewayModuleValAsciidocPersistenceJdo.class, + CausewayModuleValMarkdownPersistenceJdo.class, CausewayModuleValVegaPersistenceJdoDn.class, //XrayEnable.class // for debugging only diff --git a/wicket/jpa/pom.xml b/wicket/jpa/pom.xml index 400b48d..295d1bf 100644 --- a/wicket/jpa/pom.xml +++ b/wicket/jpa/pom.xml @@ -115,7 +115,7 @@ <artifactId>jib-maven-plugin</artifactId> <configuration> <from> - <image>openjdk:18-jdk-slim-bullseye</image> + <image>openjdk:20-jdk-slim-bullseye</image> </from> <container> <jvmFlags>
