This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch ranger-2.8
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-2.8 by this push:
new 8e6f39509 RANGER-5495: replaced org.apache.log4j references with
org.slf4j (#856)
8e6f39509 is described below
commit 8e6f39509fd0915e6661a0e6b018b14e3d6113f6
Author: Madhan Neethiraj <[email protected]>
AuthorDate: Thu Feb 19 13:59:05 2026 -0800
RANGER-5495: replaced org.apache.log4j references with org.slf4j (#856)
---
.../ranger/amazon/cloudwatch/CloudWatchAccessAuditsService.java | 5 +++--
.../java/org/apache/ranger/amazon/cloudwatch/CloudWatchMgr.java | 7 ++++---
.../java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java | 5 +++--
.../ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java | 5 +++--
.../org/apache/ranger/patch/PatchForTrinoSvcDefUpdate_J10062.java | 8 ++++++--
.../patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java | 5 +++--
...atchPreSql_058_ForUpdateToUniqueResoureceSignature_J10053.java | 5 +++--
.../apache/ranger/security/web/filter/RangerJwtAuthFilter.java | 5 +++--
.../apache/ranger/security/web/filter/RangerJwtAuthWrapper.java | 5 +++--
.../org/apache/ranger/tagsync/ha/TagSyncHAInitializerImpl.java | 5 +++--
10 files changed, 34 insertions(+), 21 deletions(-)
diff --git
a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchAccessAuditsService.java
b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchAccessAuditsService.java
index 5c180162a..0b36f6e90 100644
---
a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchAccessAuditsService.java
+++
b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchAccessAuditsService.java
@@ -25,7 +25,6 @@
import java.util.Map;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.log4j.Logger;
import org.apache.ranger.audit.model.AuthzAuditEvent;
import org.apache.ranger.audit.provider.MiscUtil;
import org.apache.ranger.common.JSONUtil;
@@ -38,6 +37,8 @@
import org.apache.ranger.view.VXAccessAudit;
import org.apache.ranger.view.VXAccessAuditList;
import org.apache.ranger.view.VXLong;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
@@ -48,7 +49,7 @@
@Service
@Scope("singleton")
public class CloudWatchAccessAuditsService extends
org.apache.ranger.AccessAuditsService {
- private static final Logger LOGGER =
Logger.getLogger(CloudWatchAccessAuditsService.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(CloudWatchAccessAuditsService.class);
@Autowired
CloudWatchMgr cloudWatchMgr;
diff --git
a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchMgr.java
b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchMgr.java
index 55d8229a3..82325d175 100644
---
a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchMgr.java
+++
b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchMgr.java
@@ -23,8 +23,9 @@
import static
org.apache.ranger.audit.destination.AmazonCloudWatchAuditDestination.PROP_REGION;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
import org.apache.ranger.common.PropertiesUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import com.amazonaws.services.logs.AWSLogs;
@@ -37,7 +38,7 @@
@Component
public class CloudWatchMgr {
- private static final Logger LOGGER =
Logger.getLogger(CloudWatchMgr.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(CloudWatchMgr.class);
private AWSLogs client = null;
private String regionName;
@@ -50,7 +51,7 @@ synchronized void connect() {
try {
client = newClient();
} catch (Throwable t) {
- LOGGER.fatal("Can't connect to
CloudWatch region: " + regionName, t);
+ LOGGER.error("Can't connect to
CloudWatch region: " + regionName, t);
}
}
}
diff --git
a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java
b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java
index 8301c6747..ed7bf9ba8 100644
---
a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java
+++
b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java
@@ -34,7 +34,6 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
import org.apache.ranger.common.PropertiesUtil;
import org.apache.ranger.common.SearchCriteria;
import org.apache.ranger.common.SearchField;
@@ -42,6 +41,8 @@
import org.apache.ranger.common.SortField;
import org.apache.ranger.common.StringUtil;
import org.apache.solr.client.solrj.util.ClientUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -52,7 +53,7 @@
@Component
public class CloudWatchUtil {
- private static final Logger LOGGER =
Logger.getLogger(CloudWatchUtil.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(CloudWatchUtil.class);
@Autowired
StringUtil stringUtil;
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java
index 02e1e4558..28160ffc9 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForOzoneServiceDefConfigUpdate_J10051.java
@@ -18,7 +18,6 @@
package org.apache.ranger.patch;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
import org.apache.ranger.biz.RangerBizUtil;
import org.apache.ranger.biz.ServiceDBStore;
import org.apache.ranger.common.JSONUtil;
@@ -34,6 +33,8 @@
import org.apache.ranger.service.XPermMapService;
import org.apache.ranger.service.XPolicyService;
import org.apache.ranger.util.CLIUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -43,7 +44,7 @@
@Component
public class PatchForOzoneServiceDefConfigUpdate_J10051 extends BaseLoader {
- private static final Logger logger =
Logger.getLogger(PatchForOzoneServiceDefConfigUpdate_J10051.class);
+ private static final Logger logger =
LoggerFactory.getLogger(PatchForOzoneServiceDefConfigUpdate_J10051.class);
@Autowired
RangerDaoManager daoMgr;
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForTrinoSvcDefUpdate_J10062.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForTrinoSvcDefUpdate_J10062.java
index 57d55f50c..a173dc1cb 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForTrinoSvcDefUpdate_J10062.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForTrinoSvcDefUpdate_J10062.java
@@ -19,7 +19,6 @@
package org.apache.ranger.patch;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.log4j.Logger;
import org.apache.ranger.biz.ServiceDBStore;
import org.apache.ranger.common.GUIDUtil;
import org.apache.ranger.common.RangerValidatorFactory;
@@ -32,6 +31,8 @@
import org.apache.ranger.plugin.model.validation.RangerValidator.Action;
import org.apache.ranger.plugin.store.EmbeddedServiceDefsUtil;
import org.apache.ranger.util.CLIUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
@@ -48,6 +49,8 @@
@Component
public class PatchForTrinoSvcDefUpdate_J10062 extends BaseLoader {
+ private static final Logger logger =
LoggerFactory.getLogger(PatchForTrinoSvcDefUpdate_J10062.class);
+
public static final String LOGIN_ID_ADMIN = "admin";
public static final String WILDCARD_ASTERISK = "*";
public static final String POlICY_NAME_FOR_ALL_SYSINFO = "all - sysinfo";
@@ -69,8 +72,9 @@ public class PatchForTrinoSvcDefUpdate_J10062 extends
BaseLoader {
public static final String ACCESS_TYPE_REVOKE = "revoke";
public static final String ACCESS_TYPE_EXECUTE = "execute";
public static final String ACCESS_TYPE_SELECT = "select";
- private static final Logger logger =
Logger.getLogger(PatchForTrinoSvcDefUpdate_J10062.class);
+
private static final String TRINO_SVC_DEF_NAME =
EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_TRINO_NAME;
+
@Autowired
GUIDUtil guidUtil;
@Autowired
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java
index a6fd0564f..26d30011a 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java
@@ -20,7 +20,6 @@
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.log4j.Logger;
import org.apache.ranger.authorization.utils.JsonUtils;
import org.apache.ranger.biz.ServiceDBStore;
import org.apache.ranger.common.GUIDUtil;
@@ -30,6 +29,8 @@
import org.apache.ranger.entity.XXService;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.util.CLIUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
@@ -41,7 +42,7 @@
*/
@Component
public class PatchPreSql_057_ForUpdateToUniqueGUID_J10052 extends BaseLoader {
- private static final Logger logger =
Logger.getLogger(PatchPreSql_057_ForUpdateToUniqueGUID_J10052.class);
+ private static final Logger logger =
LoggerFactory.getLogger(PatchPreSql_057_ForUpdateToUniqueGUID_J10052.class);
@Autowired
RangerDaoManager daoMgr;
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_058_ForUpdateToUniqueResoureceSignature_J10053.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_058_ForUpdateToUniqueResoureceSignature_J10053.java
index 8d48d1a99..d93c123f9 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_058_ForUpdateToUniqueResoureceSignature_J10053.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_058_ForUpdateToUniqueResoureceSignature_J10053.java
@@ -22,7 +22,6 @@
import java.util.Map;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.log4j.Logger;
import org.apache.ranger.authorization.utils.JsonUtils;
import org.apache.ranger.biz.ServiceDBStore;
import org.apache.ranger.common.RangerFactory;
@@ -34,6 +33,8 @@
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerPolicyResourceSignature;
import org.apache.ranger.util.CLIUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
@@ -45,7 +46,7 @@
*/
@Component
public class PatchPreSql_058_ForUpdateToUniqueResoureceSignature_J10053
extends BaseLoader {
- private static final Logger logger =
Logger.getLogger(PatchPreSql_058_ForUpdateToUniqueResoureceSignature_J10053.class);
+ private static final Logger logger =
LoggerFactory.getLogger(PatchPreSql_058_ForUpdateToUniqueResoureceSignature_J10053.class);
@Autowired
RangerDaoManager daoMgr;
diff --git
a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerJwtAuthFilter.java
b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerJwtAuthFilter.java
index f14adaaa8..5a1251ade 100644
---
a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerJwtAuthFilter.java
+++
b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerJwtAuthFilter.java
@@ -32,11 +32,12 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
import org.apache.ranger.authz.handler.RangerAuth;
import org.apache.ranger.authz.handler.jwt.RangerDefaultJwtAuthHandler;
import org.apache.ranger.authz.handler.jwt.RangerJwtAuthHandler;
import org.apache.ranger.common.PropertiesUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.authentication.AbstractAuthenticationToken;
import
org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -52,7 +53,7 @@
@Lazy(true)
@Component
public class RangerJwtAuthFilter extends RangerDefaultJwtAuthHandler
implements Filter {
- private static final Logger LOG =
Logger.getLogger(RangerJwtAuthFilter.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(RangerJwtAuthFilter.class);
private static final String DEFAULT_RANGER_ROLE = "ROLE_USER";
@PostConstruct
diff --git
a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerJwtAuthWrapper.java
b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerJwtAuthWrapper.java
index a824218dd..ba160f448 100644
---
a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerJwtAuthWrapper.java
+++
b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerJwtAuthWrapper.java
@@ -29,11 +29,12 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
import org.apache.ranger.common.PropertiesUtil;
import org.apache.ranger.common.UserSessionBase;
import org.apache.ranger.security.context.RangerContextHolder;
import org.apache.ranger.security.context.RangerSecurityContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.core.Authentication;
@@ -44,7 +45,7 @@
@Lazy(true)
@Component
public class RangerJwtAuthWrapper extends GenericFilterBean {
- private static final Logger LOG =
Logger.getLogger(RangerJwtAuthWrapper.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(RangerJwtAuthWrapper.class);
private String[] browserUserAgents = new String[] {""}; //Initialize with
empty
diff --git
a/tagsync/src/main/java/org/apache/ranger/tagsync/ha/TagSyncHAInitializerImpl.java
b/tagsync/src/main/java/org/apache/ranger/tagsync/ha/TagSyncHAInitializerImpl.java
index 016d6e5cc..571f4d232 100644
---
a/tagsync/src/main/java/org/apache/ranger/tagsync/ha/TagSyncHAInitializerImpl.java
+++
b/tagsync/src/main/java/org/apache/ranger/tagsync/ha/TagSyncHAInitializerImpl.java
@@ -32,11 +32,12 @@
import org.apache.ranger.ha.service.HARangerService;
import org.apache.ranger.ha.service.ServiceManager;
import org.apache.ranger.tagsync.process.TagSyncConfig;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TagSyncHAInitializerImpl extends RangerHAInitializer {
- private static final Logger LOG =
Logger.getLogger(TagSyncHAInitializerImpl.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(TagSyncHAInitializerImpl.class);
ActiveInstanceElectorService activeInstanceElectorService = null;
ActiveStateChangeHandler activeStateChangeHandler
= null;
List<HARangerService> haRangerService
= null;
