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 335492794f ISIS-3275: re-include shiro; test provisioning fixes 335492794f is described below commit 335492794f19da7256a67f574b41b8a19a9f0f1f Author: Andi Huber <ahu...@apache.org> AuthorDate: Mon Nov 28 09:47:53 2022 +0100 ISIS-3275: re-include shiro; test provisioning fixes --- core/pom.xml | 2 +- .../jdo/integtests/ExecutionLog_IntegTest.java | 8 +++- extensions/pom.xml | 2 +- .../jdo/integtests/AuditTrail_IntegTest.java | 5 +++ .../ApplicationPermissionRepository_IntegTest.java | 6 +++ .../jdo/integtests/SessionLog_IntegTest.java | 5 +++ persistence/jdo/datanucleus/pom.xml | 2 +- .../testdomain/rest/RestServiceStressTest.java | 2 - .../causeway/testdomain/rest/RestServiceTest.java | 2 - regressiontests/stable/pom.xml | 1 + .../testdomain/conf/Configuration_usingJdo.java | 8 +++- .../testdomain/conf/Configuration_usingJpa.java | 8 +++- .../conf/Configuration_usingSpring6.java | 43 ---------------------- .../wrapperfactory/WrapperTestFixtures.java | 7 +++- security/shiro/pom.xml | 3 ++ testing/pom.xml | 2 +- tooling/pom.xml | 3 ++ viewers/restfulobjects/jaxrs-resteasy/pom.xml | 2 +- viewers/wicket/viewer/pom.xml | 2 +- 19 files changed, 56 insertions(+), 57 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index f11520a25d..8bd3949aff 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1687,7 +1687,7 @@ <module>security</module> <module>../security/bypass</module> <module>../security/keycloak</module> -<!-- <module>../security/shiro</module> TODO[ISIS-3275] no jakarta namespace support on 2.0.0-SNAPSHOT as of Nov 2022 --> + <module>../security/shiro</module> <module>../security/spring</module> <module>../viewers/commons</module> diff --git a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java b/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java index cb843b37ba..b4576c0395 100644 --- a/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java +++ b/extensions/core/executionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/executionlog/jdo/integtests/ExecutionLog_IntegTest.java @@ -34,6 +34,8 @@ import org.apache.causeway.extensions.executionlog.applib.integtest.model.Execut import org.apache.causeway.extensions.executionlog.jdo.CausewayModuleExtExecutionLogPersistenceJdo; import org.apache.causeway.extensions.executionlog.jdo.integtests.model.Counter; import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration; @SpringBootTest( classes = ExecutionLog_IntegTest.AppManifest.class @@ -47,6 +49,9 @@ public class ExecutionLog_IntegTest extends ExecutionLog_IntegTestAbstract { CausewayModuleCoreRuntimeServices.class, CausewayModuleSecurityBypass.class, CausewayModuleExtExecutionLogPersistenceJdo.class, + // Auto Configuration + FixtureScriptsSpecificationProviderAutoConfiguration.class, + ExecutionParametersServiceAutoConfiguration.class, }) @PropertySources({ @PropertySource(CausewayPresets.UseLog4j2Test) @@ -56,7 +61,8 @@ public class ExecutionLog_IntegTest extends ExecutionLog_IntegTestAbstract { } - protected org.apache.causeway.extensions.executionlog.applib.integtest.model.Counter newCounter(String name) { + @Override + protected org.apache.causeway.extensions.executionlog.applib.integtest.model.Counter newCounter(final String name) { return Counter.builder().name(name).build(); } diff --git a/extensions/pom.xml b/extensions/pom.xml index 524008884b..e6580e149b 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -37,7 +37,7 @@ <git-plugin.propertiesDir>org/apache/causeway/extensions</git-plugin.propertiesDir> <!-- override surefire defaults from bom, as this is not a Java module yet --> - <surefire-plugin.argLine>-Xmx512m</surefire-plugin.argLine> + <surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine> </properties> <build> diff --git a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java index c7fffc95a8..61ec8950cb 100644 --- a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java +++ b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/causeway/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java @@ -35,6 +35,8 @@ import org.apache.causeway.extensions.audittrail.jdo.CausewayModuleExtAuditTrail import org.apache.causeway.extensions.audittrail.jdo.integtests.model.Counter; import org.apache.causeway.extensions.audittrail.jdo.integtests.model.CounterRepository; import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration; @SpringBootTest( classes = AuditTrail_IntegTest.AppManifest.class @@ -49,6 +51,9 @@ public class AuditTrail_IntegTest extends AuditTrail_IntegTestAbstract { CausewayModuleCoreRuntimeServices.class, CausewayModuleSecurityBypass.class, CausewayModuleExtAuditTrailPersistenceJdo.class, + // Auto Configuration + FixtureScriptsSpecificationProviderAutoConfiguration.class, + ExecutionParametersServiceAutoConfiguration.class, }) @PropertySources({ @PropertySource(CausewayPresets.UseLog4j2Test), diff --git a/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java b/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java index 72310b9a93..e853f33da3 100644 --- a/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java +++ b/extensions/security/secman/persistence-jdo/src/test/java/org/apache/causeway/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository_IntegTest.java @@ -32,6 +32,8 @@ import org.apache.causeway.extensions.secman.applib.ApplicationPermissionReposit import org.apache.causeway.extensions.secman.applib.mmm.MmmModule; import org.apache.causeway.extensions.secman.jdo.CausewayModuleExtSecmanPersistenceJdo; import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration; @SpringBootTest( classes = ApplicationPermissionRepository_IntegTest.AppManifest.class @@ -47,6 +49,10 @@ class ApplicationPermissionRepository_IntegTest extends ApplicationPermissionRep CausewayModuleExtSecmanPersistenceJdo.class, MmmModule.class, + + // Auto Configuration + FixtureScriptsSpecificationProviderAutoConfiguration.class, + ExecutionParametersServiceAutoConfiguration.class, }) @PropertySources({ @PropertySource(CausewayPresets.UseLog4j2Test), diff --git a/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java b/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java index 58c3ecbb00..64bee62f02 100644 --- a/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java +++ b/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/causeway/extensions/sessionlog/jdo/integtests/SessionLog_IntegTest.java @@ -31,6 +31,8 @@ import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeService import org.apache.causeway.extensions.sessionlog.applib.integtests.SessionLogIntegTestAbstract; import org.apache.causeway.extensions.sessionlog.jdo.CausewayModuleExtSessionLogPersistenceJdo; import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration; @SpringBootTest( classes = SessionLog_IntegTest.AppManifest.class @@ -45,6 +47,9 @@ public class SessionLog_IntegTest extends SessionLogIntegTestAbstract { CausewayModuleCoreRuntimeServices.class, CausewayModuleSecurityBypass.class, CausewayModuleExtSessionLogPersistenceJdo.class, + // Auto Configuration + FixtureScriptsSpecificationProviderAutoConfiguration.class, + ExecutionParametersServiceAutoConfiguration.class, }) @PropertySources({ @PropertySource(CausewayPresets.UseLog4j2Test), diff --git a/persistence/jdo/datanucleus/pom.xml b/persistence/jdo/datanucleus/pom.xml index 73563f9dcc..c145069913 100644 --- a/persistence/jdo/datanucleus/pom.xml +++ b/persistence/jdo/datanucleus/pom.xml @@ -32,7 +32,7 @@ <git-plugin.propertiesDir>org/apache/causeway/persistence/jdo/datanucleus</git-plugin.propertiesDir> <!-- override surefire defaults from bom, as this is not a Java module yet --> - <surefire-plugin.argLine>-Xmx512m</surefire-plugin.argLine> + <surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine> </properties> <dependencies> diff --git a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java index 6b0d7716f8..0b8eaa4724 100644 --- a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java +++ b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java @@ -37,7 +37,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.causeway.commons.internal.base._Timing; import org.apache.causeway.core.config.presets.CausewayPresets; import org.apache.causeway.testdomain.conf.Configuration_usingJdo; -import org.apache.causeway.testdomain.conf.Configuration_usingSpring6; import org.apache.causeway.testdomain.util.rest.RestEndpointService; import org.apache.causeway.viewer.restfulobjects.client.RestfulClient; import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy; @@ -50,7 +49,6 @@ import lombok.extern.log4j.Log4j2; webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @TestPropertySource(CausewayPresets.UseLog4j2Test) @Import({ - Configuration_usingSpring6.class, Configuration_usingJdo.class, CausewayModuleViewerRestfulObjectsJaxrsResteasy.class }) diff --git a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java index 0885337473..37175d973b 100644 --- a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java +++ b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java @@ -34,7 +34,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.causeway.core.config.presets.CausewayPresets; import org.apache.causeway.testdomain.conf.Configuration_usingJdo; -import org.apache.causeway.testdomain.conf.Configuration_usingSpring6; import org.apache.causeway.testdomain.jdo.JdoInventoryJaxbVm; import org.apache.causeway.testdomain.jdo.JdoTestFixtures; import org.apache.causeway.testdomain.jdo.entities.JdoBook; @@ -48,7 +47,6 @@ import lombok.val; webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @TestPropertySource(CausewayPresets.UseLog4j2Test) @Import({ - Configuration_usingSpring6.class, Configuration_usingJdo.class, CausewayModuleViewerRestfulObjectsJaxrsResteasy.class, }) diff --git a/regressiontests/stable/pom.xml b/regressiontests/stable/pom.xml index 7277ad086f..9afabec71b 100644 --- a/regressiontests/stable/pom.xml +++ b/regressiontests/stable/pom.xml @@ -68,6 +68,7 @@ <groupId>org.apache.causeway.testing</groupId> <artifactId>causeway-testing-fixtures-applib</artifactId> <optional>true</optional> + <version>3.0.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdo.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdo.java index 39220023af..0dd6ddf159 100644 --- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdo.java +++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJdo.java @@ -32,6 +32,8 @@ import org.apache.causeway.testdomain.jdo.JdoTestDomainModule; import org.apache.causeway.testdomain.model.stereotypes.MyService; import org.apache.causeway.testdomain.util.kv.KVStoreForTesting; import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration; @Configuration @Import({ @@ -43,7 +45,11 @@ import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixtures CausewayModuleTestingFixturesApplib.class, KVStoreForTesting.class, // Helper for JUnit Tests - JdoTestDomainModule.class + JdoTestDomainModule.class, + + // Auto Configuration + FixtureScriptsSpecificationProviderAutoConfiguration.class, + ExecutionParametersServiceAutoConfiguration.class, }) @PropertySources({ @PropertySource(CausewayPresets.NoTranslations), diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJpa.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJpa.java index 6f2461bffb..c48cc11bdb 100644 --- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJpa.java +++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingJpa.java @@ -32,6 +32,8 @@ import org.apache.causeway.testdomain.jpa.JpaTestDomainModule; import org.apache.causeway.testdomain.model.stereotypes.MyService; import org.apache.causeway.testdomain.util.kv.KVStoreForTesting; import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration; @SpringBootConfiguration @EnableAutoConfiguration @@ -43,7 +45,11 @@ import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixtures CausewayModuleTestingFixturesApplib.class, KVStoreForTesting.class, // Helper for JUnit Tests - JpaTestDomainModule.class + JpaTestDomainModule.class, + + // Auto Configuration + FixtureScriptsSpecificationProviderAutoConfiguration.class, + ExecutionParametersServiceAutoConfiguration.class, }) @PropertySources({ @PropertySource(CausewayPresets.NoTranslations), diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingSpring6.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingSpring6.java deleted file mode 100644 index eed3ea490b..0000000000 --- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingSpring6.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.causeway.testdomain.conf; - -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration; -import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration; - -import lombok.extern.log4j.Log4j2; - -/** - * Introduced for the purpose of troubleshooting Spring 5.x to 6.x migration issues. - * @deprecated marked deprecated, to be removed once no longer needed - */ -@Deprecated(forRemoval = true) -@Configuration -@Import({ - FixtureScriptsSpecificationProviderAutoConfiguration.class, // because something? disables autoconfiguration - ExecutionParametersServiceAutoConfiguration.class // because something? disables autoconfiguration -}) -@Log4j2 -public class Configuration_usingSpring6 { - - -} diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/WrapperTestFixtures.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/WrapperTestFixtures.java index dfe6845beb..5898b10492 100644 --- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/WrapperTestFixtures.java +++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/wrapperfactory/WrapperTestFixtures.java @@ -24,12 +24,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration; import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript; +import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration; import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures; import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract; @Configuration @Import({ + // Auto Configuration + FixtureScriptsSpecificationProviderAutoConfiguration.class, + ExecutionParametersServiceAutoConfiguration.class, }) @ComponentScan public class WrapperTestFixtures implements ModuleWithFixtures { @@ -41,7 +46,7 @@ public class WrapperTestFixtures implements ModuleWithFixtures { public FixtureScript getTeardownFixture() { return new TeardownFixtureJdoAbstract() { @Override - protected void execute(ExecutionContext executionContext) { + protected void execute(final ExecutionContext executionContext) { deleteFrom(Counter.class); } }; diff --git a/security/shiro/pom.xml b/security/shiro/pom.xml index d5f488efbf..f7f0e0b0b8 100644 --- a/security/shiro/pom.xml +++ b/security/shiro/pom.xml @@ -39,6 +39,9 @@ <!-- apache shiro is not migrated to JPMS yet, so no point in converting ours to JPMS --> <jar-plugin.automaticModuleName>org.apache.causeway.security.shiro</jar-plugin.automaticModuleName> <git-plugin.propertiesDir>org/apache/causeway/security/shiro</git-plugin.propertiesDir> + + <!-- override surefire defaults from bom, as this is not a Java module yet --> + <surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine> </properties> diff --git a/testing/pom.xml b/testing/pom.xml index 12096d83ad..76fa211717 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -38,7 +38,7 @@ <git-plugin.propertiesDir>org/apache/causeway/testing</git-plugin.propertiesDir> <!-- override surefire defaults from bom, as this is not a Java module yet --> - <surefire-plugin.argLine>-Xmx512m</surefire-plugin.argLine> + <surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine> </properties> <build> diff --git a/tooling/pom.xml b/tooling/pom.xml index 0b103cd508..bd05eac4b0 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -44,6 +44,9 @@ <picocli.version>4.7.0</picocli.version> <structurizr.version>1.16.1</structurizr.version> <structurizr-plantuml.version>1.6.3</structurizr-plantuml.version> + + <!-- override surefire defaults from bom, as this is not a Java module yet --> + <surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine> </properties> diff --git a/viewers/restfulobjects/jaxrs-resteasy/pom.xml b/viewers/restfulobjects/jaxrs-resteasy/pom.xml index 6c707ebdce..0ea6ce4dfa 100644 --- a/viewers/restfulobjects/jaxrs-resteasy/pom.xml +++ b/viewers/restfulobjects/jaxrs-resteasy/pom.xml @@ -32,7 +32,7 @@ <git-plugin.propertiesDir>org/apache/causeway/viewer.restfulobjects/jaxrsresteasy</git-plugin.propertiesDir> <!-- override surefire defaults from bom, as this is not a Java module yet --> - <surefire-plugin.argLine>-Xmx512m</surefire-plugin.argLine> + <surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine> </properties> <build> diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml index 93f38137bf..4bc3fe26ce 100644 --- a/viewers/wicket/viewer/pom.xml +++ b/viewers/wicket/viewer/pom.xml @@ -36,7 +36,7 @@ <git-plugin.propertiesDir>org/apache/causeway/viewer/wicket/viewer</git-plugin.propertiesDir> <!-- override surefire defaults from bom, as this is not a Java module yet --> - <surefire-plugin.argLine>-Xmx512m</surefire-plugin.argLine> + <surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine> </properties> <build>