This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch towards17
in repository https://gitbox.apache.org/repos/asf/logging-flume.git
The following commit(s) were added to refs/heads/towards17 by this push:
new c9126de30 Get File Channel, Avro and Thrift to build
c9126de30 is described below
commit c9126de30eda1e8e17c94b4de0fc0cf7ed55d498
Author: Ralph Goers <[email protected]>
AuthorDate: Fri May 29 23:00:34 2026 -0700
Get File Channel, Avro and Thrift to build
---
.../org/apache/flume/channel/file/LogFileV3.java | 3 +-
.../test/java/org/apache/flume/util/Whitebox.java | 8 ++++
flume-ng-sources/flume-taildir-source/pom.xml | 10 +++++
.../flume/source/taildir/TestTaildirSource.java | 4 +-
flume-parent/pom.xml | 45 +++-------------------
flume-rpc/flume-rpc-avro/pom.xml | 12 +++---
.../rpc/avro/source/TestSpoolDirectorySource.java | 2 +-
flume-rpc/flume-rpc-thrift/pom.xml | 8 +++-
.../flume/rpc/thrift/ThriftTestingSource.java | 2 +-
flume-rpc/pom.xml | 28 +-------------
10 files changed, 45 insertions(+), 77 deletions(-)
diff --git
a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java
index 2e031374c..97fe13eba 100644
---
a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java
+++
b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java
@@ -21,6 +21,7 @@ package org.apache.flume.channel.file;
import com.google.common.base.Preconditions;
import com.google.protobuf.ByteString;
import com.google.protobuf.GeneratedMessage;
+import com.google.protobuf.Message;
import org.apache.flume.annotations.InterfaceAudience;
import org.apache.flume.annotations.InterfaceStability;
import org.apache.flume.channel.file.encryption.CipherProvider;
@@ -142,7 +143,7 @@ public class LogFileV3 extends LogFile {
* @throws IOException if a write error occurs or the File.renameTo
* method returns false meaning the file could not be
overwritten.
*/
- public static void writeDelimitedTo(GeneratedMessage msg, File file)
+ public static void writeDelimitedTo(Message msg, File file)
throws IOException {
File tmp = Serialization.getMetaDataTempFile(file);
FileOutputStream outputStream = new FileOutputStream(tmp);
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 859ed2501..9a942b56e 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
@@ -29,4 +29,12 @@ public class Whitebox {
throw new RuntimeException("Unable to access field " + fieldName,
ex);
}
}
+
+ public static void setInternalState(Object target, String field, Object
value) {
+ try {
+ FieldUtils.writeField(target, field, value);
+ } catch (IllegalAccessException ex) {
+ throw new RuntimeException("Unable to access field " + field, ex);
+ }
+ }
}
diff --git a/flume-ng-sources/flume-taildir-source/pom.xml
b/flume-ng-sources/flume-taildir-source/pom.xml
index 91a1a4a68..bdec5a829 100644
--- a/flume-ng-sources/flume-taildir-source/pom.xml
+++ b/flume-ng-sources/flume-taildir-source/pom.xml
@@ -38,6 +38,16 @@ limitations under the License.
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.apache.flume</groupId>
+ <artifactId>flume-ng-sdk</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flume</groupId>
+ <artifactId>flume-ng-sdk</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-core</artifactId>
diff --git
a/flume-ng-sources/flume-taildir-source/src/test/java/org/apache/flume/source/taildir/TestTaildirSource.java
b/flume-ng-sources/flume-taildir-source/src/test/java/org/apache/flume/source/taildir/TestTaildirSource.java
index 7a2012190..d9020409d 100644
---
a/flume-ng-sources/flume-taildir-source/src/test/java/org/apache/flume/source/taildir/TestTaildirSource.java
+++
b/flume-ng-sources/flume-taildir-source/src/test/java/org/apache/flume/source/taildir/TestTaildirSource.java
@@ -17,7 +17,7 @@
package org.apache.flume.source.taildir;
-import static org.mockito.Mockito.anyListOf;
+import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.when;
@@ -376,7 +376,7 @@ public class TestTaildirSource {
ChannelProcessor cp = Mockito.mock(ChannelProcessor.class);
source.setChannelProcessor(cp);
doThrow(new ChannelException("dummy")).doNothing().when(cp)
- .processEventBatch(anyList(Event.class));
+ .processEventBatch(anyList());
source.start();
source.process();
assertEquals(1, source.getSourceCounter().getChannelWriteFail());
diff --git a/flume-parent/pom.xml b/flume-parent/pom.xml
index bb55982b7..30dc38b8e 100644
--- a/flume-parent/pom.xml
+++ b/flume-parent/pom.xml
@@ -81,7 +81,6 @@ limitations under the License.
<jersey.version>1.8</jersey.version>
<jetty.version>9.4.51.v20230217</jetty.version>
<jdom.version>1.1.3</jdom.version>
- <joda-time.version>2.9.9</joda-time.version>
<junit.version>4.13.2</junit.version>
<kite.version>1.1.0</kite.version>
<kudu.version>1.10.0</kudu.version>
@@ -107,11 +106,11 @@ limitations under the License.
<mvn-site-plugin.version>3.9.0</mvn-site-plugin.version>
<spotbugs.version>4.9.3</spotbugs.version>
<mvn-spotbugs-plugin.version>${spotbugs.version}.0</mvn-spotbugs-plugin.version>
- <mvn-surefire-plugin.version>2.22.2</mvn-surefire-plugin.version>
+ <mvn-surefire-plugin.version>3.5.5</mvn-surefire-plugin.version>
<!--<netty.version>3.10.6.Final</netty.version>-->
<netty-all.version>4.1.86.Final</netty-all.version>
<parquet.version>1.11.2</parquet.version>
- <external.protobuf.version>2.5.0</external.protobuf.version>
+ <external.protobuf.version>4.35.0</external.protobuf.version>
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
<prometheus.version>0.15.0</prometheus.version>
<rat.version>0.12</rat.version>
@@ -729,38 +728,10 @@ limitations under the License.
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <version>${log4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <version>${log4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
+ <artifactId>log4j-bom</artifactId>
<version>${log4j.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
</dependency>
<dependency>
@@ -873,12 +844,6 @@ limitations under the License.
<version>${irclib.version}</version>
</dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>${joda-time.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
diff --git a/flume-rpc/flume-rpc-avro/pom.xml b/flume-rpc/flume-rpc-avro/pom.xml
index 962fc9a6e..8c672a484 100644
--- a/flume-rpc/flume-rpc-avro/pom.xml
+++ b/flume-rpc/flume-rpc-avro/pom.xml
@@ -33,8 +33,7 @@ limitations under the License.
<properties>
<module.name>org.apache.flume.rpc.avro</module.name>
- <avro.version>1.11.1</avro.version>
- <spotbugs.maxAllowedViolations>23</spotbugs.maxAllowedViolations>
+ <spotbugs.maxAllowedViolations>55</spotbugs.maxAllowedViolations>
<pmd.maxAllowedViolations>121</pmd.maxAllowedViolations>
</properties>
<dependencies>
@@ -55,6 +54,12 @@ limitations under the License.
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-sdk</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.flume</groupId>
+ <artifactId>flume-ng-sdk</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-configuration</artifactId>
@@ -117,7 +122,6 @@ limitations under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -131,8 +135,6 @@ limitations under the License.
<release>${releaseJavaVersion}</release>
<compilerArgs>
<arg>-parameters</arg>
- <arg>--add-exports=java.base/sun.nio.ch=ALL-UNNAMED</arg>
- <arg>--add-exports=java.management/sun.management=ALL-UNNAMED</arg>
</compilerArgs>
</configuration>
</plugin>
diff --git
a/flume-rpc/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/source/TestSpoolDirectorySource.java
b/flume-rpc/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/source/TestSpoolDirectorySource.java
index 768db0146..ff18edb76 100644
---
a/flume-rpc/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/source/TestSpoolDirectorySource.java
+++
b/flume-rpc/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/source/TestSpoolDirectorySource.java
@@ -524,7 +524,7 @@ public class TestSpoolDirectorySource {
Mockito.doThrow(new ChannelException("dummy"))
.doThrow(new ChannelFullException("dummy"))
.doThrow(new RuntimeException("runtime"))
- .when(cp).processEventBatch(ArgumentMatchers.anyList(Event.class));
+ .when(cp).processEventBatch(ArgumentMatchers.anyList());
source.setChannelProcessor(cp);
ReliableSpoolingFileEventReader reader =
Mockito.mock(ReliableSpoolingFileEventReader.class);
diff --git a/flume-rpc/flume-rpc-thrift/pom.xml
b/flume-rpc/flume-rpc-thrift/pom.xml
index edae37603..3faf794e3 100644
--- a/flume-rpc/flume-rpc-thrift/pom.xml
+++ b/flume-rpc/flume-rpc-thrift/pom.xml
@@ -34,7 +34,7 @@ limitations under the License.
<properties>
<thrift.version>0.14.2</thrift.version>
<module.name>org.apache.flume.rpc.thrift</module.name>
- <spotbugs.maxAllowedViolations>44</spotbugs.maxAllowedViolations>
+ <spotbugs.maxAllowedViolations>62</spotbugs.maxAllowedViolations>
<pmd.maxAllowedViolations>121</pmd.maxAllowedViolations>
</properties>
@@ -43,6 +43,12 @@ limitations under the License.
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-sdk</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.flume</groupId>
+ <artifactId>flume-ng-sdk</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-auth</artifactId>
diff --git
a/flume-rpc/flume-rpc-thrift/src/test/java/org/apache/flume/rpc/thrift/ThriftTestingSource.java
b/flume-rpc/flume-rpc-thrift/src/test/java/org/apache/flume/rpc/thrift/ThriftTestingSource.java
index 35144c121..7c3c69c91 100644
---
a/flume-rpc/flume-rpc-thrift/src/test/java/org/apache/flume/rpc/thrift/ThriftTestingSource.java
+++
b/flume-rpc/flume-rpc-thrift/src/test/java/org/apache/flume/rpc/thrift/ThriftTestingSource.java
@@ -591,7 +591,7 @@ public class ThriftTestingSource {
source.configure(context);
ChannelProcessor cp = Mockito.mock(ChannelProcessor.class);
doThrow(new
ChannelException("dummy")).when(cp).processEvent(any(Event.class));
- doThrow(new
ChannelException("dummy")).when(cp).processEventBatch(anyList(Event.class));
+ doThrow(new
ChannelException("dummy")).when(cp).processEventBatch(anyList());
source.setChannelProcessor(cp);
source.start();
Event event = EventBuilder.withBody("hello".getBytes());
diff --git a/flume-rpc/pom.xml b/flume-rpc/pom.xml
index ff904a2d7..e32ba4fde 100644
--- a/flume-rpc/pom.xml
+++ b/flume-rpc/pom.xml
@@ -34,35 +34,16 @@ limitations under the License.
<packaging>pom</packaging>
<properties>
- <avro.version>1.11.1</avro.version>
+ <avro.version>1.12.1</avro.version>
<checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
- <commons-lang.version>2.6</commons-lang.version>
- <dropwizard-metrics.version>4.1.18</dropwizard-metrics.version>
<findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
- <flume.version>2.0.0-SNAPSHOT</flume.version>
- <guava.version>29.0-jre</guava.version>
<jackson.version>2.17.0</jackson.version>
- <mockito.version>1.9.0</mockito.version>
- <mvn-gpg-plugin.version>1.6</mvn-gpg-plugin.version>
- <mvn-javadoc-plugin.version>2.9</mvn-javadoc-plugin.version>
- <mvn-surefire-plugin.version>3.5.5</mvn-surefire-plugin.version>
- <netty-all.version>4.1.86.Final</netty-all.version>
+ <netty-all.version>4.2.4.Final</netty-all.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <rat.version>0.12</rat.version>
- <scala.version>2.13</scala.version>
- <scala-library.version>2.13.9</scala-library.version>
<thrift.version>0.14.2</thrift.version>
- <zlib.version>1.1.3</zlib.version>
</properties>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>${dropwizard-metrics.version}</version>
- </dependency>
-
-
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
@@ -105,11 +86,6 @@ limitations under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jzlib</artifactId>
- <version>${zlib.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
