This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch v4 in repository https://gitbox.apache.org/repos/asf/causeway-app-petclinic.git
commit 81f36fbbd57ceb89c0c5b7b6bb4a98ac2b153ffa Author: Dan Haywood <[email protected]> AuthorDate: Sun Jul 12 16:20:18 2026 +0100 adds v4 branch (not yet building) --- .../simple/integtests/SimpleModuleIntegTestAbstract.java | 1 - .../main/java/domainapp/modules/simple/SimpleModule.java | 2 +- pom.xml | 2 +- .../webapp/integtests/WebAppIntegTestAbstract.java | 1 - .../integtests/metamodel/SwaggerExport_IntegTest.java | 4 ++-- webapp/pom.xml | 2 +- webapp/src/main/java/domainapp/webapp/AppManifest.java | 13 +++++-------- .../webapp/application/seed/CustomRolesAndUsers.java | 2 +- 8 files changed, 11 insertions(+), 16 deletions(-) diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java index 2b7b66d..98dce70 100644 --- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java +++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java @@ -41,7 +41,6 @@ public abstract class SimpleModuleIntegTestAbstract extends CausewayIntegrationT }) @PropertySources({ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema), - @PropertySource(CausewayPresets.UseLog4j2Test), }) public static class TestApp { diff --git a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java index 49aaf5b..4f4f865 100644 --- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java +++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java @@ -1,6 +1,6 @@ package domainapp.modules.simple; -import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.boot.persistence.autoconfigure.EntityScan; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/pom.xml b/pom.xml index 8ddfedc..e692c0b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ <packaging>pom</packaging> <properties> - <java.version>11</java.version> + <java.version>21</java.version> <datasource-proxy-spring-boot-starter.version>1.8.1</datasource-proxy-spring-boot-starter.version> <maven-timeline.version>1.8</maven-timeline.version> diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java index b131dc4..6c02036 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java +++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java @@ -47,7 +47,6 @@ public abstract class WebAppIntegTestAbstract extends CausewayIntegrationTestAbs }) @PropertySources({ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema), - @PropertySource(CausewayPresets.UseLog4j2Test), }) public static class TestApp { diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java index 7c9e648..a15df01 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java +++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java @@ -13,14 +13,14 @@ import org.apache.causeway.applib.services.swagger.Format; import org.apache.causeway.applib.services.swagger.Visibility; import org.apache.causeway.testing.integtestsupport.applib.swagger.SwaggerExporter; -import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy; +import org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRestfulObjectsViewer; import lombok.val; import domainapp.webapp.integtests.WebAppIntegTestAbstract; @Import({ - CausewayModuleViewerRestfulObjectsJaxrsResteasy.class + CausewayModuleViewerRestfulObjectsViewer.class }) @DirtiesContext class SwaggerExport_IntegTest extends WebAppIntegTestAbstract { diff --git a/webapp/pom.xml b/webapp/pom.xml index df5fd80..3420577 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -101,7 +101,7 @@ </dependency> <dependency> <groupId>org.apache.causeway.viewer</groupId> - <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy</artifactId> + <artifactId>causeway-viewer-restfulobjects-viewer</artifactId> </dependency> <dependency> diff --git a/webapp/src/main/java/domainapp/webapp/AppManifest.java b/webapp/src/main/java/domainapp/webapp/AppManifest.java index 4f84e33..b4d599a 100644 --- a/webapp/src/main/java/domainapp/webapp/AppManifest.java +++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java @@ -1,11 +1,5 @@ package domainapp.webapp; -import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.CausewayModuleExtFullCalendarWicketUi; -import org.apache.causeway.extensions.layoutloaders.github.CausewayModuleExtLayoutLoadersGithub; - - -import org.apache.causeway.viewer.graphql.viewer.CausewayModuleViewerGraphqlViewer; - import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource; @@ -21,6 +15,8 @@ import org.apache.causeway.extensions.executionlog.jpa.CausewayModuleExtExecutionLogPersistenceJpa; import org.apache.causeway.extensions.executionoutbox.jpa.CausewayModuleExtExecutionOutboxPersistenceJpa; import org.apache.causeway.extensions.flyway.impl.CausewayModuleExtFlywayImpl; +import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.CausewayModuleExtFullCalendarWicketUi; +import org.apache.causeway.extensions.layoutloaders.github.CausewayModuleExtLayoutLoadersGithub; import org.apache.causeway.extensions.pdfjs.wkt.ui.CausewayModuleExtPdfjsWicketUi; import org.apache.causeway.extensions.secman.encryption.spring.CausewayModuleExtSecmanEncryptionSpring; import org.apache.causeway.extensions.secman.jpa.CausewayModuleExtSecmanPersistenceJpa; @@ -31,7 +27,8 @@ import org.apache.causeway.testing.h2console.ui.CausewayModuleTestingH2ConsoleUi; import org.apache.causeway.valuetypes.asciidoc.metamodel.CausewayModuleValAsciidocMetaModel; import org.apache.causeway.valuetypes.asciidoc.ui.wkt.CausewayModuleValAsciidocUiWkt; -import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy; +import org.apache.causeway.viewer.graphql.viewer.CausewayModuleViewerGraphqlViewer; +import org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRestfulObjectsViewer; import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins; import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer; @@ -50,7 +47,7 @@ CausewayModuleCoreRuntimeServices.class, CausewayModulePersistenceJpaEclipselink.class, - CausewayModuleViewerRestfulObjectsJaxrsResteasy.class, + CausewayModuleViewerRestfulObjectsViewer.class, CausewayModuleViewerWicketViewer.class, CausewayModuleViewerGraphqlViewer.class, diff --git a/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java b/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java index be4333e..bf599cd 100644 --- a/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java +++ b/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java @@ -50,7 +50,7 @@ private static class RoleSupplier implements Supplier<Can<String>> { @Override public Can<String> get() { return Can.of( - causewayConfiguration.getExtensions().getSecman().getSeed().getRegularUser().getRoleName(), // built-in stuff + causewayConfiguration.extensions().secman().seed().regularUser().roleName(), // built-in stuff SimpleModuleSuperuserRole.ROLE_NAME ); }
