This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
commit 843db9ee76f942f35d27b62ea067a56289f2165f Author: Martin Stockhammer <[email protected]> AuthorDate: Sun Dec 15 10:23:49 2019 +0100 Set OpenJPA logging to commons --- pom.xml | 26 +++++++++++----- .../redback-authentication-ldap/pom.xml | 6 ---- .../redback-authentication-memory/pom.xml | 5 ---- .../src/test/resources/spring-context.xml | 2 +- .../redback-authorization-rbac/pom.xml | 5 ---- .../src/test/resources/spring-context.xml | 2 +- redback-common/redback-common-jpa/pom.xml | 17 ++++++----- .../main/resources/META-INF/persistence-hsqldb.xml | 2 +- .../src/main/resources/META-INF/persistence.xml | 2 +- .../src/test/resources/log4j2-test.xml | 35 ++++++++++++++++++++++ redback-data-management/pom.xml | 11 +------ .../src/test/resources/spring-context.xml | 2 +- .../redback-common-integrations/pom.xml | 6 +--- .../src/test/resources/spring-context.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- redback-keys/redback-keys-api/pom.xml | 5 ---- .../redback-keys-cached/pom.xml | 6 +--- .../src/test/resources/spring-context.xml | 2 +- .../redback-keys-jpa/pom.xml | 6 +--- .../src/test/resources/spring-context.xml | 2 +- .../redback-keys-memory/pom.xml | 6 +--- redback-policy/pom.xml | 5 ---- .../src/test/resources/spring-context.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- redback-system/pom.xml | 6 +--- .../src/test/resources/spring-context.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../redback-users-ldap/pom.xml | 6 ---- .../redback-users-memory/pom.xml | 6 +--- src/test/resources/log4j2-test.xml | 35 ++++++++++++++++++++++ 34 files changed, 122 insertions(+), 104 deletions(-) diff --git a/pom.xml b/pom.xml index 21174c2..bb153ac 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ <redbackTestJdbcUrl>jdbc:hsqldb:mem:redback-test</redbackTestJdbcUrl> <redbackTestJdbcDriver>org.hsqldb.jdbcDriver</redbackTestJdbcDriver> - <openjpa.Log>DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR</openjpa.Log> + <openjpa.Log>slf4j</openjpa.Log> <site.staging.base>${project.basedir}</site.staging.base> <scmPubCheckoutDirectory>.site-content</scmPubCheckoutDirectory> @@ -141,6 +141,23 @@ </pluginRepository> </pluginRepositories> + <dependencies> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + <dependencyManagement> <dependencies> <dependency> @@ -409,12 +426,7 @@ <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml index 23ad85c..0bd8031 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml @@ -86,12 +86,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - </dependencies> <build> diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml index 6f0b6af..e3c1ed8 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml +++ b/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml @@ -46,11 +46,6 @@ <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml index 2f0c4e8..d8239a5 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml +++ b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml @@ -52,7 +52,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml index 085692f..d942833 100644 --- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml +++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml @@ -78,11 +78,6 @@ <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.junit.platform</groupId> diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml index 341647b..40481d3 100644 --- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml +++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml @@ -69,7 +69,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-common/redback-common-jpa/pom.xml b/redback-common/redback-common-jpa/pom.xml index 30086bc..deccc5a 100644 --- a/redback-common/redback-common-jpa/pom.xml +++ b/redback-common/redback-common-jpa/pom.xml @@ -35,6 +35,9 @@ <name>Redback :: JPA Common Package</name> <dependencies> + + <!-- Dependencies here are dependencies that are needed by all projects that need jpa --> + <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rbac-model</artifactId> @@ -44,6 +47,8 @@ <artifactId>redback-users-api</artifactId> </dependency> + + <!-- We exclude the api dependencies and use the official ones --> <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> @@ -79,17 +84,13 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> + <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <!-- Commons logging is used by OpenJPA (openjpa.Log=commons) --> + + <dependency> <groupId>org.hsqldb</groupId> diff --git a/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence-hsqldb.xml b/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence-hsqldb.xml index a4d601f..83d70d6 100644 --- a/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence-hsqldb.xml +++ b/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence-hsqldb.xml @@ -36,7 +36,7 @@ <property name="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)" /> <property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> - <property name="openjpa.Log" value="DefaultLevel=INFO,Runtime=INFO,Tool=INFO,SQL=ERROR,Schema=ERROR,MetaData=ERROR"/> + <property name="openjpa.Log" value="slf4j"/> <property name="openjpa.jdbc.DBDictionary" value="(disableSchemaFactoryColumnTypeErrors=true,BitTypeName=CHAR(1),BooleanTypeName=CHAR(1),BooleanRepresentation=STRING_YN)"/> </properties> diff --git a/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence.xml b/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence.xml index 76a72e6..97f77e4 100644 --- a/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence.xml +++ b/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence.xml @@ -33,7 +33,7 @@ <property name="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)" /> <property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> - <property name="openjpa.Log" value="commons"/> + <property name="openjpa.Log" value="slf4j"/> <property name="openjpa.jdbc.DBDictionary" value="(disableSchemaFactoryColumnTypeErrors=true,BitTypeName=CHAR(1),BooleanTypeName=CHAR(1),BooleanRepresentation=STRING_YN)"/> </properties> </persistence-unit> diff --git a/redback-common/redback-common-jpa/src/test/resources/log4j2-test.xml b/redback-common/redback-common-jpa/src/test/resources/log4j2-test.xml new file mode 100644 index 0000000..91af3f0 --- /dev/null +++ b/redback-common/redback-common-jpa/src/test/resources/log4j2-test.xml @@ -0,0 +1,35 @@ +<?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> + <appenders> + <Console name="console" target="SYSTEM_OUT"> + <PatternLayout pattern="[%t] %-5p %c %x - %m%n"/> + </Console> + </appenders> + <loggers> + <logger name="org.apache.archiva" level="info"/> + + <root level="error" includeLocation="true"> + <appender-ref ref="console"/> + </root> + </loggers> +</configuration> + + diff --git a/redback-data-management/pom.xml b/redback-data-management/pom.xml index ca17497..040827b 100644 --- a/redback-data-management/pom.xml +++ b/redback-data-management/pom.xml @@ -80,16 +80,7 @@ <artifactId>commons-collections</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <scope>test</scope> - </dependency> + <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> diff --git a/redback-data-management/src/test/resources/spring-context.xml b/redback-data-management/src/test/resources/spring-context.xml index 36479cb..236cf8b 100644 --- a/redback-data-management/src/test/resources/spring-context.xml +++ b/redback-data-management/src/test/resources/spring-context.xml @@ -46,7 +46,7 @@ Needed because of the dependency redback-user-cache -> redback-user-jpa <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-integrations/redback-common-integrations/pom.xml b/redback-integrations/redback-common-integrations/pom.xml index 33df592..d5dedd8 100644 --- a/redback-integrations/redback-common-integrations/pom.xml +++ b/redback-integrations/redback-common-integrations/pom.xml @@ -170,11 +170,7 @@ <artifactId>easymock</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> + <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-common-test-resources</artifactId> diff --git a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml index 3a2900f..505d5b3 100644 --- a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml +++ b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml @@ -59,7 +59,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml index 130e48e..935b7c3 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml @@ -69,7 +69,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-keys/redback-keys-api/pom.xml b/redback-keys/redback-keys-api/pom.xml index 2ffda53..15dfa7d 100644 --- a/redback-keys/redback-keys-api/pom.xml +++ b/redback-keys/redback-keys-api/pom.xml @@ -38,11 +38,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.junit.platform</groupId> diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml index eb77110..bafa46f 100644 --- a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml +++ b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml @@ -86,11 +86,7 @@ <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> + </dependencies> </project> diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml index 8369a25..562fccd 100644 --- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml +++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml @@ -59,7 +59,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml b/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml index 74fde80..7c02c41 100644 --- a/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml +++ b/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml @@ -79,11 +79,7 @@ <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> + </dependencies> <build> diff --git a/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml index 3f0430c..ff7486b 100644 --- a/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml +++ b/redback-keys/redback-keys-providers/redback-keys-jpa/src/test/resources/spring-context.xml @@ -42,7 +42,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml b/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml index 532e1b9..cff8735 100644 --- a/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml +++ b/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml @@ -60,11 +60,7 @@ <artifactId>redback-keys-tests</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> + </dependencies> </project> diff --git a/redback-policy/pom.xml b/redback-policy/pom.xml index fbee513..cc0b961 100644 --- a/redback-policy/pom.xml +++ b/redback-policy/pom.xml @@ -73,11 +73,6 @@ <artifactId>spring-context-support</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.junit.platform</groupId> diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml index ec89f4f..46c09b6 100755 --- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml @@ -89,7 +89,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml index 01c0671..27cacad 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/spring-context.xml @@ -51,7 +51,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml index 65cdf6d..fe791da 100755 --- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml @@ -125,7 +125,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml index 43963f2..2a4d5b0 100755 --- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml @@ -56,7 +56,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml index 9d72abe..b452972 100755 --- a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml @@ -79,7 +79,7 @@ Needed because of the dependency redback-user-cache -> redback-user-jpa <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-system/pom.xml b/redback-system/pom.xml index ee02c1b..454f8c4 100644 --- a/redback-system/pom.xml +++ b/redback-system/pom.xml @@ -87,11 +87,7 @@ <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> + <dependency> <groupId>org.junit.platform</groupId> diff --git a/redback-system/src/test/resources/spring-context.xml b/redback-system/src/test/resources/spring-context.xml index a0da0f1..dcdba2c 100644 --- a/redback-system/src/test/resources/spring-context.xml +++ b/redback-system/src/test/resources/spring-context.xml @@ -40,7 +40,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml index 712339e..17681f2 100644 --- a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml +++ b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml @@ -63,7 +63,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="${openjpa.Log:DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR}" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml index 9c88628..f8bb79f 100644 --- a/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml +++ b/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml @@ -62,7 +62,7 @@ <entry key="openjpa.ConnectionDriverName" value="org.hsqldb.jdbcDriver" /> <entry key="openjpa.ConnectionUserName" value="sa" /> <entry key="openjpa.ConnectionPassword" value="" /> - <entry key="openjpa.Log" value="commons" /> + <entry key="openjpa.Log" value="slf4j" /> <entry key="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" /> <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> diff --git a/redback-users/redback-users-providers/redback-users-ldap/pom.xml b/redback-users/redback-users-providers/redback-users-ldap/pom.xml index f2c80ad..134134b 100644 --- a/redback-users/redback-users-providers/redback-users-ldap/pom.xml +++ b/redback-users/redback-users-providers/redback-users-ldap/pom.xml @@ -97,12 +97,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - </dependencies> <build> diff --git a/redback-users/redback-users-providers/redback-users-memory/pom.xml b/redback-users/redback-users-providers/redback-users-memory/pom.xml index 121a47e..630e50b 100644 --- a/redback-users/redback-users-providers/redback-users-memory/pom.xml +++ b/redback-users/redback-users-providers/redback-users-memory/pom.xml @@ -60,11 +60,7 @@ <artifactId>redback-users-tests</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> + </dependencies> </project> diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml new file mode 100644 index 0000000..91af3f0 --- /dev/null +++ b/src/test/resources/log4j2-test.xml @@ -0,0 +1,35 @@ +<?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> + <appenders> + <Console name="console" target="SYSTEM_OUT"> + <PatternLayout pattern="[%t] %-5p %c %x - %m%n"/> + </Console> + </appenders> + <loggers> + <logger name="org.apache.archiva" level="info"/> + + <root level="error" includeLocation="true"> + <appender-ref ref="console"/> + </root> + </loggers> +</configuration> + +
