You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2025/05/27 15:54:47 UTC
(causeway) branch v4 updated: CAUSEWAY-3892: fixes invalid POMs according to Maven 4
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v4
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/v4 by this push:
new ced183599c5 CAUSEWAY-3892: fixes invalid POMs according to Maven 4
ced183599c5 is described below
commit ced183599c523aee1790fb271b71f93f9057da80
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue May 27 17:54:43 2025 +0200
CAUSEWAY-3892: fixes invalid POMs according to Maven 4
- also ditching log4j config
- now passing Maven 4 build
---
.../core/config/presets/CausewayPresets.java | 1 -
.../core/config/presets/UseLog4j2Test.properties | 18 -----
core/metamodel/log4j2-test.xml | 82 ----------------------
.../commandlog/persistence-jpa/log4j2-test.xml | 78 --------------------
.../commandlog/jpa/integtests/AppManifest.java | 7 --
extensions/core/commandlog/pom.xml | 14 ----
extensions/core/excel/integtests/log4j2-test.xml | 78 --------------------
extensions/core/excel/integtests/pom.xml | 12 ----
.../integtests/ExcelModuleIntegTestAbstract.java | 2 -
.../jpa/integtests/ExecutionLog_IntegTest.java | 6 --
.../jpa/integtests/ExecutionOutbox_IntegTest.java | 6 --
.../executionoutbox/restclient/log4j2-test.xml | 78 --------------------
.../integtests/OutboxRestClient_IntegTest.java | 5 --
extensions/core/executionrepublisher/pom.xml | 16 -----
.../audittrail/persistence-jpa/log4j2-test.xml | 78 --------------------
.../jpa/integtests/AuditTrail_IntegTest.java | 6 --
extensions/security/audittrail/pom.xml | 8 ---
.../secman/persistence-jpa/log4j2-test.xml | 78 --------------------
.../ApplicationPermissionRepository_IntegTest.java | 6 --
extensions/security/secman/pom.xml | 9 ---
.../sessionlog/persistence-jpa/log4j2-test.xml | 78 --------------------
.../jpa/integtests/SessionLog_IntegTest.java | 6 --
extensions/security/sessionlog/pom.xml | 9 ---
.../metamodel/PdfjsViewer_Abstract_IntegTest.java | 6 --
.../core/commandreplay/secondary/log4j2-test.xml | 78 --------------------
.../secondary/fetch/CommandFetcher_Test.java | 6 --
log4j2.xml | 26 -------
regressiontests/base/log4j2-debug-persistence.xml | 75 --------------------
regressiontests/base/logging-dn-enhance.properties | 41 -----------
.../bootstrapping/log4j2-debug-persistence.xml | 75 --------------------
regressiontests/bootstrapping/log4j2-test.xml | 78 --------------------
.../bootstrapping/AutoConfigurationTest.java | 3 +-
.../SpringServiceInjectPriorityTest.java | 1 -
.../SpringServiceProvisioningTest.java | 1 -
.../persistence-jpa/log4j2-test.xml | 78 --------------------
.../integtests/CmdExecAuditSessLog_IntegTest.java | 6 --
regressiontests/cmdexecauditsess/pom.xml | 15 ----
.../config/log4j2-debug-persistence.xml | 75 --------------------
regressiontests/config/log4j2-test.xml | 78 --------------------
.../testdomain/config/CausewayConfigBeanTest.java | 4 +-
.../CausewayConfigBeanTest_usingHeadless.java | 4 +-
.../config/EmailServiceDefault_IntegTest.java | 4 +-
.../apache/causeway/testdomain/config/FooTest.java | 29 ++++----
.../core-wrapperfactory/log4j2-test.xml | 78 --------------------
.../CoreWrapperFactory_IntegTestAbstract.java | 3 +-
.../cucumber/log4j2-debug-persistence.xml | 75 --------------------
regressiontests/cucumber/log4j2-test.xml | 78 --------------------
.../domainmodel/log4j2-debug-persistence.xml | 75 --------------------
regressiontests/domainmodel/log4j2-test.xml | 78 --------------------
.../domainmodel/DomainModelTest_forEditing.java | 1 -
.../eventhandling/log4j2-debug-persistence.xml | 70 ------------------
regressiontests/eventhandling/log4j2-test.xml | 73 -------------------
.../factory/log4j2-debug-persistence.xml | 75 --------------------
regressiontests/factory/log4j2-test.xml | 78 --------------------
.../testdomain/factory/ViewModelFactoryTest.java | 4 --
.../interact/log4j2-debug-persistence.xml | 75 --------------------
regressiontests/interact/log4j2-test.xml | 78 --------------------
regressiontests/layouts/log4j2-test.xml | 78 --------------------
.../integtest/Layout_Counter_IntegTest.java | 5 --
.../integtest/Layout_SimpleObject_IntegTest.java | 5 --
.../persistence-jpa/log4j2-debug-persistence.xml | 75 --------------------
regressiontests/persistence-jpa/log4j2-test.xml | 78 --------------------
.../injecting/jpa/JpaEntityInjectingTest.java | 3 -
.../persistence/jpa/JpaBootstrappingTest.java | 3 -
.../jpa/JpaExceptionTranslationTest.java | 7 --
...xceptionTranslationTest_usingTransactional.java | 6 --
.../testdomain/persistence/jpa/JpaJaxbTest.java | 4 --
.../testdomain/persistence/jpa/JpaQueryTest.java | 3 -
.../JpaGeneratedLongIdEntityLifecycleTest.java | 3 -
...JpaNonGeneratedStringIdEntityLifecycleTest.java | 3 -
.../springdata/SpringDataJpaBootstrappingTest.java | 3 -
...actionRollbackTest_usingInteractionService.java | 4 --
...actionRollbackTest_usingTransactionService.java | 4 --
...TransactionRollbackTest_usingTransactional.java | 3 -
.../jpa/JpaTransactionScopeListenerTest.java | 4 --
regressiontests/pom.xml | 29 --------
regressiontests/publishing-jpa/log4j2-test.xml | 78 --------------------
.../publishing/jpa/JpaCommandPublishingTest.java | 6 --
.../publishing/jpa/JpaEntityPublishingTest.java | 6 --
.../publishing/jpa/JpaExecutionPublishingTest.java | 6 --
.../jpa/JpaLifecycleEventPublishingTest.java | 12 +---
.../jpa/JpaPropertyBulkPublishingTest.java | 6 --
.../publishing/jpa/JpaPropertyPublishingTest.java | 6 --
.../jpa/JpaPropertySinglePublishingTest.java | 6 --
.../rest-jpa/log4j2-debug-persistence.xml | 75 --------------------
regressiontests/rest-jpa/log4j2-test.xml | 78 --------------------
.../testdomain/rest/jpa/JsonValueEncoderTest.java | 4 --
.../testdomain/rest/jpa/RestServiceStressTest.java | 4 --
.../testdomain/rest/jpa/RestServiceTest.java | 4 --
regressiontests/value/log4j2-test.xml | 78 --------------------
regressiontests/viewers-common/log4j2-test.xml | 56 ---------------
regressiontests/viewers-jpa/log4j2-test.xml | 56 ---------------
starters/pom.xml | 15 ++--
testing/fakedata/integtests/log4j2-test.xml | 78 --------------------
.../FakeDataModuleIntegTestAbstract.java | 3 -
.../CausewayViewerGraphqlIntegTestAbstract.java | 1 -
...sewayViewerRestfulObjectsIntegTestAbstract.java | 5 --
97 files changed, 28 insertions(+), 3080 deletions(-)
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/presets/CausewayPresets.java b/core/config/src/main/java/org/apache/causeway/core/config/presets/CausewayPresets.java
index 1e2321bdbb5..1a3ef08d82f 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/presets/CausewayPresets.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/presets/CausewayPresets.java
@@ -47,7 +47,6 @@ public final class CausewayPresets {
public static final String DebugCausewayInteraction = "classpath:/org/apache/causeway/core/config/presets/DebugCausewayInteraction.properties";
public static final String SilenceWicket = "classpath:/org/apache/causeway/core/config/presets/SilenceWicket.properties";
- public static final String UseLog4j2Test = "classpath:/org/apache/causeway/core/config/presets/UseLog4j2Test.properties";
public static final String H2InMemory_withUniqueSchema = "classpath:/org/apache/causeway/core/config/presets/H2InMemory_withUniqueSchema.properties";
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/presets/UseLog4j2Test.properties b/core/config/src/main/java/org/apache/causeway/core/config/presets/UseLog4j2Test.properties
deleted file mode 100644
index df0c635739f..00000000000
--- a/core/config/src/main/java/org/apache/causeway/core/config/presets/UseLog4j2Test.properties
+++ /dev/null
@@ -1,18 +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.
-
-logging.config=log4j2-test.xml
\ No newline at end of file
diff --git a/core/metamodel/log4j2-test.xml b/core/metamodel/log4j2-test.xml
deleted file mode 100644
index 7b35e50b33f..00000000000
--- a/core/metamodel/log4j2-test.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
-
-
- <Logger name="org.apache.causeway.core.metamodel.specloader.SpecificationLoaderDefault" level="warn" />
-
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
diff --git a/extensions/core/commandlog/persistence-jpa/log4j2-test.xml b/extensions/core/commandlog/persistence-jpa/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/extensions/core/commandlog/persistence-jpa/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
index 6dc732c472b..89d0de16587 100644
--- a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
+++ b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
@@ -23,10 +23,6 @@
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.commandlog.applib.integtest.model.CommandLogTestDomainModel;
import org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
@@ -41,9 +37,6 @@
CausewayModuleExtCommandLogPersistenceJpa.class,
})
-@PropertySources({
- @PropertySource(CausewayPresets.UseLog4j2Test)
-})
@EntityScan(basePackageClasses = {Counter.class})
@ComponentScan(basePackageClasses = {AppManifest.class, CommandLogTestDomainModel.class})
public class AppManifest {
diff --git a/extensions/core/commandlog/pom.xml b/extensions/core/commandlog/pom.xml
index 8dc048b440b..60b485add7e 100644
--- a/extensions/core/commandlog/pom.xml
+++ b/extensions/core/commandlog/pom.xml
@@ -62,20 +62,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.causeway.testing</groupId>
- <artifactId>causeway-testing</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/extensions/core/excel/integtests/log4j2-test.xml b/extensions/core/excel/integtests/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/extensions/core/excel/integtests/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/extensions/core/excel/integtests/pom.xml b/extensions/core/excel/integtests/pom.xml
index 18233e7e090..daad2120db1 100644
--- a/extensions/core/excel/integtests/pom.xml
+++ b/extensions/core/excel/integtests/pom.xml
@@ -69,18 +69,6 @@ under the License.
</testResources>
</build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.causeway.testing</groupId>
- <artifactId>causeway-testing</artifactId>
- <scope>import</scope>
- <type>pom</type>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
diff --git a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
index 8fb67eb5b51..4b141941091 100644
--- a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -24,7 +24,6 @@
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
import org.apache.causeway.core.config.presets.CausewayPresets;
@@ -41,7 +40,6 @@
@SpringBootTest(
classes = ExcelModuleIntegTestAbstract.AppManifest.class
)
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@ContextConfiguration
@Transactional
public abstract class ExcelModuleIntegTestAbstract extends CausewayIntegrationTestAbstractWithFixtures {
diff --git a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
index 6cca8abec6e..c62bf6a30c8 100644
--- a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
+++ b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
@@ -24,11 +24,8 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.executionlog.applib.integtest.ExecutionLog_IntegTestAbstract;
import org.apache.causeway.extensions.executionlog.applib.integtest.model.ExecutionLogTestDomainModel;
@@ -49,9 +46,6 @@ public class ExecutionLog_IntegTest extends ExecutionLog_IntegTestAbstract {
CausewayModuleSecurityBypass.class,
CausewayModuleExtExecutionLogPersistenceJpa.class,
})
- @PropertySources({
- @PropertySource(CausewayPresets.UseLog4j2Test)
- })
@EntityScan(basePackageClasses = {Counter.class})
@ComponentScan(basePackageClasses = {AppManifest.class, ExecutionLogTestDomainModel.class})
public static class AppManifest {
diff --git a/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java b/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
index b91dc9ab5fd..cc7a05cc87b 100644
--- a/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
+++ b/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
@@ -24,11 +24,8 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.executionoutbox.applib.integtest.ExecutionOutbox_IntegTestAbstract;
import org.apache.causeway.extensions.executionoutbox.applib.integtest.model.ExecutionOutboxTestDomainModel;
@@ -49,9 +46,6 @@ public class ExecutionOutbox_IntegTest extends ExecutionOutbox_IntegTestAbstract
CausewayModuleSecurityBypass.class,
CausewayModuleExtExecutionOutboxPersistenceJpa.class,
})
- @PropertySources({
- @PropertySource(CausewayPresets.UseLog4j2Test)
- })
@EntityScan(basePackageClasses = {Counter.class})
@ComponentScan(basePackageClasses = {AppManifest.class, ExecutionOutboxTestDomainModel.class})
public static class AppManifest {
diff --git a/extensions/core/executionoutbox/restclient/log4j2-test.xml b/extensions/core/executionoutbox/restclient/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/extensions/core/executionoutbox/restclient/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
index 53d0ad70c14..7e14d45c9a9 100644
--- a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
+++ b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
@@ -35,8 +35,6 @@
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Propagation;
@@ -91,9 +89,6 @@ public class OutboxRestClient_IntegTest {
@EnableAutoConfiguration
@Configuration
- @PropertySources({
- @PropertySource(CausewayPresets.UseLog4j2Test)
- })
@EntityScan(basePackageClasses = {Counter.class})
@ComponentScan(basePackageClasses = {TestManifest.class, Counter.class})
public static class TestManifest {
diff --git a/extensions/core/executionrepublisher/pom.xml b/extensions/core/executionrepublisher/pom.xml
index 6558531571a..2950f159f0d 100644
--- a/extensions/core/executionrepublisher/pom.xml
+++ b/extensions/core/executionrepublisher/pom.xml
@@ -42,22 +42,6 @@
<artifactId>causeway-extensions-executionrepublisher-applib</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions-executionlog</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions-executionoutbox</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/extensions/security/audittrail/persistence-jpa/log4j2-test.xml b/extensions/security/audittrail/persistence-jpa/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/extensions/security/audittrail/persistence-jpa/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
index 327a1d2894e..6710fa7ea11 100644
--- a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
+++ b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
@@ -26,12 +26,9 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.audittrail.applib.integtests.AuditTrail_IntegTestAbstract;
import org.apache.causeway.extensions.audittrail.applib.integtests.model.AuditTrailTestDomainModel;
@@ -59,9 +56,6 @@ public class AuditTrail_IntegTest extends AuditTrail_IntegTestAbstract {
// entities, eager meta-model introspection
Counter.class,
})
- @PropertySources({
- @PropertySource(CausewayPresets.UseLog4j2Test),
- })
@ComponentScan(basePackageClasses = {AppManifest.class, AuditTrailTestDomainModel.class, CounterRepository.class})
@EntityScan(basePackageClasses = {Counter.class})
public static class AppManifest {
diff --git a/extensions/security/audittrail/pom.xml b/extensions/security/audittrail/pom.xml
index bc5acaf268f..7c2ed27b0df 100644
--- a/extensions/security/audittrail/pom.xml
+++ b/extensions/security/audittrail/pom.xml
@@ -61,14 +61,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.causeway.testing</groupId>
- <artifactId>causeway-testing-integtestsupport</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
diff --git a/extensions/security/secman/persistence-jpa/log4j2-test.xml b/extensions/security/secman/persistence-jpa/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/extensions/security/secman/persistence-jpa/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java b/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
index 3aa0e78d5ac..c3748c268e3 100644
--- a/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
+++ b/extensions/security/secman/persistence-jpa/src/test/java/org/apache/causeway/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository_IntegTest.java
@@ -22,11 +22,8 @@
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.secman.applib.ApplicationPermissionRepositoryIntegTestAbstract;
import org.apache.causeway.extensions.secman.applib.mmm.MmmModule;
@@ -48,9 +45,6 @@ class ApplicationPermissionRepository_IntegTest extends ApplicationPermissionRep
MmmModule.class,
})
- @PropertySources({
- @PropertySource(CausewayPresets.UseLog4j2Test),
- })
public static class AppManifest {
}
diff --git a/extensions/security/secman/pom.xml b/extensions/security/secman/pom.xml
index 25f9cdb0ecc..2513b393380 100644
--- a/extensions/security/secman/pom.xml
+++ b/extensions/security/secman/pom.xml
@@ -79,15 +79,6 @@
<artifactId>causeway-extensions-secman-delegated-springoauth2</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.causeway.testing</groupId>
- <artifactId>causeway-testing-integtestsupport</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
diff --git a/extensions/security/sessionlog/persistence-jpa/log4j2-test.xml b/extensions/security/sessionlog/persistence-jpa/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/extensions/security/sessionlog/persistence-jpa/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java b/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
index 48bddd67529..420fa14ef59 100644
--- a/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
+++ b/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/sessionlog/jpa/integtests/SessionLog_IntegTest.java
@@ -22,11 +22,8 @@
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.sessionlog.applib.integtests.SessionLogIntegTestAbstract;
import org.apache.causeway.extensions.sessionlog.jpa.CausewayModuleExtSessionLogPersistenceJpa;
@@ -45,9 +42,6 @@ public class SessionLog_IntegTest extends SessionLogIntegTestAbstract {
CausewayModuleSecurityBypass.class,
CausewayModuleExtSessionLogPersistenceJpa.class,
})
- @PropertySources({
- @PropertySource(CausewayPresets.UseLog4j2Test),
- })
public static class AppManifest {
}
diff --git a/extensions/security/sessionlog/pom.xml b/extensions/security/sessionlog/pom.xml
index 09cc382dbf4..8efbf5baa41 100644
--- a/extensions/security/sessionlog/pom.xml
+++ b/extensions/security/sessionlog/pom.xml
@@ -57,15 +57,6 @@
<artifactId>causeway-extensions-sessionlog-persistence-jpa</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.causeway.testing</groupId>
- <artifactId>causeway-testing-integtestsupport</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
diff --git a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_Abstract_IntegTest.java b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_Abstract_IntegTest.java
index be6456b50f3..f9ddf09a1c6 100644
--- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_Abstract_IntegTest.java
+++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_Abstract_IntegTest.java
@@ -27,8 +27,6 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionException;
@@ -38,7 +36,6 @@
import org.apache.causeway.applib.services.jaxb.JaxbService;
import org.apache.causeway.applib.services.metamodel.Config;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
@@ -55,9 +52,6 @@ public abstract class PdfjsViewer_Abstract_IntegTest extends CausewayIntegration
CausewayModuleCoreRuntimeServices.class,
CausewayModulePersistenceCommons.class,
})
- @PropertySources({
- @PropertySource(CausewayPresets.UseLog4j2Test)
- })
public static class AppManifestBase {
@Bean
diff --git a/incubator/extensions/core/commandreplay/secondary/log4j2-test.xml b/incubator/extensions/core/commandreplay/secondary/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/incubator/extensions/core/commandreplay/secondary/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java b/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
index 3a03b1abae2..cc8bf5fc71b 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
@@ -26,9 +26,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.TestPropertySource;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.internaltestsupport.annotations.DisabledIfRunningWithSurefire;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.causeway.extensions.commandreplay.secondary.config.SecondaryConfig;
@@ -43,9 +40,6 @@
// "causeway.core.meta-model.introspector.parallelize=false",
// "logging.level.ObjectSpecificationAbstract=TRACE"
})
-@TestPropertySource({
- CausewayPresets.UseLog4j2Test,
-})
//intended only for manual verification.
@DisabledIfRunningWithSurefire
//@Slf4j
diff --git a/log4j2.xml b/log4j2.xml
deleted file mode 100644
index cca603d27e8..00000000000
--- a/log4j2.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-<Configuration status="warn">
- <Appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} - %msg%n" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.causeway.tooling" level="info" additivity="false">
- <appender-ref ref="console" />
- </Logger>
- <Root level="warn" additivity="false">
- <appender-ref ref="console" />
- </Root>
- </Loggers>
-</Configuration>
diff --git a/regressiontests/base/log4j2-debug-persistence.xml b/regressiontests/base/log4j2-debug-persistence.xml
deleted file mode 100644
index 1aec9b2b7bb..00000000000
--- a/regressiontests/base/log4j2-debug-persistence.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="DataNucleus.Persistence" level="debug"/>
- <logger name="DataNucleus.Transaction" level="debug"/>
- <logger name="DataNucleus.Datastore.Schema" level="debug"/>
- <logger name="DataNucleus.Datastore.Native" level="debug"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/base/logging-dn-enhance.properties b/regressiontests/base/logging-dn-enhance.properties
deleted file mode 100644
index ca165acc786..00000000000
--- a/regressiontests/base/logging-dn-enhance.properties
+++ /dev/null
@@ -1,41 +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.
-
-# LOG4J Configuration
-# ===================
-
-# Basic logging goes to "datanucleus.log"
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-#log4j.appender.A1.Threshold=INFO
-
-# Categories
-# Each category can be set to a "level", and to direct to an appender
-
-# Default to DEBUG level for all DataNucleus categories
-log4j.logger.DataNucleus = DEBUG, A1
-
-log4j.category.com.mchange.v2.c3p0=INFO, A1
-log4j.category.com.mchange.v2.resourcepool=INFO, A1
-log4j.category.org.logicalcobwebs.proxool=INFO,A1
-
-
-# Hbase libs logging
-log4j.category.org.apache.hadoop=INFO,A1
-log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file
diff --git a/regressiontests/bootstrapping/log4j2-debug-persistence.xml b/regressiontests/bootstrapping/log4j2-debug-persistence.xml
deleted file mode 100644
index 1aec9b2b7bb..00000000000
--- a/regressiontests/bootstrapping/log4j2-debug-persistence.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="DataNucleus.Persistence" level="debug"/>
- <logger name="DataNucleus.Transaction" level="debug"/>
- <logger name="DataNucleus.Datastore.Schema" level="debug"/>
- <logger name="DataNucleus.Datastore.Native" level="debug"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/bootstrapping/log4j2-test.xml b/regressiontests/bootstrapping/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/bootstrapping/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/AutoConfigurationTest.java b/regressiontests/bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/AutoConfigurationTest.java
index 18592270183..5563edeb198 100644
--- a/regressiontests/bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/AutoConfigurationTest.java
+++ b/regressiontests/bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/AutoConfigurationTest.java
@@ -61,8 +61,7 @@
})
@TestPropertySource({
CausewayPresets.SilenceMetaModel,
- CausewayPresets.SilenceProgrammingModel,
- CausewayPresets.UseLog4j2Test,
+ CausewayPresets.SilenceProgrammingModel
})
class AutoConfigurationTest {
diff --git a/regressiontests/bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceInjectPriorityTest.java b/regressiontests/bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceInjectPriorityTest.java
index ae7705f429e..db586b9d096 100644
--- a/regressiontests/bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceInjectPriorityTest.java
+++ b/regressiontests/bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceInjectPriorityTest.java
@@ -68,7 +68,6 @@
@TestPropertySource({
CausewayPresets.SilenceMetaModel,
CausewayPresets.SilenceProgrammingModel,
- CausewayPresets.UseLog4j2Test
})
class SpringServiceInjectPriorityTest {
diff --git a/regressiontests/bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java b/regressiontests/bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java
index 3a0d60a6d70..05be1bc5e70 100644
--- a/regressiontests/bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java
+++ b/regressiontests/bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java
@@ -60,7 +60,6 @@
//CausewayPresets.DebugDiscovery
CausewayPresets.SilenceMetaModel,
CausewayPresets.SilenceProgrammingModel,
- CausewayPresets.UseLog4j2Test,
})
//@Incubating("with development work on 'v2' the reference list of services constantly changes")
class SpringServiceProvisioningTest {
diff --git a/regressiontests/cmdexecauditsess/persistence-jpa/log4j2-test.xml b/regressiontests/cmdexecauditsess/persistence-jpa/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/cmdexecauditsess/persistence-jpa/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java b/regressiontests/cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
index 1ff7574f396..3d98b85d5ec 100644
--- a/regressiontests/cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
+++ b/regressiontests/cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
@@ -26,11 +26,8 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.extensions.audittrail.jpa.CausewayModuleExtAuditTrailPersistenceJpa;
import org.apache.causeway.extensions.audittrail.jpa.dom.AuditTrailEntry;
@@ -63,9 +60,6 @@ public class CmdExecAuditSessLog_IntegTest extends CmdExecAuditSessLog_IntegTest
CausewayModuleExtAuditTrailPersistenceJpa.class,
CausewayModuleExtSessionLogPersistenceJpa.class,
})
- @PropertySources({
- @PropertySource(CausewayPresets.UseLog4j2Test)
- })
@EntityScan(basePackageClasses = {Counter.class})
@ComponentScan(basePackageClasses = {AppManifest.class, CmdExecAuditSessTestDomainModel.class})
public static class AppManifest {
diff --git a/regressiontests/cmdexecauditsess/pom.xml b/regressiontests/cmdexecauditsess/pom.xml
index 34f36815f33..8e59058198e 100644
--- a/regressiontests/cmdexecauditsess/pom.xml
+++ b/regressiontests/cmdexecauditsess/pom.xml
@@ -43,21 +43,6 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.causeway.testing</groupId>
- <artifactId>causeway-testing</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
<dependency>
<groupId>org.apache.causeway.regressiontests</groupId>
<artifactId>causeway-regressiontests-cmdexecauditsess-generic</artifactId>
diff --git a/regressiontests/config/log4j2-debug-persistence.xml b/regressiontests/config/log4j2-debug-persistence.xml
deleted file mode 100644
index 1aec9b2b7bb..00000000000
--- a/regressiontests/config/log4j2-debug-persistence.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="DataNucleus.Persistence" level="debug"/>
- <logger name="DataNucleus.Transaction" level="debug"/>
- <logger name="DataNucleus.Datastore.Schema" level="debug"/>
- <logger name="DataNucleus.Datastore.Native" level="debug"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/config/log4j2-test.xml b/regressiontests/config/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/config/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest.java b/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest.java
index cfc8b8c0091..7b7ec29d636 100644
--- a/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest.java
+++ b/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest.java
@@ -30,15 +30,13 @@
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.CausewayModuleCoreConfig;
-import org.apache.causeway.core.config.presets.CausewayPresets;
@SpringBootTest(
classes = {
CausewayModuleCoreConfig.class
})
@TestPropertySource({
- "classpath:/application-config-test.properties",
- CausewayPresets.UseLog4j2Test
+ "classpath:/application-config-test.properties"
})
class CausewayConfigBeanTest {
diff --git a/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest_usingHeadless.java b/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest_usingHeadless.java
index f06ed68a316..37d786ca65e 100644
--- a/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest_usingHeadless.java
+++ b/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/CausewayConfigBeanTest_usingHeadless.java
@@ -29,7 +29,6 @@
import org.springframework.test.context.TestPropertySource;
import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
@SpringBootTest(
@@ -38,8 +37,7 @@
}
)
@TestPropertySource({
- "classpath:/application-config-test.properties",
- CausewayPresets.UseLog4j2Test
+ "classpath:/application-config-test.properties"
})
class CausewayConfigBeanTest_usingHeadless {
diff --git a/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/EmailServiceDefault_IntegTest.java b/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/EmailServiceDefault_IntegTest.java
index 4b06f2a3d89..6fd7e46ffb7 100644
--- a/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/EmailServiceDefault_IntegTest.java
+++ b/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/EmailServiceDefault_IntegTest.java
@@ -47,7 +47,6 @@
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.io.TextUtils;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.core.runtimeservices.email.EmailServiceDefault;
import org.apache.causeway.testdomain.conf.Configuration_headless;
@@ -61,8 +60,7 @@
}
)
@TestPropertySource({
- "classpath:/application-config-test.properties",
- CausewayPresets.UseLog4j2Test
+ "classpath:/application-config-test.properties"
})
class EmailServiceDefault_IntegTest {
diff --git a/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/FooTest.java b/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/FooTest.java
index 6a74d40d72f..0024e118b9e 100644
--- a/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/FooTest.java
+++ b/regressiontests/config/src/test/java/org/apache/causeway/testdomain/config/FooTest.java
@@ -35,57 +35,52 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.TestPropertySource;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
@SpringBootTest(
- classes = {
+ classes = {
FooTest.Setup.class
- },
+ },
properties = {
-
"foo.flag=true",
"foo.uuid=${random.uuid}",
"foo.random-schema=test_${random.uuid}",
"foo.ConnectionURL=jdbc:h2:mem:test"
})
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@EnableConfigurationProperties(FooProperties.class)
class FooTest {
-
+
@Configuration
static class Setup {
-
+
@ConfigurationProperties(prefix = "foo")
@Bean @Named("foo-as-map")
public Map<String, String> getAsMap() {
return new HashMap<>();
}
-
+
}
- @Inject
+ @Inject
private FooProperties foo;
-
- @Inject @Named("foo-as-map")
+
+ @Inject @Named("foo-as-map")
private Map<String, String> fooAsMap;
@Test
void foo() {
assertNotNull(foo);
assertTrue(foo.isFlag());
-
+
assertNotNull(foo.getUuid());
assertNotNull(foo.getRandomSchema());
assertNotNull(foo.getConnectionURL());
-
+
System.out.println(foo);
-
+
assertNotNull(fooAsMap);
assertFalse(fooAsMap.isEmpty());
System.out.println(fooAsMap);
-
+
}
}
diff --git a/regressiontests/core-wrapperfactory/log4j2-test.xml b/regressiontests/core-wrapperfactory/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/core-wrapperfactory/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java b/regressiontests/core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
index b585f95a4c1..dd4a5759aa0 100644
--- a/regressiontests/core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
+++ b/regressiontests/core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
@@ -61,8 +61,7 @@ public abstract class CoreWrapperFactory_IntegTestAbstract extends CausewayInteg
})
@EntityScan(basePackageClasses = Counter.class)
@PropertySources({
- @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
- @PropertySource(CausewayPresets.UseLog4j2Test),
+ @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema)
})
public static class AppManifest {
}
diff --git a/regressiontests/cucumber/log4j2-debug-persistence.xml b/regressiontests/cucumber/log4j2-debug-persistence.xml
deleted file mode 100644
index 1aec9b2b7bb..00000000000
--- a/regressiontests/cucumber/log4j2-debug-persistence.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="DataNucleus.Persistence" level="debug"/>
- <logger name="DataNucleus.Transaction" level="debug"/>
- <logger name="DataNucleus.Datastore.Schema" level="debug"/>
- <logger name="DataNucleus.Datastore.Native" level="debug"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/cucumber/log4j2-test.xml b/regressiontests/cucumber/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/cucumber/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/domainmodel/log4j2-debug-persistence.xml b/regressiontests/domainmodel/log4j2-debug-persistence.xml
deleted file mode 100644
index 1aec9b2b7bb..00000000000
--- a/regressiontests/domainmodel/log4j2-debug-persistence.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="DataNucleus.Persistence" level="debug"/>
- <logger name="DataNucleus.Transaction" level="debug"/>
- <logger name="DataNucleus.Datastore.Schema" level="debug"/>
- <logger name="DataNucleus.Datastore.Native" level="debug"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/domainmodel/log4j2-test.xml b/regressiontests/domainmodel/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/domainmodel/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java b/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java
index aa9d3c88002..61b420acd30 100644
--- a/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java
+++ b/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java
@@ -53,7 +53,6 @@
})
@TestPropertySource({
CausewayPresets.IntrospectFully,
- CausewayPresets.UseLog4j2Test,
CausewayPresets.SilenceMetaModel,
CausewayPresets.SilenceProgrammingModel
})
diff --git a/regressiontests/eventhandling/log4j2-debug-persistence.xml b/regressiontests/eventhandling/log4j2-debug-persistence.xml
deleted file mode 100644
index 8273bd8db94..00000000000
--- a/regressiontests/eventhandling/log4j2-debug-persistence.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/eventhandling/log4j2-test.xml b/regressiontests/eventhandling/log4j2-test.xml
deleted file mode 100644
index 3bf0ccda217..00000000000
--- a/regressiontests/eventhandling/log4j2-test.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/factory/log4j2-debug-persistence.xml b/regressiontests/factory/log4j2-debug-persistence.xml
deleted file mode 100644
index 1aec9b2b7bb..00000000000
--- a/regressiontests/factory/log4j2-debug-persistence.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="DataNucleus.Persistence" level="debug"/>
- <logger name="DataNucleus.Transaction" level="debug"/>
- <logger name="DataNucleus.Datastore.Schema" level="debug"/>
- <logger name="DataNucleus.Datastore.Native" level="debug"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/factory/log4j2-test.xml b/regressiontests/factory/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/factory/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java b/regressiontests/factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
index 0b8e4133ef7..5e0fde8013a 100644
--- a/regressiontests/factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
+++ b/regressiontests/factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
@@ -28,15 +28,12 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
-
import org.apache.causeway.applib.ViewModel;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
@@ -48,7 +45,6 @@
Configuration_headless.class,
}
)
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
class ViewModelFactoryTest extends CausewayIntegrationTestAbstract {
// -- VIEW MODEL SAMPLES
diff --git a/regressiontests/interact/log4j2-debug-persistence.xml b/regressiontests/interact/log4j2-debug-persistence.xml
deleted file mode 100644
index 1aec9b2b7bb..00000000000
--- a/regressiontests/interact/log4j2-debug-persistence.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="DataNucleus.Persistence" level="debug"/>
- <logger name="DataNucleus.Transaction" level="debug"/>
- <logger name="DataNucleus.Datastore.Schema" level="debug"/>
- <logger name="DataNucleus.Datastore.Native" level="debug"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/interact/log4j2-test.xml b/regressiontests/interact/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/interact/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/layouts/log4j2-test.xml b/regressiontests/layouts/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/layouts/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java b/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
index 7d8045fded5..710a4041041 100644
--- a/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
+++ b/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
@@ -39,8 +39,6 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
@@ -87,9 +85,6 @@ public class Layout_Counter_IntegTest extends CausewayIntegrationTestAbstract {
CausewayModulePersistenceCommons.class,
CausewayModuleSecurityBypass.class,
})
- @PropertySources({
- @PropertySource(CausewayPresets.UseLog4j2Test)
- })
@ComponentScan(basePackageClasses = {AppManifest.class, LayoutTestDomainModel.class})
public static class AppManifest {
diff --git a/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java b/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
index 6e4b4ddf633..027040ae6f5 100644
--- a/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
+++ b/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
@@ -35,8 +35,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
import org.apache.causeway.applib.CausewayModuleApplibMixins;
@@ -77,9 +75,6 @@ public class Layout_SimpleObject_IntegTest extends CausewayIntegrationTestAbstra
CausewayModulePersistenceCommons.class,
CausewayModuleSecurityBypass.class,
})
- @PropertySources({
- @PropertySource(CausewayPresets.UseLog4j2Test)
- })
@ComponentScan(basePackageClasses = {AppManifest.class, LayoutTestDomainModel.class})
public static class AppManifest {
diff --git a/regressiontests/persistence-jpa/log4j2-debug-persistence.xml b/regressiontests/persistence-jpa/log4j2-debug-persistence.xml
deleted file mode 100644
index 1aec9b2b7bb..00000000000
--- a/regressiontests/persistence-jpa/log4j2-debug-persistence.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="DataNucleus.Persistence" level="debug"/>
- <logger name="DataNucleus.Transaction" level="debug"/>
- <logger name="DataNucleus.Datastore.Schema" level="debug"/>
- <logger name="DataNucleus.Datastore.Native" level="debug"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/persistence-jpa/log4j2-test.xml b/regressiontests/persistence-jpa/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/persistence-jpa/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
index b7facb87e23..6b39ece551f 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
@@ -30,14 +30,12 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.primitives._Longs.Bound;
import org.apache.causeway.commons.internal.primitives._Longs.Range;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.fixtures.EntityTestFixtures.Lock;
import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
@@ -57,7 +55,6 @@
properties = {
"spring.datasource.url=jdbc:h2:mem:XXX",
})
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Transactional
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@Slf4j
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java
index f5985d9cb48..899e62dde3b 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java
@@ -36,13 +36,11 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
@@ -57,7 +55,6 @@
properties = {
"spring.datasource.url=jdbc:h2:mem:JpaBootstrappingTest",//;TRACE_LEVEL_SYSTEM_OUT=3",
})
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Transactional @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
// @DirtiesContext // doesn't seem to tidy up correctly ... I see InteractionService still injected into entities in the _next_ tests run (JpaExceptionTranslationTest_usingTransactional)
class JpaBootstrappingTest extends CausewayIntegrationTestAbstract {
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest.java
index c2484aafcde..cb0f9af2fdc 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest.java
@@ -29,10 +29,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataAccessException;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.TestPropertySources;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.RegressionTestWithJpaFixtures;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.entities.JpaInventory;
@@ -45,9 +41,6 @@
"spring.datasource.url=jdbc:h2:mem:JpaExceptionTranslationTest",
}
)
-@TestPropertySources({
- @TestPropertySource(CausewayPresets.UseLog4j2Test)
-})
class JpaExceptionTranslationTest extends RegressionTestWithJpaFixtures {
@BeforeAll
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java
index e4f593e063a..a9a2ea24665 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaExceptionTranslationTest_usingTransactional.java
@@ -38,13 +38,10 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.TestPropertySources;
import org.springframework.transaction.annotation.Transactional;
import org.apache.causeway.commons.functional.ThrowingRunnable;
import org.apache.causeway.commons.functional.Try;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.JpaInventoryDao;
import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
import org.apache.causeway.testdomain.jpa.RegressionTestWithJpaFixtures;
@@ -59,9 +56,6 @@
properties = {
"spring.datasource.url=jdbc:h2:mem:JpaExceptionTranslationTest_usingTransactional",
})
-@TestPropertySources({
- @TestPropertySource(CausewayPresets.UseLog4j2Test)
-})
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class JpaExceptionTranslationTest_usingTransactional
extends RegressionTestWithJpaFixtures {
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaJaxbTest.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaJaxbTest.java
index e00506eca77..161b568cfba 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaJaxbTest.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaJaxbTest.java
@@ -23,10 +23,7 @@
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
-
import org.apache.causeway.applib.services.jaxb.JaxbService;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.JpaInventoryJaxbVm;
import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
import org.apache.causeway.testdomain.jpa.RegressionTestWithJpaFixtures;
@@ -39,7 +36,6 @@
properties = {
"spring.datasource.url=jdbc:h2:mem:JpaJaxbTest",
})
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
//@Transactional
class JpaJaxbTest extends RegressionTestWithJpaFixtures {
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
index 177a9410c1a..4b1dc99eb32 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
@@ -37,12 +37,10 @@
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
import org.apache.causeway.applib.query.Query;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.persistence.jpa.applib.services.JpaSupportService;
import org.apache.causeway.testdomain.fixtures.EntityTestFixtures.Lock;
import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
@@ -59,7 +57,6 @@
properties = {
"spring.datasource.url=jdbc:h2:mem:JpaQueryTest",
})
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@Transactional
class JpaQueryTest extends CausewayIntegrationTestAbstract {
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java
index 6dc85017e6c..ffc5fb26290 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaGeneratedLongIdEntityLifecycleTest.java
@@ -32,13 +32,11 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
import org.apache.causeway.applib.services.repository.EntityState;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmEntityUtils;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
@@ -54,7 +52,6 @@
"spring.datasource.url=jdbc:h2:mem:JpaGeneratedLongIdEntityLifecycleTest",
})
@Transactional
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
//@DirtiesContext
class JpaGeneratedLongIdEntityLifecycleTest {
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
index 906b851cafe..0a71dff6743 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/entitylifecycle/JpaNonGeneratedStringIdEntityLifecycleTest.java
@@ -32,13 +32,11 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
import org.apache.causeway.applib.services.repository.EntityState;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.MmEntityUtils;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
@@ -54,7 +52,6 @@
"spring.datasource.url=jdbc:h2:mem:JpaNonGeneratedStringIdEntityLifecycleTest",
})
@Transactional
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
//@DirtiesContext
class JpaNonGeneratedStringIdEntityLifecycleTest {
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
index 72b6fd28d85..e56256ecc0f 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
@@ -37,12 +37,10 @@
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingSpringDataJpa;
import org.apache.causeway.testdomain.jpa.springdata.Employee;
@@ -57,7 +55,6 @@
@ContextConfiguration(classes = {
Configuration_usingSpringDataJpa.class,
})
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@DirtiesContext
// @Disabled // CAUSEWAY-2789 revert
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
index 477cadab998..9c6a5e51180 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
@@ -30,14 +30,11 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
-
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.commons.internal.base._Refs.ObjectReference;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.transaction.events.TransactionCompletionStatus;
import org.apache.causeway.testdomain.jpa.JpaTestDomainPersona;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
@@ -56,7 +53,6 @@
// "logging.level.org.springframework.test.context.transaction.*=DEBUG",
// "logging.level.org.springframework.orm.jpa.*=DEBUG",
})
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@ExtendWith({CausewayInteractionHandler.class})
@DirtiesContext
@DisabledIfRunningWithSurefire
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
index 7ddfc169eec..993c3adf8d7 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
@@ -30,12 +30,9 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
-
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.commons.internal.base._Refs;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.transaction.events.TransactionCompletionStatus;
import org.apache.causeway.testdomain.jpa.JpaTestDomainPersona;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
@@ -54,7 +51,6 @@
// "logging.level.org.springframework.test.context.transaction.*=DEBUG",
// "logging.level.org.springframework.orm.jpa.*=DEBUG",
})
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@ExtendWith({CausewayInteractionHandler.class})
@DirtiesContext
@DisabledIfRunningWithSurefire
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java
index feae9c537c7..0a60a6244f7 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java
@@ -29,11 +29,9 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.JpaTestDomainPersona;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.entities.JpaBook;
@@ -56,7 +54,6 @@
// "logging.level.org.springframework.test.context.transaction.*=DEBUG"
})
@Transactional
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class JpaTransactionRollbackTest_usingTransactional
extends CausewayIntegrationTestAbstract
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
index 0c75b3b215f..446ca53eda4 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
@@ -29,12 +29,9 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
-
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.JpaTestDomainPersona;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.entities.JpaBook;
@@ -52,7 +49,6 @@
properties = {
"spring.datasource.url=jdbc:h2:mem:JpaTransactionScopeListenerTest",
})
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
/**
* With this test we manage CausewayInteractions ourselves. (not sub-classing CausewayIntegrationTestAbstract)
*/
diff --git a/regressiontests/pom.xml b/regressiontests/pom.xml
index 820528d8b16..4f7be12795c 100644
--- a/regressiontests/pom.xml
+++ b/regressiontests/pom.xml
@@ -225,35 +225,6 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.causeway.testing</groupId>
- <artifactId>causeway-testing</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.causeway.valuetypes</groupId>
- <artifactId>causeway-valuetypes</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.causeway.viewer</groupId>
- <artifactId>causeway-viewer-wicket</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
<dependency>
<groupId>org.apache.causeway.regressiontests</groupId>
<artifactId>causeway-regressiontests-base</artifactId>
diff --git a/regressiontests/publishing-jpa/log4j2-test.xml b/regressiontests/publishing-jpa/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/publishing-jpa/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaCommandPublishingTest.java b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaCommandPublishingTest.java
index 62fe1ac1707..8384e6bb710 100644
--- a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaCommandPublishingTest.java
+++ b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaCommandPublishingTest.java
@@ -22,9 +22,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.HasPersistenceStandardJpa;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.publishing.PublishingTestFactoryJpa;
@@ -44,9 +41,6 @@
"logging.level.org.springframework.orm.jpa.*=DEBUG",
"logging.level.org.apache.causeway.core.runtimeservices.session.CausewayInteractionFactoryDefault=DEBUG"
})
-@TestPropertySource({
- CausewayPresets.UseLog4j2Test
-})
@DirtiesContext
class JpaCommandPublishingTest
extends CommandPublishingTestAbstract
diff --git a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaEntityPublishingTest.java b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaEntityPublishingTest.java
index 571dc87953d..9837414eb6d 100644
--- a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaEntityPublishingTest.java
+++ b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaEntityPublishingTest.java
@@ -22,9 +22,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.HasPersistenceStandardJpa;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.publishing.PublishingTestFactoryJpa;
@@ -44,9 +41,6 @@
"logging.level.org.apache.causeway.core.runtimeservices.session.CausewayInteractionFactoryDefault=DEBUG",
"logging.level.org.apache.causeway.testdomain.util.kv.KVStoreForTesting=DEBUG",
})
-@TestPropertySource({
- CausewayPresets.UseLog4j2Test
-})
@DirtiesContext
class JpaEntityPublishingTest
extends EntityPublishingTestAbstract
diff --git a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaExecutionPublishingTest.java b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaExecutionPublishingTest.java
index 16797b8e639..4303f6331ef 100644
--- a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaExecutionPublishingTest.java
+++ b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaExecutionPublishingTest.java
@@ -22,9 +22,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.HasPersistenceStandardJpa;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.publishing.PublishingTestFactoryJpa;
@@ -45,9 +42,6 @@
"logging.level.org.apache.causeway.core.transaction.changetracking.EntityChangeTrackerDefault=DEBUG",
"logging.level.org.apache.causeway.core.runtimeservices.session.CausewayInteractionFactoryDefault=DEBUG",
})
-@TestPropertySource({
- CausewayPresets.UseLog4j2Test
-})
@DirtiesContext
class JpaExecutionPublishingTest
extends ExecutionPublishingTestAbstract
diff --git a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaLifecycleEventPublishingTest.java b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaLifecycleEventPublishingTest.java
index 6fd824bc8d0..8ca870c9ea9 100644
--- a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaLifecycleEventPublishingTest.java
+++ b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaLifecycleEventPublishingTest.java
@@ -22,11 +22,8 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
-
import org.apache.causeway.applib.events.lifecycle.AbstractLifecycleEvent;
import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.HasPersistenceStandardJpa;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.event.LifecycleEventSubscriberJpaForTesting;
@@ -49,9 +46,6 @@
//"logging.level.org.springframework.orm.jpa.*=DEBUG",
"logging.level.org.apache.causeway.testdomain.util.kv.KVStoreForTesting=DEBUG",
})
-@TestPropertySource({
- CausewayPresets.UseLog4j2Test
-})
@DirtiesContext
class JpaLifecycleEventPublishingTest
extends LifecycleEventPublishingTestAbstract
@@ -65,13 +59,13 @@ protected PublishingTestFactoryAbstract getTestFactory() {
}
@Override
- protected final void clearPublishedEvents(KVStoreForTesting kvStore) {
+ protected final void clearPublishedEvents(final KVStoreForTesting kvStore) {
LifecycleEventSubscriberJpaForTesting.clearPublishedEvents(kvStore);
}
@Override
- protected Can<BookDto> getPublishedEvents(KVStoreForTesting kvStore,
- Class<? extends AbstractLifecycleEvent<? extends IBook>> eventClass) {
+ protected Can<BookDto> getPublishedEvents(final KVStoreForTesting kvStore,
+ final Class<? extends AbstractLifecycleEvent<? extends IBook>> eventClass) {
return LifecycleEventSubscriberJpaForTesting.getPublishedEventsJpa(kvStore, eventClass);
}
diff --git a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertyBulkPublishingTest.java b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertyBulkPublishingTest.java
index 7e8a4d348e2..3104846259b 100644
--- a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertyBulkPublishingTest.java
+++ b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertyBulkPublishingTest.java
@@ -22,9 +22,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.HasPersistenceStandardJpa;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.publishing.PublishingTestFactoryJpa;
@@ -44,9 +41,6 @@
"logging.level.org.springframework.orm.jpa.*=DEBUG",
"logging.level.org.apache.causeway.testdomain.util.rest.KVStoreForTesting=DEBUG",
})
-@TestPropertySource({
- CausewayPresets.UseLog4j2Test
-})
@DirtiesContext
class JpaPropertyBulkPublishingTest
extends PropertyPublishingTestAbstract
diff --git a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertyPublishingTest.java b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertyPublishingTest.java
index fc2054488a1..105864b5440 100644
--- a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertyPublishingTest.java
+++ b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertyPublishingTest.java
@@ -22,9 +22,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.HasPersistenceStandardJpa;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.publishing.PublishingTestFactoryJpa;
@@ -44,9 +41,6 @@
"logging.level.org.springframework.orm.jpa.*=DEBUG",
"logging.level.org.apache.causeway.testdomain.util.rest.KVStoreForTesting=DEBUG",
})
-@TestPropertySource({
- CausewayPresets.UseLog4j2Test
-})
@DirtiesContext
class JpaPropertyPublishingTest
extends PropertyPublishingTestAbstract
diff --git a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertySinglePublishingTest.java b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertySinglePublishingTest.java
index b2194ffbfd0..cdefb150021 100644
--- a/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertySinglePublishingTest.java
+++ b/regressiontests/publishing-jpa/src/test/java/org/apache/causeway/testdomain/publishing/jpa/JpaPropertySinglePublishingTest.java
@@ -22,9 +22,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.HasPersistenceStandardJpa;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.publishing.PublishingTestFactoryJpa;
@@ -45,9 +42,6 @@
"logging.level.org.apache.causeway.testdomain.util.rest.KVStoreForTesting=DEBUG",
"causeway.core.runtime-services.entity-property-change-publisher.bulk.threshold=1000",
})
-@TestPropertySource({
- CausewayPresets.UseLog4j2Test
-})
@DirtiesContext
class JpaPropertySinglePublishingTest
extends PropertyPublishingTestAbstract
diff --git a/regressiontests/rest-jpa/log4j2-debug-persistence.xml b/regressiontests/rest-jpa/log4j2-debug-persistence.xml
deleted file mode 100644
index 1aec9b2b7bb..00000000000
--- a/regressiontests/rest-jpa/log4j2-debug-persistence.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="DataNucleus.Persistence" level="debug"/>
- <logger name="DataNucleus.Transaction" level="debug"/>
- <logger name="DataNucleus.Datastore.Schema" level="debug"/>
- <logger name="DataNucleus.Datastore.Native" level="debug"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/rest-jpa/log4j2-test.xml b/regressiontests/rest-jpa/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/rest-jpa/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/JsonValueEncoderTest.java b/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/JsonValueEncoderTest.java
index b1574bfe52a..6036fc08627 100644
--- a/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/JsonValueEncoderTest.java
+++ b/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/JsonValueEncoderTest.java
@@ -33,13 +33,10 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
-
import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.applib.value.Clob;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
import org.apache.causeway.commons.internal.base._Temporals;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.testdomain.conf.Configuration_headless;
import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
@@ -51,7 +48,6 @@
Configuration_headless.class,
CausewayModuleViewerRestfulObjectsJaxrsResteasy.class
})
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
class JsonValueEncoderTest {
@Inject MetaModelContext mmc;
diff --git a/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceStressTest.java b/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceStressTest.java
index a8532583f96..c191c54dd8e 100644
--- a/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceStressTest.java
+++ b/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceStressTest.java
@@ -33,11 +33,8 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
-import org.springframework.test.context.TestPropertySource;
-
import org.apache.causeway.commons.internal.base._Timing;
import org.apache.causeway.commons.internal.debug.swt._Swt;
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.jpa.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.rest.JpaRestEndpointService;
import org.apache.causeway.testing.unittestsupport.applib.annotations.DisabledIfRunningWithSurefire;
@@ -49,7 +46,6 @@
@SpringBootTest(
classes = {JpaRestEndpointService.class},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Import({
Configuration_usingJpa.class,
CausewayModuleViewerRestfulObjectsJaxrsResteasy.class
diff --git a/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceTest.java b/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceTest.java
index 0a50fcf4aa8..bcb67e779e1 100644
--- a/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceTest.java
+++ b/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceTest.java
@@ -33,9 +33,6 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
-import org.springframework.test.context.TestPropertySource;
-
-import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEventSemantics;
import org.apache.causeway.testdomain.jpa.JpaInventoryJaxbVm;
import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
@@ -52,7 +49,6 @@
CalendarEventSemantics.class // register semantics for testing
},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Import({
Configuration_usingJpa.class,
CausewayModuleViewerRestfulObjectsJaxrsResteasy.class
diff --git a/regressiontests/value/log4j2-test.xml b/regressiontests/value/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/regressiontests/value/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/regressiontests/viewers-common/log4j2-test.xml b/regressiontests/viewers-common/log4j2-test.xml
deleted file mode 100644
index ec24be91478..00000000000
--- a/regressiontests/viewers-common/log4j2-test.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
diff --git a/regressiontests/viewers-jpa/log4j2-test.xml b/regressiontests/viewers-jpa/log4j2-test.xml
deleted file mode 100644
index ec24be91478..00000000000
--- a/regressiontests/viewers-jpa/log4j2-test.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
diff --git a/starters/pom.xml b/starters/pom.xml
index 06713a8c9ef..aa9274b0f1c 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -102,13 +102,14 @@
</build>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.causeway</groupId>
- <artifactId>causeway-bom</artifactId>
- <version>${project.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
+<!-- invalid since Maven 4-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.causeway</groupId>-->
+<!-- <artifactId>causeway-bom</artifactId>-->
+<!-- <version>${project.version}</version>-->
+<!-- <scope>import</scope>-->
+<!-- <type>pom</type>-->
+<!-- </dependency>-->
<dependency>
<groupId>com.approvaltests</groupId>
diff --git a/testing/fakedata/integtests/log4j2-test.xml b/testing/fakedata/integtests/log4j2-test.xml
deleted file mode 100644
index 0ed7986e245..00000000000
--- a/testing/fakedata/integtests/log4j2-test.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<Configuration status="WARN">
- <Properties>
- <Property name="PID">????</Property>
- <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
- <Property name="LOG_LEVEL_PATTERN">%5p</Property>
- <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
- <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
- </Properties>
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
- <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
- <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
- <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
- <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
- <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
- <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
- <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-
- <logger name="org.apache.directory" level="warn"/>
- <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
-
- <logger name="DataNucleus.Persistence" level="info"/>
- <logger name="DataNucleus.Transaction" level="info"/>
- <logger name="DataNucleus.Datastore.Schema" level="info"/>
- <logger name="DataNucleus.Datastore.Native" level="info"/>
-
- <Root level="info">
- <AppenderRef ref="Console" />
- </Root>
- </Loggers>
-</Configuration>
-
-<!-- # DataNucleus Logging Categories -->
-<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
-<!-- DataNucleus.Transaction - All messages relating to transactions -->
-<!-- DataNucleus.Connection - All messages relating to Connections. -->
-<!-- DataNucleus.Query - All messages relating to queries -->
-<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
-<!-- DataNucleus.MetaData - All messages relating to MetaData -->
-<!-- DataNucleus.Datastore - All general datastore messages -->
-<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
-<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
-<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
-<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
-<!-- DataNucleus.General - All general operational messages -->
-<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
-<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
-<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
-<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
-<!-- DataNucleus.JDO - All messages general to JDO -->
-<!-- DataNucleus.JPA - All messages general to JPA -->
-<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
-<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index 19ed9fea9bd..8e63bd1fabd 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/causeway/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -26,8 +26,6 @@
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
-
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import org.apache.causeway.persistence.jpa.applib.CausewayModulePersistenceJpaApplib;
@@ -39,7 +37,6 @@
@SpringBootTest(
classes = FakeDataModuleIntegTestAbstract.TestManifest.class
)
-@TestPropertySource(CausewayPresets.UseLog4j2Test)
@ContextConfiguration
@Transactional
public abstract class FakeDataModuleIntegTestAbstract extends CausewayIntegrationTestAbstractWithFixtures {
diff --git a/viewers/graphql/testsupport/src/main/java/org/apache/causeway/viewer/graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.java b/viewers/graphql/testsupport/src/main/java/org/apache/causeway/viewer/graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.java
index 5f047de5a9f..381af415345 100644
--- a/viewers/graphql/testsupport/src/main/java/org/apache/causeway/viewer/graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.java
+++ b/viewers/graphql/testsupport/src/main/java/org/apache/causeway/viewer/graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.java
@@ -147,7 +147,6 @@ protected CausewayViewerGraphqlIntegTestAbstract(final Class<?> resourceBaseClaz
})
@PropertySources({
@PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
- @PropertySource(CausewayPresets.UseLog4j2Test),
@PropertySource(CausewayPresets.SilenceMetaModel),
@PropertySource(CausewayPresets.SilenceProgrammingModel),
})
diff --git a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/CausewayViewerRestfulObjectsIntegTestAbstract.java b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/CausewayViewerRestfulObjectsIntegTestAbstract.java
index 7c5410ca322..c8bd299b428 100644
--- a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/CausewayViewerRestfulObjectsIntegTestAbstract.java
+++ b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/CausewayViewerRestfulObjectsIntegTestAbstract.java
@@ -110,13 +110,8 @@ protected CausewayViewerRestfulObjectsIntegTestAbstract(
})
@PropertySources({
@PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
- @PropertySource(CausewayPresets.UseLog4j2Test),
@PropertySource(CausewayPresets.SilenceMetaModel),
@PropertySource(CausewayPresets.SilenceProgrammingModel),
-// @PropertySource("classpath:/H2InMemory_withUniqueSchema.properties"),
-// @PropertySource("classpath:/SilenceMetaModel.properties"),
-// @PropertySource("classpath:/SilenceProgrammingModel.properties"),
-// @PropertySource("classpath:/UseLog4j2Test.properties"),
})
public static class TestApp {
}