You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2022/01/24 17:02:52 UTC
[ranger] branch master updated: RANGER-3498: removed log4j-1.x dependency, replaced references to org.apache.log4j and org.apache.commons.logging with org.slf4j - #2
This is an automated email from the ASF dual-hosted git repository.
madhan 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 d7d58ef RANGER-3498: removed log4j-1.x dependency, replaced references to org.apache.log4j and org.apache.commons.logging with org.slf4j - #2
d7d58ef is described below
commit d7d58ef548b02347f33253973ecb22cf9b24df1e
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Sun Jan 23 13:28:33 2022 -0800
RANGER-3498: removed log4j-1.x dependency, replaced references to org.apache.log4j and org.apache.commons.logging with org.slf4j - #2
---
agents-audit/pom.xml | 14 ++++----------
embeddedwebserver/pom.xml | 5 +++++
hive-agent/pom.xml | 12 ++++++++++++
kms/pom.xml | 8 ++++++++
.../crypto/key/RangerGoogleCloudHSMProvider.java | 5 +++--
plugin-elasticsearch/pom.xml | 6 ++++++
plugin-ozone/pom.xml | 6 ++++++
plugin-solr/pom.xml | 4 ++++
ranger-elasticsearch-plugin-shim/pom.xml | 6 ++++++
ranger-hive-plugin-shim/pom.xml | 12 ++++++++++++
ranger-ozone-plugin-shim/pom.xml | 6 ++++++
ranger-solr-plugin-shim/pom.xml | 4 ++++
ranger-storm-plugin-shim/pom.xml | 4 ++++
storm-agent/pom.xml | 4 ++++
tagsync/pom.xml | 20 ++++++++++++++++++++
15 files changed, 104 insertions(+), 12 deletions(-)
diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml
index 8c5f554..a1ec2f2 100644
--- a/agents-audit/pom.xml
+++ b/agents-audit/pom.xml
@@ -180,6 +180,10 @@
<groupId>org.elasticsearch</groupId>
<artifactId>jna</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -328,16 +332,6 @@
<version>${hppc.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${httpcomponents.httpcore.version}</version>
diff --git a/embeddedwebserver/pom.xml b/embeddedwebserver/pom.xml
index 67618fb..f94a378 100644
--- a/embeddedwebserver/pom.xml
+++ b/embeddedwebserver/pom.xml
@@ -113,5 +113,10 @@
<artifactId>commons-compress</artifactId>
<version>${commons.compress.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml
index a700436..27b5ab3 100644
--- a/hive-agent/pom.xml
+++ b/hive-agent/pom.xml
@@ -43,6 +43,10 @@
<version>${hive.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
@@ -81,6 +85,10 @@
<artifactId>netty</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
@@ -103,6 +111,10 @@
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/kms/pom.xml b/kms/pom.xml
index 8350403..e408021 100644
--- a/kms/pom.xml
+++ b/kms/pom.xml
@@ -74,6 +74,14 @@
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerGoogleCloudHSMProvider.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerGoogleCloudHSMProvider.java
index 666a8c3..a61cabb 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerGoogleCloudHSMProvider.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerGoogleCloudHSMProvider.java
@@ -22,8 +22,9 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
-import org.apache.log4j.Logger;
import org.bouncycastle.crypto.RuntimeCryptoException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.api.gax.rpc.AlreadyExistsException;
import com.google.cloud.kms.v1.CryptoKey;
@@ -41,7 +42,7 @@ import com.google.protobuf.ByteString;
public class RangerGoogleCloudHSMProvider implements RangerKMSMKI {
- private static final Logger logger = Logger.getLogger(RangerGoogleCloudHSMProvider.class);
+ private static final Logger logger = LoggerFactory.getLogger(RangerGoogleCloudHSMProvider.class);
protected static final String GCP_KEYRING_ID = "ranger.kms.gcp.keyring.id";
protected static final String GCP_CRED_JSON_FILE = "ranger.kms.gcp.cred.file";
protected static final String GCP_PROJECT_ID = "ranger.kms.gcp.project.id";
diff --git a/plugin-elasticsearch/pom.xml b/plugin-elasticsearch/pom.xml
index 396ecb4..11417e2 100644
--- a/plugin-elasticsearch/pom.xml
+++ b/plugin-elasticsearch/pom.xml
@@ -38,6 +38,12 @@
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
diff --git a/plugin-ozone/pom.xml b/plugin-ozone/pom.xml
index b787218..3075f5b 100644
--- a/plugin-ozone/pom.xml
+++ b/plugin-ozone/pom.xml
@@ -98,6 +98,12 @@ limitations under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-common</artifactId>
<version>${ozone.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/plugin-solr/pom.xml b/plugin-solr/pom.xml
index 2c8dc2b..2445f59 100644
--- a/plugin-solr/pom.xml
+++ b/plugin-solr/pom.xml
@@ -52,6 +52,10 @@
<version>${solr.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
diff --git a/ranger-elasticsearch-plugin-shim/pom.xml b/ranger-elasticsearch-plugin-shim/pom.xml
index 87a6020..5a02be9 100644
--- a/ranger-elasticsearch-plugin-shim/pom.xml
+++ b/ranger-elasticsearch-plugin-shim/pom.xml
@@ -38,6 +38,12 @@
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/ranger-hive-plugin-shim/pom.xml b/ranger-hive-plugin-shim/pom.xml
index fbe3b19..61dd7cf 100644
--- a/ranger-hive-plugin-shim/pom.xml
+++ b/ranger-hive-plugin-shim/pom.xml
@@ -37,6 +37,10 @@
<version>${hive.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
@@ -79,6 +83,10 @@
<artifactId>netty</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
@@ -105,6 +113,10 @@
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/ranger-ozone-plugin-shim/pom.xml b/ranger-ozone-plugin-shim/pom.xml
index b2b64c8..ab3dc4e 100644
--- a/ranger-ozone-plugin-shim/pom.xml
+++ b/ranger-ozone-plugin-shim/pom.xml
@@ -92,6 +92,12 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-common</artifactId>
<version>${ozone.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.ranger</groupId>
diff --git a/ranger-solr-plugin-shim/pom.xml b/ranger-solr-plugin-shim/pom.xml
index 3859906..37454b9 100644
--- a/ranger-solr-plugin-shim/pom.xml
+++ b/ranger-solr-plugin-shim/pom.xml
@@ -52,6 +52,10 @@
<version>${solr.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
diff --git a/ranger-storm-plugin-shim/pom.xml b/ranger-storm-plugin-shim/pom.xml
index 8d3c8de..acbd9bd 100644
--- a/ranger-storm-plugin-shim/pom.xml
+++ b/ranger-storm-plugin-shim/pom.xml
@@ -37,6 +37,10 @@
<version>${storm.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
diff --git a/storm-agent/pom.xml b/storm-agent/pom.xml
index 27740a6..fde2016 100644
--- a/storm-agent/pom.xml
+++ b/storm-agent/pom.xml
@@ -37,6 +37,10 @@
<version>${storm.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
diff --git a/tagsync/pom.xml b/tagsync/pom.xml
index ed1b06a..8c4ecb2 100644
--- a/tagsync/pom.xml
+++ b/tagsync/pom.xml
@@ -124,6 +124,10 @@
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
@@ -143,6 +147,10 @@
<version>${atlas.version}</version>
<exclusions>
<exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
@@ -154,6 +162,10 @@
<version>${atlas.version}</version>
<exclusions>
<exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
@@ -165,6 +177,10 @@
<version>${atlas.version}</version>
<exclusions>
<exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
@@ -175,6 +191,10 @@
<artifactId>atlas-common</artifactId>
<version>${atlas.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>