This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-commander.git

commit bb1655c4bf5a5a88161852d135522c26e55ad5bd
Author: John Eipe <john77eipe@gmail.com>
AuthorDate: Sat Jul 4 22:04:36 2020 +0530

    Log4j upgrade changes
---
 pom.xml                             | 20 +++++++++++---------
 src/main/resources/log4j.properties | 21 +--------------------
 src/main/resources/log4j2.xml       |  3 ---
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7334cc3..aaaf061 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,9 +82,10 @@
     <fortress.realm.version>2.0.5</fortress.realm.version>
     <wicket.version>8.8.0</wicket.version>
     <wicket.googlecode.version>8.6.0</wicket.googlecode.version>
-    <version.log4j>1.2.17</version.log4j>
+    <version.log4j>2.13.3</version.log4j>
     <version.ant>1.9.7</version.ant>
-    <version.slf4j.log4j12>1.7.7</version.slf4j.log4j12>
+    <version.slf4j.api>1.7.29</version.slf4j.api>
+    <version.slf4j.impl>2.13.3</version.slf4j.impl>
     <spring.security.version>5.3.2.RELEASE</spring.security.version>
     <javadoc.version>2.9.1</javadoc.version>
     <jetty.version>8.1.8.v20121106</jetty.version>
@@ -102,15 +103,15 @@
     </dependency>
 
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
       <version>${version.log4j}</version>
     </dependency>
     
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${version.slf4j.log4j12}</version>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <version>${version.slf4j.impl}</version>
     </dependency>
 
     <dependency>
@@ -477,7 +478,8 @@
                     <pathelement location="${org.apache.directory.fortress:fortress-core:jar}" />
                     <pathelement location="${org.openldap:accelerator-api:jar}" />
                     <pathelement location="${org.openldap:accelerator-impl:jar}" />
-                    <pathelement location="${log4j:log4j:jar}" />
+                    <pathelement location="${org.apache.logging.log4j:log4j-api:jar}" />
+                    <pathelement location="${org.apache.logging.log4j:log4j-core:jar}" />
                     <pathelement location="${org.apache.directory.api:api-all:jar}" />
                     <pathelement location="${org.apache.mina:mina-core:jar}" />
                     <pathelement location="${org.jgrapht:jgrapht-core:jar}" />
@@ -490,7 +492,7 @@
                     <pathelement location="${commons-pool:commons-pool:jar}" />
                     <pathelement location="${net.sf.ehcache:ehcache-core:jar}" />
                     <pathelement location="${org.slf4j:slf4j-api:jar}" />
-                    <pathelement location="${org.slf4j:slf4j-log4j12:jar}" />
+                    <pathelement location="${org.apache.logging.log4j:log4j-slf4j-impl:jar}" />
                     <pathelement location="${org.apache.cxf:cxf-api:jar}" />
                     <pathelement location="${javax.ws.rs:javax.ws.rs-api:jar}" />
                     <pathelement location="${javax.ws.rs:javax.ws.rs-api:jar}" />
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 8994ec5..095233a 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -17,23 +17,4 @@
 #   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.wicket=DEBUG
-log4j.logger.org.apache.wicket=INFO
-log4j.logger.RequestCycleExtra=OFF
-#log4j.logger.org.eclipse.jetty.security=DEBUG
-#log4j.logger.org.springframework.security=DEBUG
-log4j.logger.org.springframework.security=INFO
-log4j.logger.org.apache.wicket.protocol.http.HttpSessionStore=INFO
-log4j.logger.org.apache.wicket.version=INFO
-log4j.logger.org.apache.wicket.RequestCycle=INFO
-
-#log4j.logger.org.apache.wicket.core.util.resource.locator.ResourceStreamLocator=DEBUG
-log4j.logger.org.apache.directory.fortress.web=INFO
-log4j.logger.org.apache.directory.fortress.core=INFO
\ No newline at end of file
+log4j.logger.RequestCycleExtra=OFF
\ No newline at end of file
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index d47ff4a..9603017 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -20,9 +20,6 @@
  -->
 <Configuration>
     <Appenders>
-        <File name="file" fileName="fortress.log" append="true" maxFileSize="10MB" maxBackupIndex="10">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:sss} %-5p %c{1}:%L - %m%n"/>
-        </File>
         <Console name="console" target="SYSTEM_OUT">
             <PatternLayout pattern="%-5p - %d{dd MMM yyyy HH:mm:ss,SSS} - %-26.26c{1} - %m%n"/>
         </Console>