diff --git a/util/embedded-ldap/pom.xml b/util/embedded-ldap/pom.xml
index 7e2e899c1f2..bbb1a0fa8b3 100644
--- a/util/embedded-ldap/pom.xml
+++ b/util/embedded-ldap/pom.xml
@@ -48,20 +48,14 @@
jboss-logging
- log4j
- log4j
- compile
+ org.jboss.logmanager
+ jboss-logmanager
- org.slf4j
- slf4j-api
+ org.jboss.slf4j
+ slf4j-jboss-logmanager
+ 2.0.1.Final
-
- org.slf4j
- slf4j-reload4j
- compile
-
-
org.apache.directory.server
apacheds-core-annotations
diff --git a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/LDAPEmbeddedServer.java b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/LDAPEmbeddedServer.java
index f20e2f200e5..269c8f21bd2 100644
--- a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/LDAPEmbeddedServer.java
+++ b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/LDAPEmbeddedServer.java
@@ -55,6 +55,12 @@ import org.jboss.logging.Logger;
*/
public class LDAPEmbeddedServer {
+ static {
+ if (System.getProperty("java.util.logging.manager") == null) {
+ System.setProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager");
+ }
+ }
+
private static final Logger log = Logger.getLogger(LDAPEmbeddedServer.class);
private static final int PAGE_SIZE = 30;
diff --git a/util/embedded-ldap/src/main/resources/log4j.properties b/util/embedded-ldap/src/main/resources/log4j.properties
deleted file mode 100644
index 81f5973a057..00000000000
--- a/util/embedded-ldap/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2016 Red Hat, Inc. and/or its affiliates
-# and other contributors as indicated by the @author tags.
-#
-# Licensed 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.rootLogger=info, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] %m%n
-
-log4j.logger.org.keycloak=info
-log4j.logger.org.apache.directory.api=warn
-log4j.logger.org.apache.directory.server.core=warn
-
-# Enable to view detailed AS REQ and TGS REQ requests to embedded Kerberos server
-#log4j.logger.org.apache.directory.server.kerberos=debug
\ No newline at end of file
diff --git a/util/embedded-ldap/src/main/resources/logging.properties b/util/embedded-ldap/src/main/resources/logging.properties
new file mode 100644
index 00000000000..4edf09d87f5
--- /dev/null
+++ b/util/embedded-ldap/src/main/resources/logging.properties
@@ -0,0 +1,19 @@
+loggers=org.keycloak,org.apache.directory
+
+logger.level=INFO
+
+logger.handlers=CONSOLE
+
+logger.org.keycloak.level=INFO
+logger.org.apache.directory.level=WARN
+
+handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
+handler.CONSOLE.properties=autoFlush
+handler.CONSOLE.level=DEBUG
+handler.CONSOLE.autoFlush=true
+handler.CONSOLE.formatter=PATTERN
+
+# The log format pattern for both logs
+formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
+formatter.PATTERN.properties=pattern
+formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p %t [%c] %m%n