This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch update-commons-lang in repository https://gitbox.apache.org/repos/asf/logging-flume.git
commit 164d33e435e8126de32147f72c30385559d1bf82 Author: Ralph Goers <[email protected]> AuthorDate: Sat Jun 13 18:39:38 2026 -0700 Upgrade to commons-lang3 --- flume-ng-channels/flume-file-channel/pom.xml | 4 ++-- .../main/java/org/apache/flume/channel/file/FlumeEventQueue.java | 2 +- flume-ng-channels/flume-spillable-memory-channel/pom.xml | 4 ++-- flume-ng-core/pom.xml | 4 ++-- .../org/apache/flume/interceptor/RegexExtractorInterceptor.java | 2 +- .../interceptor/RegexExtractorInterceptorMillisSerializer.java | 2 +- .../org/apache/flume/interceptor/SearchAndReplaceInterceptor.java | 2 +- .../src/main/java/org/apache/flume/tools/FlumeBeanConfigurator.java | 2 +- .../src/test/java/org/apache/flume/source/TestExecSource.java | 4 ++-- flume-ng-node/src/main/java/org/apache/flume/node/Application.java | 2 +- .../java/org/apache/flume/node/ClasspathConfigurationSource.java | 2 +- flume-ng-sdk/pom.xml | 4 ++-- .../main/java/org/apache/flume/instrumentation/ChannelCounter.java | 2 +- .../src/main/java/org/apache/flume/instrumentation/SinkCounter.java | 2 +- .../main/java/org/apache/flume/instrumentation/SourceCounter.java | 2 +- flume-ng-sdk/src/test/java/org/apache/flume/util/Whitebox.java | 2 +- .../src/main/java/org/apache/flume/source/syslog/SyslogParser.java | 2 +- flume-parent/pom.xml | 6 +++--- 18 files changed, 25 insertions(+), 25 deletions(-) diff --git a/flume-ng-channels/flume-file-channel/pom.xml b/flume-ng-channels/flume-file-channel/pom.xml index 0dc4273dc..a339cef8b 100644 --- a/flume-ng-channels/flume-file-channel/pom.xml +++ b/flume-ng-channels/flume-file-channel/pom.xml @@ -63,8 +63,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventQueue.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventQueue.java index 3519dedac..6a4c72aef 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventQueue.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/FlumeEventQueue.java @@ -33,7 +33,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.mapdb.DB; import org.mapdb.DBMaker; import org.slf4j.Logger; diff --git a/flume-ng-channels/flume-spillable-memory-channel/pom.xml b/flume-ng-channels/flume-spillable-memory-channel/pom.xml index 97261aced..da097c7b6 100644 --- a/flume-ng-channels/flume-spillable-memory-channel/pom.xml +++ b/flume-ng-channels/flume-spillable-memory-channel/pom.xml @@ -68,8 +68,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <!-- For GuardedBy annotations --> diff --git a/flume-ng-core/pom.xml b/flume-ng-core/pom.xml index 33d269607..7c7428e32 100644 --- a/flume-ng-core/pom.xml +++ b/flume-ng-core/pom.xml @@ -129,8 +129,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> diff --git a/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexExtractorInterceptor.java b/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexExtractorInterceptor.java index d1795a1a8..29cf302b1 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexExtractorInterceptor.java +++ b/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexExtractorInterceptor.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.flume.Context; import org.apache.flume.Event; import org.slf4j.Logger; diff --git a/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexExtractorInterceptorMillisSerializer.java b/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexExtractorInterceptorMillisSerializer.java index 2b7f98dab..f392ecef1 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexExtractorInterceptorMillisSerializer.java +++ b/flume-ng-core/src/main/java/org/apache/flume/interceptor/RegexExtractorInterceptorMillisSerializer.java @@ -20,7 +20,7 @@ import com.google.common.base.Preconditions; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.flume.Context; import org.apache.flume.conf.ComponentConfiguration; diff --git a/flume-ng-core/src/main/java/org/apache/flume/interceptor/SearchAndReplaceInterceptor.java b/flume-ng-core/src/main/java/org/apache/flume/interceptor/SearchAndReplaceInterceptor.java index 13f535267..2cb71a57d 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/interceptor/SearchAndReplaceInterceptor.java +++ b/flume-ng-core/src/main/java/org/apache/flume/interceptor/SearchAndReplaceInterceptor.java @@ -22,7 +22,7 @@ import java.nio.charset.Charset; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.flume.Context; import org.apache.flume.Event; import org.slf4j.Logger; diff --git a/flume-ng-core/src/main/java/org/apache/flume/tools/FlumeBeanConfigurator.java b/flume-ng-core/src/main/java/org/apache/flume/tools/FlumeBeanConfigurator.java index b275b4e39..45dddb79d 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/tools/FlumeBeanConfigurator.java +++ b/flume-ng-core/src/main/java/org/apache/flume/tools/FlumeBeanConfigurator.java @@ -18,7 +18,7 @@ package org.apache.flume.tools; import java.lang.reflect.Method; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.flume.Context; import org.apache.flume.conf.ConfigurationException; diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java b/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java index ab9126808..d8d369f6b 100644 --- a/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java +++ b/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java @@ -37,8 +37,8 @@ import javax.management.AttributeList; import javax.management.MBeanServer; import javax.management.ObjectName; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.flume.Channel; import org.apache.flume.ChannelSelector; import org.apache.flume.Context; diff --git a/flume-ng-node/src/main/java/org/apache/flume/node/Application.java b/flume-ng-node/src/main/java/org/apache/flume/node/Application.java index eeb5c2f01..687521f1b 100644 --- a/flume-ng-node/src/main/java/org/apache/flume/node/Application.java +++ b/flume-ng-node/src/main/java/org/apache/flume/node/Application.java @@ -41,7 +41,7 @@ import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.flume.Channel; import org.apache.flume.Context; import org.apache.flume.Sink; diff --git a/flume-ng-node/src/main/java/org/apache/flume/node/ClasspathConfigurationSource.java b/flume-ng-node/src/main/java/org/apache/flume/node/ClasspathConfigurationSource.java index 4918ff6ee..4205a8f6d 100644 --- a/flume-ng-node/src/main/java/org/apache/flume/node/ClasspathConfigurationSource.java +++ b/flume-ng-node/src/main/java/org/apache/flume/node/ClasspathConfigurationSource.java @@ -18,7 +18,7 @@ package org.apache.flume.node; import java.io.InputStream; import java.net.URI; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.flume.conf.ConfigurationException; public class ClasspathConfigurationSource implements ConfigurationSource { diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml index 8ddc7e3c5..7ffb653bb 100644 --- a/flume-ng-sdk/pom.xml +++ b/flume-ng-sdk/pom.xml @@ -86,8 +86,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> </dependencies> diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/ChannelCounter.java b/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/ChannelCounter.java index 4dfc1a735..71515a6ff 100644 --- a/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/ChannelCounter.java +++ b/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/ChannelCounter.java @@ -16,7 +16,7 @@ */ package org.apache.flume.instrumentation; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; public class ChannelCounter extends MonitoredCounterGroup implements ChannelCounterMBean { diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/SinkCounter.java b/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/SinkCounter.java index 8c6172069..203304656 100644 --- a/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/SinkCounter.java +++ b/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/SinkCounter.java @@ -16,7 +16,7 @@ */ package org.apache.flume.instrumentation; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.flume.exception.ChannelException; public class SinkCounter extends MonitoredCounterGroup implements SinkCounterMBean { diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/SourceCounter.java b/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/SourceCounter.java index 6aeabc761..4f89218af 100644 --- a/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/SourceCounter.java +++ b/flume-ng-sdk/src/main/java/org/apache/flume/instrumentation/SourceCounter.java @@ -16,7 +16,7 @@ */ package org.apache.flume.instrumentation; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.flume.exception.ChannelException; public class SourceCounter extends MonitoredCounterGroup implements SourceCounterMBean { diff --git a/flume-ng-sdk/src/test/java/org/apache/flume/util/Whitebox.java b/flume-ng-sdk/src/test/java/org/apache/flume/util/Whitebox.java index db7b4c30a..995e0ae3f 100644 --- a/flume-ng-sdk/src/test/java/org/apache/flume/util/Whitebox.java +++ b/flume-ng-sdk/src/test/java/org/apache/flume/util/Whitebox.java @@ -16,7 +16,7 @@ */ package org.apache.flume.util; -import org.apache.commons.lang.reflect.FieldUtils; +import org.apache.commons.lang3.reflect.FieldUtils; public class Whitebox { public static <T> T getInternalState(Object target, String fieldName) { diff --git a/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogParser.java b/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogParser.java index 97cd8af10..f18cb8eaa 100644 --- a/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogParser.java +++ b/flume-ng-sources/flume-syslog-source/src/main/java/org/apache/flume/source/syslog/SyslogParser.java @@ -36,7 +36,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.flume.Event; import org.apache.flume.annotations.InterfaceAudience; import org.apache.flume.annotations.InterfaceStability; diff --git a/flume-parent/pom.xml b/flume-parent/pom.xml index 19b482677..a4fd6fa75 100644 --- a/flume-parent/pom.xml +++ b/flume-parent/pom.xml @@ -232,7 +232,7 @@ <commons-collections.version>3.2.2</commons-collections.version> <commons-compress.version>1.28.0</commons-compress.version> <commons-io.version>2.22.0</commons-io.version> - <commons-lang.version>2.6</commons-lang.version> + <commons-lang.version>3.20.0</commons-lang.version> <commons-text.version>1.15.0</commons-text.version> <curator.version>5.9.0</curator.version> <derby.version>10.17.1.0</derby.version> @@ -372,8 +372,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> <version>${commons-lang.version}</version> </dependency>
