Log4j 2.13.3 upgrade
diff --git a/conf/log4j.properties b/conf/log4j.properties
deleted file mode 100644
index 5e707fc..0000000
--- a/conf/log4j.properties
+++ /dev/null
@@ -1,28 +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.appender.Stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.Stdout.layout.conversionPattern=%-5p - %d{dd MMM yyyy HH:mm:ss,SSS} - %-26.26c{1} - %m\n
-
-#log4j.rootLogger=DEBUG,Stdout
-log4j.rootLogger=WARN,Stdout
-log4j.logger.org.openldap=INFO
-log4j.logger.org.apache.directory.fortress.core=INFO
-log4j.logger.org.apache.directory.fortress.realm=INFO
\ No newline at end of file
diff --git a/conf/log4j.xml b/conf/log4j.xml
new file mode 100644
index 0000000..63296ca
--- /dev/null
+++ b/conf/log4j.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="%-5p - %d{dd MMM yyyy HH:mm:ss,SSS} - %-26.26c{1} - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.directory.fortress.core" level="info"/>
+ <Logger name="org.apache.directory.fortress.realm" level="info" />
+ <Logger name="org.openldap" level="info" />
+ <Root level="warn">
+ <AppenderRef ref="console"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/impl/pom.xml b/impl/pom.xml
index 2e37b1d..c7c420e 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -53,9 +53,9 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.log4j12.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${slf4j.impl.version}</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index e52e42b..54689bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,8 +100,8 @@
<findbugs.annotation.version>1.0.0</findbugs.annotation.version>
<junit-addons.version>0.1</junit-addons.version>
<skin.version>1.0.2</skin.version>
- <slf4j.api.version>1.7.21</slf4j.api.version>
- <slf4j.log4j12.version>1.7.21</slf4j.log4j12.version>
+ <slf4j.api.version>1.7.29</slf4j.api.version>
+ <slf4j.impl.version>2.13.3</slf4j.impl.version>
<tomcat.catalina.version>9.0.29</tomcat.catalina.version>
<findbugs.annotations.version>1.0.0</findbugs.annotations.version>
</properties>
@@ -440,10 +440,10 @@
<!-- logging implementation used for unit tests -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
- <version>${slf4j.log4j12.version}</version>
+ <version>${slf4j.impl.version}</version>
</dependency>
<dependency>
