This is an automated email from the ASF dual-hosted git repository.
pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new ba999ed RANGER-3498 : RANGER : Remove log4j1 dependencies.
ba999ed is described below
commit ba999ed35d28226a74965bca16b6efc9c46b5df2
Author: mateenmansoori <ma3naus...@gmail.com>
AuthorDate: Tue Jan 25 16:23:35 2022 +0530
RANGER-3498 : RANGER : Remove log4j1 dependencies.
Signed-off-by: pradeep <prad...@apache.org>
---
distro/src/main/assembly/kms.xml | 5 +++--
kms/config/kms-webapp/kms-logback.xml | 8 +++-----
kms/pom.xml | 9 ++++++++-
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml
index 32bbefa..33d754b 100755
--- a/distro/src/main/assembly/kms.xml
+++ b/distro/src/main/assembly/kms.xml
@@ -40,9 +40,10 @@
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
<include>org.eclipse.persistence:javax.persistence</include>
<include>com.googlecode.log4jdbc:log4jdbc</include>
- <include>log4j:log4j</include>
<include>org.slf4j:slf4j-api</include>
- <include>org.slf4j:slf4j-log4j12</include>
+
<include>org.slf4j:log4j-over-slf4j:jar:${slf4j.version}</include>
+
<include>ch.qos.logback:logback-classic:jar:${logback.version}</include>
+
<include>ch.qos.logback:logback-core:jar:${logback.version}</include>
<include>com.codahale.metrics:metrics-core</include>
<include>org.slf4j:jul-to-slf4j</include>
<include>commons-logging:commons-logging</include>
diff --git a/kms/config/kms-webapp/kms-logback.xml
b/kms/config/kms-webapp/kms-logback.xml
index b7290c0..d47e86c 100644
--- a/kms/config/kms-webapp/kms-logback.xml
+++ b/kms/config/kms-webapp/kms-logback.xml
@@ -27,18 +27,16 @@
<pattern>%d{ISO8601} %m%n</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${kms.log.dir}/kms-audit-${hostname}-${user}.log.%d{'.'yyyy-MM-dd}</fileNamePattern>
+
<fileNamePattern>${kms.log.dir}/kms-audit-${hostname}-${user}.log.%d{yyyy-MM-dd}</fileNamePattern>
</rollingPolicy>
</appender>
- <appender name="kms-metric"
class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <appender name="kms-metric" class="ch.qos.logback.core.FileAppender">
<!--See also
http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
<Append>false</Append>
<File>${kms.log.dir}/ranger_kms_metric_data_for_${metric.type}.log</File>
<encoder>
<pattern>%m%n</pattern>
</encoder>
- <rollingPolicy
class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"/>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"/>
</appender>
<appender name="kms" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!--See http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
@@ -50,7 +48,7 @@
<pattern>%d{ISO8601} %-5p %c{1} - %m%n</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${kms.log.dir}/ranger-kms-${hostname}-${user}.log.%d{'.'yyyy-MM-dd}</fileNamePattern>
+
<fileNamePattern>${kms.log.dir}/ranger-kms-${hostname}-${user}.log.%d{yyyy-MM-dd}</fileNamePattern>
</rollingPolicy>
</appender>
<logger
name="com.sun.jersey.server.wadl.generators.WadlGeneratorJAXBGrammarGenerator"
level="OFF"/>
diff --git a/kms/pom.xml b/kms/pom.xml
index e408021..35fbe8a 100644
--- a/kms/pom.xml
+++ b/kms/pom.xml
@@ -46,7 +46,6 @@
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -93,6 +92,14 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
