Skip to content

Commit 3c61dc4

Browse files
vishnukribmmneethiraj
authored andcommitted
RANGER-5391: Migrate from Apache Commons Lang 2.6 to Commons Lang 3.19.0 (#724)
(cherry-picked from 7008e02)
1 parent ea22137 commit 3c61dc4

File tree

384 files changed

+502
-519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

384 files changed

+502
-519
lines changed

agents-audit/core/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@
3737
<artifactId>hppc</artifactId>
3838
<version>${hppc.version}</version>
3939
</dependency>
40-
<dependency>
41-
<groupId>commons-lang</groupId>
42-
<artifactId>commons-lang</artifactId>
43-
<version>${commons.lang.version}</version>
44-
</dependency>
4540
<dependency>
4641
<groupId>io.airlift</groupId>
4742
<artifactId>aircompressor</artifactId>
@@ -63,6 +58,11 @@
6358
<artifactId>commons-configuration2</artifactId>
6459
<version>${commons.configuration.version}</version>
6560
</dependency>
61+
<dependency>
62+
<groupId>org.apache.commons</groupId>
63+
<artifactId>commons-lang3</artifactId>
64+
<version>${commons.lang3.version}</version>
65+
</dependency>
6666
<dependency>
6767
<groupId>org.apache.commons</groupId>
6868
<artifactId>commons-text</artifactId>

agents-audit/core/src/main/java/org/apache/ranger/audit/model/AuthzAuditEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
2727
import com.fasterxml.jackson.annotation.JsonIgnore;
28-
import org.apache.commons.lang.StringUtils;
28+
import org.apache.commons.lang3.StringUtils;
2929

3030
import com.fasterxml.jackson.annotation.JsonProperty;
3131

agents-audit/core/src/main/java/org/apache/ranger/audit/provider/AuditWriterFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* under the License.
2020
*/
2121

22-
import org.apache.commons.lang.StringUtils;
22+
import org.apache.commons.lang3.StringUtils;
2323
import org.apache.ranger.audit.utils.RangerAuditWriter;
2424
import org.slf4j.Logger;
2525
import org.slf4j.LoggerFactory;

agents-audit/core/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
import javax.security.auth.login.LoginContext;
5151

5252
import com.fasterxml.jackson.databind.ObjectMapper;
53-
import org.apache.commons.lang.ArrayUtils;
54-
import org.apache.commons.lang.StringUtils;
53+
import org.apache.commons.lang3.ArrayUtils;
54+
import org.apache.commons.lang3.StringUtils;
5555
import org.apache.hadoop.security.UserGroupInformation;
5656
import org.apache.hadoop.security.authentication.util.KerberosName;
5757
import org.apache.hadoop.security.authentication.util.KerberosUtil;

agents-audit/core/src/main/java/org/apache/ranger/audit/utils/AbstractRangerAuditWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* under the License.
2020
*/
2121

22-
import org.apache.commons.lang.StringUtils;
22+
import org.apache.commons.lang3.StringUtils;
2323
import org.apache.hadoop.conf.Configuration;
2424
import org.apache.hadoop.fs.*;
2525
import org.apache.ranger.audit.provider.MiscUtil;

agents-audit/core/src/main/java/org/apache/ranger/audit/utils/RollingTimeUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.Calendar;
2222
import java.util.Date;
2323

24-
import org.apache.commons.lang.StringUtils;
24+
import org.apache.commons.lang3.StringUtils;
2525

2626
public class RollingTimeUtil {
2727
public static final String MINUTES ="m"; //minutes

agents-audit/dest-cloudwatch/src/main/java/org/apache/ranger/audit/destination/AmazonCloudWatchAuditDestination.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.amazonaws.services.logs.model.PutLogEventsResult;
3434
import com.amazonaws.services.logs.model.ResourceNotFoundException;
3535

36-
import org.apache.commons.lang.StringUtils;
36+
import org.apache.commons.lang3.StringUtils;
3737
import org.apache.ranger.audit.model.AuditEventBase;
3838
import org.apache.ranger.audit.provider.MiscUtil;
3939
import org.slf4j.Logger;

agents-audit/dest-es/src/main/java/org/apache/ranger/audit/destination/ElasticSearchAuditDestination.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import java.util.concurrent.atomic.AtomicLong;
3636
import java.util.concurrent.atomic.AtomicReference;
3737

38-
import org.apache.commons.lang.StringUtils;
38+
import org.apache.commons.lang3.StringUtils;
3939
import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
4040
import org.apache.http.HttpHost;
4141
import org.apache.http.auth.AuthSchemeProvider;

agents-audit/dest-hdfs/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.net.URI;
2727
import java.util.Map;
2828

29-
import org.apache.commons.lang.StringUtils;
29+
import org.apache.commons.lang3.StringUtils;
3030
import org.apache.hadoop.conf.Configuration;
3131
import org.apache.hadoop.fs.FSDataOutputStream;
3232
import org.apache.hadoop.fs.FileSystem;

agents-audit/dest-solr/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.ranger.audit.destination;
2121

22-
import org.apache.commons.lang.StringUtils;
22+
import org.apache.commons.lang3.StringUtils;
2323
import org.apache.ranger.audit.model.AuditEventBase;
2424
import org.apache.ranger.audit.model.AuthzAuditEvent;
2525
import org.apache.ranger.audit.provider.MiscUtil;

0 commit comments

Comments
 (0)