diff --git a/pom.xml b/pom.xml
index 21174c23..bb153aca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
jdbc:hsqldb:mem:redback-test
org.hsqldb.jdbcDriver
- DefaultLevel=INFO,Runtime=ERROR,Tool=ERROR,SQL=ERROR,Schema=ERROR,MetaData=ERROR
+ slf4j
${project.basedir}
.site-content
@@ -141,6 +141,23 @@
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ runtime
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.apache.logging.log4j
+ log4j-core
+ runtime
+
+
+
@@ -409,12 +426,7 @@
slf4j-api
${slf4j.version}
-
- org.slf4j
- slf4j-simple
- ${slf4j.version}
- test
-
+
org.slf4j
slf4j-log4j12
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 23ad85cb..0bd8031d 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 @@
test
-
- org.slf4j
- slf4j-simple
- test
-
-
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 6f0b6af3..e3c1ed83 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 @@
javax.inject
javax.inject
-
- org.slf4j
- slf4j-simple
- test
-
org.springframework
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 2f0c4e8e..d8239a52 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 @@
-
+
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 085692fb..d9428334 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 @@
javax.annotation
jsr250-api
-
- org.slf4j
- slf4j-simple
- test
-
org.junit.platform
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 341647b3..40481d36 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 @@
-
+
diff --git a/redback-common/redback-common-jpa/pom.xml b/redback-common/redback-common-jpa/pom.xml
index 30086bce..deccc5a5 100644
--- a/redback-common/redback-common-jpa/pom.xml
+++ b/redback-common/redback-common-jpa/pom.xml
@@ -35,6 +35,9 @@
Redback :: JPA Common Package
+
+
+
org.apache.archiva.redback
redback-rbac-model
@@ -44,6 +47,8 @@
redback-users-api
+
+
org.apache.openjpa
openjpa
@@ -79,17 +84,13 @@
org.springframework
spring-orm
+ runtime
-
- org.apache.logging.log4j
- log4j-jcl
-
-
- commons-logging
- commons-logging
-
+
+
+
org.hsqldb
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 a4d601f6..83d70d6f 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 @@
-
+
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 76a72e6d..97f77e4b 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 @@
-
+
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 00000000..91af3f0e
--- /dev/null
+++ b/redback-common/redback-common-jpa/src/test/resources/log4j2-test.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/redback-data-management/pom.xml b/redback-data-management/pom.xml
index ca174978..040827b2 100644
--- a/redback-data-management/pom.xml
+++ b/redback-data-management/pom.xml
@@ -80,16 +80,7 @@
commons-collections
test
-
- org.slf4j
- slf4j-simple
- test
-
-
- org.slf4j
- jul-to-slf4j
- test
-
+
org.hsqldb
hsqldb
diff --git a/redback-data-management/src/test/resources/spring-context.xml b/redback-data-management/src/test/resources/spring-context.xml
index 36479cb0..236cf8b7 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
-
+
diff --git a/redback-integrations/redback-common-integrations/pom.xml b/redback-integrations/redback-common-integrations/pom.xml
index 33df592a..d5dedd8b 100644
--- a/redback-integrations/redback-common-integrations/pom.xml
+++ b/redback-integrations/redback-common-integrations/pom.xml
@@ -170,11 +170,7 @@
easymock
test
-
- org.slf4j
- slf4j-simple
- test
-
+
org.apache.archiva.redback
redback-common-test-resources
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 3a2900f9..505d5b32 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 @@
-
+
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 130e48e5..935b7c30 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 @@
-
+
diff --git a/redback-keys/redback-keys-api/pom.xml b/redback-keys/redback-keys-api/pom.xml
index 2ffda534..15dfa7dd 100644
--- a/redback-keys/redback-keys-api/pom.xml
+++ b/redback-keys/redback-keys-api/pom.xml
@@ -38,11 +38,6 @@
org.slf4j
slf4j-api
-
- org.slf4j
- slf4j-simple
- test
-
org.junit.platform
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 eb771104..bafa46f6 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 @@
hsqldb
test
-
- org.slf4j
- slf4j-simple
- test
-
+
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 8369a252..562fccda 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 @@
-
+
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 74fde806..7c02c413 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 @@
hsqldb
test
-
- org.slf4j
- slf4j-simple
- test
-
+
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 3f0430c7..ff7486be 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 @@
-
+
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 532e1b9a..cff87351 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 @@
redback-keys-tests
test
-
- org.slf4j
- slf4j-simple
- test
-
+
diff --git a/redback-policy/pom.xml b/redback-policy/pom.xml
index fbee513f..cc0b9619 100644
--- a/redback-policy/pom.xml
+++ b/redback-policy/pom.xml
@@ -73,11 +73,6 @@
spring-context-support
test
-
- org.slf4j
- slf4j-simple
- test
-
org.junit.platform
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 ec89f4f8..46c09b6a 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 @@
-
+
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 01c0671b..27cacade 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 @@
-
+
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 65cdf6d0..fe791da3 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 @@
-
+
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 43963f29..2a4d5b0a 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 @@
-
+
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 9d72abe8..b4529722 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
-
+
diff --git a/redback-system/pom.xml b/redback-system/pom.xml
index ee02c1b6..454f8c43 100644
--- a/redback-system/pom.xml
+++ b/redback-system/pom.xml
@@ -87,11 +87,7 @@
hsqldb
test
-
- org.slf4j
- slf4j-simple
- test
-
+
org.junit.platform
diff --git a/redback-system/src/test/resources/spring-context.xml b/redback-system/src/test/resources/spring-context.xml
index a0da0f1f..dcdba2c7 100644
--- a/redback-system/src/test/resources/spring-context.xml
+++ b/redback-system/src/test/resources/spring-context.xml
@@ -40,7 +40,7 @@
-
+
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 712339ed..17681f21 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 @@
-
+
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 9c886285..f8bb79f3 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 @@
-
+
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 f2c80ad2..134134b6 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 @@
test
-
- org.slf4j
- slf4j-simple
- test
-
-
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 121a47e3..630e50bd 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 @@
redback-users-tests
test
-
- org.slf4j
- slf4j-simple
- test
-
+
diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml
new file mode 100644
index 00000000..91af3f0e
--- /dev/null
+++ b/src/test/resources/log4j2-test.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+