This is an automated email from the ASF dual-hosted git repository.
ppkarwasz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/logging-flume.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2eddbf064 Upgrade dependencies (#447)
2eddbf064 is described below
commit 2eddbf06448c82b0e779770b970cde70388d4774
Author: Ralph Goers <[email protected]>
AuthorDate: Thu Jun 11 21:55:02 2026 -0700
Upgrade dependencies (#447)
---
flume-ng-channels/flume-file-channel/pom.xml | 18 +++++++
.../flume-spillable-memory-channel/pom.xml | 7 +++
flume-ng-core/pom.xml | 7 +++
flume-ng-node/pom.xml | 42 ++++++++++-----
flume-parent/pom.xml | 62 +++++++++-------------
5 files changed, 86 insertions(+), 50 deletions(-)
diff --git a/flume-ng-channels/flume-file-channel/pom.xml
b/flume-ng-channels/flume-file-channel/pom.xml
index fae9d1aa7..0dc4273dc 100644
--- a/flume-ng-channels/flume-file-channel/pom.xml
+++ b/flume-ng-channels/flume-file-channel/pom.xml
@@ -119,6 +119,24 @@
<artifactId>snappy-java</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+
+ <!-- For Nullable annotations -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr305.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/flume-ng-channels/flume-spillable-memory-channel/pom.xml
b/flume-ng-channels/flume-spillable-memory-channel/pom.xml
index 1b0bfebb7..97261aced 100644
--- a/flume-ng-channels/flume-spillable-memory-channel/pom.xml
+++ b/flume-ng-channels/flume-spillable-memory-channel/pom.xml
@@ -72,6 +72,13 @@
<artifactId>commons-lang</artifactId>
</dependency>
+ <!-- For GuardedBy annotations -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/flume-ng-core/pom.xml b/flume-ng-core/pom.xml
index 06a71baa1..b33f5c71c 100644
--- a/flume-ng-core/pom.xml
+++ b/flume-ng-core/pom.xml
@@ -85,6 +85,13 @@
<groupId>com.jcraft</groupId>
<artifactId>jzlib</artifactId>
</dependency>
+ <!-- For ThreadSafe and GuardedBy annotations -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr305.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/flume-ng-node/pom.xml b/flume-ng-node/pom.xml
index 7496f9fed..58d893388 100644
--- a/flume-ng-node/pom.xml
+++ b/flume-ng-node/pom.xml
@@ -34,6 +34,7 @@
<spotbugs.maxAllowedViolations>12</spotbugs.maxAllowedViolations>
<pmd.maxAllowedViolations>7</pmd.maxAllowedViolations>
<module.name>org.apache.flume.node</module.name>
+ <junit-jupiter.version>5.12.2</junit-jupiter.version>
</properties>
<dependencies>
@@ -127,10 +128,36 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</dependency>
+ <!-- For ThreadSafe and GuardedBy annotations -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr305.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit-jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit-jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
@@ -185,17 +212,6 @@
<artifactId>curator-test</artifactId>
</dependency>
- <dependency>
- <groupId>net.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-annotations</artifactId>
- <optional>true</optional>
- </dependency>
-
</dependencies>
<build>
diff --git a/flume-parent/pom.xml b/flume-parent/pom.xml
index 0961fa6b0..459b01d91 100644
--- a/flume-parent/pom.xml
+++ b/flume-parent/pom.xml
@@ -23,6 +23,7 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>23</version>
+ <relativePath />
</parent>
<groupId>org.apache.flume</groupId>
<artifactId>flume-parent</artifactId>
@@ -184,18 +185,11 @@
</mailingList>
<mailingList>
<name>Flume Developer List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
<archive>http://mail-archives.apache.org/mod_mbox/flume-dev/</archive>
</mailingList>
- <mailingList>
- <name>Flume Commits</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/flume-commits/</archive>
- </mailingList>
</mailingLists>
<scm>
@@ -234,23 +228,21 @@
<bundle-plugin.version>2.3.7</bundle-plugin.version>
<commons-cli.version>1.5.0</commons-cli.version>
- <commons-codec.version>1.15</commons-codec.version>
+ <commons-codec.version>1.22.0</commons-codec.version>
<commons-collections.version>3.2.2</commons-collections.version>
- <commons-compress.version>1.21</commons-compress.version>
- <commons-io.version>2.11.0</commons-io.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-text.version>1.10.0</commons-text.version>
- <curator.version>5.1.0</curator.version>
- <derby.version>10.14.2.0</derby.version>
- <dropwizard-metrics.version>4.1.18</dropwizard-metrics.version>
- <fasterxml.jackson.version>2.13.2</fasterxml.jackson.version>
-
<fasterxml.jackson.databind.version>2.13.2.1</fasterxml.jackson.databind.version>
- <fest-reflect.version>1.4</fest-reflect.version>
- <gson.version>2.9.1</gson.version>
- <guava.version>29.0-jre</guava.version>
- <guava-old.version>11.0.2</guava-old.version>
- <hadoop3.version>3.2.2</hadoop3.version>
- <hadoop.version>${hadoop3.version}</hadoop.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>
+ <jackson-annotations.version>2.19.0</jackson-annotations.version>
+ <fasterxml.jackson.version>2.19.0</fasterxml.jackson.version>
+
<fasterxml.jackson.databind.version>2.19.0</fasterxml.jackson.databind.version>
+ <fest-reflect.version>1.4.1</fest-reflect.version>
+ <gson.version>2.14.0</gson.version>
+ <guava.version>33.4.8-jre</guava.version>
+ <hadoop.version>3.5.0</hadoop.version>
<httpcore.version>4.4.15</httpcore.version>
<bouncycastle.version>1.84</bouncycastle.version>
<httpclient.version>4.5.13</httpclient.version>
@@ -258,6 +250,7 @@
<jakarta-servlet.version>6.1.0</jakarta-servlet.version>
<jetty.version>12.1.9</jetty.version>
<junit.version>4.13.2</junit.version>
+ <jsr305.version>3.0.2</jsr305.version>
<log4j.version>2.26.0</log4j.version>
<mapdb.version>0.9.9</mapdb.version>
<mina.version>2.1.5</mina.version>
@@ -286,13 +279,13 @@
<rat.version>0.12</rat.version>
<snappy-java.version>1.1.8.4</snappy-java.version>
<slf4j.version>1.7.32</slf4j.version>
+ <spotbugs-annotations.version>4.9.3</spotbugs-annotations.version>
<system-rules.version>1.19.0</system-rules.version>
<wiremock.version>1.53</wiremock.version>
<zlib.version>1.1.3</zlib.version>
<zookeeper.version>3.6.2</zookeeper.version>
<os.maven.version>1.5.0.Final</os.maven.version>
<redirectTestOutput>true</redirectTestOutput>
-
<spotless-maven-plugin.version>3.4.0</spotless-maven-plugin.version>
<palantir-java-format.version>2.90.0</palantir-java-format.version>
</properties>
@@ -508,7 +501,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
+ <version>${jackson-annotations.version}</version>
</dependency>
<dependency>
@@ -771,24 +764,19 @@
</exclusions>
</dependency>
+ <!-- For ThreadSafe and GuardedBy annotations -->
<dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>${dropwizard-metrics.version}</version>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr305.version}</version>
</dependency>
- <dependency>
- <groupId>net.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
- <version>${spotbugs.version}</version>
- <optional>true</optional>
+ <version>${spotbugs-annotations.version}</version>
</dependency>
+
<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-netty</artifactId>
