You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2026/09/09 15:41:05 UTC
(logging-flume-rpc) branch flume-updates created (now 3345e4b)
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a change to branch flume-updates
in repository https://gitbox.apache.org/repos/asf/logging-flume-rpc.git
at 3345e4b remove flattened pom files from commit
This branch includes the following new commits:
new 9c5c482 Update do to changes in the main Flume project
new 3345e4b remove flattened pom files from commit
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(logging-flume-rpc) 02/02: remove flattened pom files from commit
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch flume-updates
in repository https://gitbox.apache.org/repos/asf/logging-flume-rpc.git
commit 3345e4b2e51e44e47c12836dc6c062ea1460672c
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Wed Sep 9 08:40:38 2026 -0700
remove flattened pom files from commit
---
.gitignore | 1 +
flume-embedded-agent/.flattened-pom.xml | 107 ---------------
flume-rpc-avro/.flattened-pom.xml | 215 -----------------------------
flume-rpc-thrift/.flattened-pom.xml | 234 --------------------------------
4 files changed, 1 insertion(+), 556 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9a0a932..737ac8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ patchprocess
derby.log
.idea
*.iml
+.flattened-pom.xml
nb-configuration.xml
.DS_Store
/.mvn/wrapper/maven-wrapper.jar
diff --git a/flume-embedded-agent/.flattened-pom.xml b/flume-embedded-agent/.flattened-pom.xml
deleted file mode 100644
index a036724..0000000
--- a/flume-embedded-agent/.flattened-pom.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to you under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-rpc</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>flume-embedded-agent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <name>Flume Embedded Agent</name>
- <description>Flume Embedded Agent: Stable public API for Embedding a Flume 2.x Agent</description>
- <url>https://logging.apache.org/flume/2.x/index.html/flume-rpc/flume-embedded-agent</url>
- <licenses>
- <license>
- <name>Apache-2.0</name>
- <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <properties>
- <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
- <pmd.maxAllowedViolations>2</pmd.maxAllowedViolations>
- <module.name>org.apache.flume.agent.embedded</module.name>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-sdk</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-node</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume.flume-ng-channels</groupId>
- <artifactId>flume-file-channel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-rpc-avro</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.13.0</version>
- <configuration>
- <compilerArgs>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/flume-rpc-avro/.flattened-pom.xml b/flume-rpc-avro/.flattened-pom.xml
deleted file mode 100644
index 006a566..0000000
--- a/flume-rpc-avro/.flattened-pom.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to you under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-rpc</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-rpc-avro</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <name>Flume RPC Avro</name>
- <url>https://logging.apache.org/flume/2.x/index.html/flume-rpc/flume-rpc-avro</url>
- <licenses>
- <license>
- <name>Apache-2.0</name>
- <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <properties>
- <spotbugs.maxAllowedViolations>55</spotbugs.maxAllowedViolations>
- <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
- <pmd.maxAllowedViolations>121</pmd.maxAllowedViolations>
- <module.name>org.apache.flume.rpc.avro</module.name>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-ipc-netty</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-sdk</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-sdk-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-node</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.flume.flume-ng-sources</groupId>
- <artifactId>flume-syslog-source</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <release>${maven.compiler.release}</release>
- <compilerArgs>
- <arg>-parameters</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${rat.version}</version>
- <executions>
- <execution>
- <id>verify.rat</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>**/.idea/</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>src/main/resources/META-INF/services/**/*</exclude>
- <exclude>**/nb-configuration.xml</exclude>
- <exclude>.git/</exclude>
- <exclude>patchprocess/</exclude>
- <exclude>.gitignore</exclude>
- <exclude>**/*.yml</exclude>
- <exclude>**/*.yaml</exclude>
- <exclude>**/*.json</exclude>
- <exclude>.repository/</exclude>
- <exclude>**/*.diff</exclude>
- <exclude>**/*.patch</exclude>
- <exclude>**/*.avsc</exclude>
- <exclude>**/*.avro</exclude>
- <exclude>**/docs/**</exclude>
- <exclude>**/test/resources/**</exclude>
- <exclude>**/.settings/*</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/metastore_db/</exclude>
- <exclude>.mvn/**</exclude>
- <exclude>**/exclude-pmd.properties</exclude>
- </excludes>
- <consoleOutput>true</consoleOutput>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>Avro Generate</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>idl-protocol</goal>
- <goal>schema</goal>
- </goals>
- <configuration>
- <sourceDirectory>${project.basedir}/src/main/avro</sourceDirectory>
- <outputDirectory>${project.build.directory}/generated-sources/avro</outputDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <stringType>CharSequence</stringType>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/flume-rpc-thrift/.flattened-pom.xml b/flume-rpc-thrift/.flattened-pom.xml
deleted file mode 100644
index 9b4dc89..0000000
--- a/flume-rpc-thrift/.flattened-pom.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to you under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-rpc</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-rpc-thrift</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <name>Flume RPC Thrift</name>
- <url>https://logging.apache.org/flume/2.x/index.html/flume-rpc/flume-rpc-thrift</url>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
- <licenses>
- <license>
- <name>Apache-2.0</name>
- <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <developers>
- <developer>
- <id>rgoers</id>
- <name>Ralph Goers</name>
- <email>rgoers@apache.org</email>
- <organization>Nextiva</organization>
- </developer>
- </developers>
- <scm>
- <connection>https://gitbox.apache.org/repos/asf/flume-spring-boot.git</connection>
- <developerConnection>https://gitbox.apache.org/repos/asf/flume-spring-boot.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf/flume-spring-boot.git</url>
- </scm>
- <properties>
- <thrift.version>0.14.2</thrift.version>
- <spotbugs.maxAllowedViolations>62</spotbugs.maxAllowedViolations>
- <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
- <pmd.maxAllowedViolations>121</pmd.maxAllowedViolations>
- <module.name>org.apache.flume.rpc.thrift</module.name>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-sdk</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-sdk-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-auth</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.13.0</version>
- <configuration>
- <compilerArgs>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
- <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${rat.version}</version>
- <executions>
- <execution>
- <id>verify.rat</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>**/.idea/</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>src/main/resources/META-INF/services/**/*</exclude>
- <exclude>**/nb-configuration.xml</exclude>
- <exclude>.git/</exclude>
- <exclude>patchprocess/</exclude>
- <exclude>.gitignore</exclude>
- <exclude>**/*.yml</exclude>
- <exclude>**/*.yaml</exclude>
- <exclude>**/*.json</exclude>
- <exclude>.repository/</exclude>
- <exclude>**/*.diff</exclude>
- <exclude>**/*.patch</exclude>
- <exclude>**/*.avsc</exclude>
- <exclude>**/*.avro</exclude>
- <exclude>**/docs/**</exclude>
- <exclude>**/test/resources/**</exclude>
- <exclude>**/.settings/*</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/metastore_db/</exclude>
- <exclude>.mvn/**</exclude>
- <exclude>**/exclude-pmd.properties</exclude>
- </excludes>
- <consoleOutput>true</consoleOutput>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>compileThrift</id>
- <activation />
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>compileThrift</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <echo file="target/compile-thrift.sh">LICENSE=src/main/thrift/aslv2
- THRIFT_DIR=src/main/thrift
- JAVA_DIR=target/generated-sources/thrift
- mkdir -p $JAVA_DIR 2> /dev/null
- JSTATUS=$?
- if [ $JSTATUS -ne 0 ] ; then
- echo "Could not create $JAVA_DIR. Will not generate thrift files."
- exit $JSTATUS
- fi
- for THRIFT_FILE in `ls $THRIFT_DIR/*.thrift 2> /dev/null`
- do
- thrift --gen java:hashcode -o $JAVA_DIR $THRIFT_FILE
- done
- SRC_DIR=$JAVA_DIR/gen-java/org/apache/flume/thrift/
- DEST_DIR=src/main/java/org/apache/flume/thrift
- if [ ! -d $DEST_DIR ] ; then
- mkdir $DEST_DIR 2> /dev/null
- STATUS=$?
- if [ $STATUS -ne 0 ] ; then
- echo "Could not create $DEST_DIR. Will not generate thrift files."
- exit $STATUS
- fi
- fi
- for JAVA_FILE in `ls $SRC_DIR/*.java 2> /dev/null`
- do
- echo $JAVA_FILE
- cat $LICENSE > $JAVA_FILE.tmp
- cat $JAVA_FILE >> $JAVA_FILE.tmp
- mv $JAVA_FILE.tmp $JAVA_FILE
- cp $JAVA_FILE $DEST_DIR
- done
- rm -rf $JAVA_DIR</echo>
- <exec failonerror="true" dir="${basedir}" executable="sh">
- <arg line="target/compile-thrift.sh" />
- </exec>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
(logging-flume-rpc) 01/02: Update do to changes in the main Flume project
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch flume-updates
in repository https://gitbox.apache.org/repos/asf/logging-flume-rpc.git
commit 9c5c48296273129790dd9a23b40d7407dd0feb69
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Wed Sep 9 08:38:06 2026 -0700
Update do to changes in the main Flume project
---
pom.xml => .flattened-pom.xml | 33 ++++-----
.../{pom.xml => .flattened-pom.xml} | 52 +++++++++-----
flume-embedded-agent/pom.xml | 26 +++++++
.../embedded/TestEmbeddedAgentEmbeddedSource.java | 6 +-
flume-rpc-avro/{pom.xml => .flattened-pom.xml} | 62 ++++++++--------
flume-rpc-avro/pom.xml | 8 +--
.../rpc/avro/source/SpoolDirectorySource.java | 40 ++++++++++-
.../serialization/TestSpoolingFileLineReader.java | 5 +-
.../apache/flume/rpc/avro/sink/TestAvroSink.java | 2 +-
flume-rpc-thrift/{pom.xml => .flattened-pom.xml} | 84 +++++++++++++---------
flume-rpc-thrift/pom.xml | 25 ++++++-
.../apache/flume/rpc/thrift/ThriftFlumeEvent.java | 1 -
.../flume/rpc/thrift/ThriftSourceProtocol.java | 8 ++-
.../flume/rpc/thrift/ThriftTestingSource.java | 2 +-
pom.xml | 2 +-
15 files changed, 236 insertions(+), 120 deletions(-)
diff --git a/pom.xml b/.flattened-pom.xml
similarity index 87%
copy from pom.xml
copy to .flattened-pom.xml
index 7209053..4f92e39 100644
--- a/pom.xml
+++ b/.flattened-pom.xml
@@ -15,35 +15,41 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.flume</groupId>
<artifactId>flume-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath />
+ <relativePath></relativePath>
</parent>
-
<artifactId>flume-rpc</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Flume RPC</name>
-
+ <url>https://logging.apache.org/flume/2.x/index.html/flume-rpc</url>
+ <licenses>
+ <license>
+ <name>Apache-2.0</name>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
<modules>
<module>flume-rpc-avro</module>
<module>flume-rpc-thrift</module>
<module>flume-embedded-agent</module>
</modules>
-
<properties>
- <avro.version>1.12.1</avro.version>
<checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
- <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
<jackson.version>2.17.0</jackson.version>
<netty-all.version>4.2.4.Final</netty-all.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
<thrift.version>0.23.0</thrift.version>
+ <rat.version>0.12</rat.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <avro.version>1.12.1</avro.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -52,7 +58,6 @@
<artifactId>avro</artifactId>
<version>${avro.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-compiler</artifactId>
@@ -100,18 +105,11 @@
<version>${avro.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${mvn-surefire-plugin.version}</version>
<configuration>
<argLine>-Djava.net.preferIPv4Stack=true</argLine>
- <!-- <argLine>
- - -add-opens java.base/java.lang=ALL-UNNAMED
- - -add-opens java.base/java.util=ALL-UNNAMED
- -Djava.net.preferIPv4Stack=true</argLine> -->
<reuseForks>false</reuseForks>
<forkCount>1</forkCount>
- <!--<rerunFailingTestsCount>10</rerunFailingTestsCount>-->
<forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
<redirectTestOutputToFile>${redirectTestOutput}</redirectTestOutputToFile>
<includes>
@@ -126,5 +124,4 @@
</plugins>
</pluginManagement>
</build>
-
</project>
diff --git a/flume-embedded-agent/pom.xml b/flume-embedded-agent/.flattened-pom.xml
similarity index 59%
copy from flume-embedded-agent/pom.xml
copy to flume-embedded-agent/.flattened-pom.xml
index 0ab5674..a036724 100644
--- a/flume-embedded-agent/pom.xml
+++ b/flume-embedded-agent/.flattened-pom.xml
@@ -15,77 +15,93 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.flume</groupId>
<artifactId>flume-rpc</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
<artifactId>flume-embedded-agent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
<name>Flume Embedded Agent</name>
<description>Flume Embedded Agent: Stable public API for Embedding a Flume 2.x Agent</description>
-
+ <url>https://logging.apache.org/flume/2.x/index.html/flume-rpc/flume-embedded-agent</url>
+ <licenses>
+ <license>
+ <name>Apache-2.0</name>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
<properties>
- <!-- TODO fix pmd violations -->
+ <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
<pmd.maxAllowedViolations>2</pmd.maxAllowedViolations>
<module.name>org.apache.flume.agent.embedded</module.name>
</properties>
-
<dependencies>
-
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-sdk</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-configuration</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-node</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.flume.flume-ng-channels</groupId>
<artifactId>flume-file-channel</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-rpc-avro</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <!-- only used for tests -->
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.13.0</version>
+ <configuration>
+ <compilerArgs>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/flume-embedded-agent/pom.xml b/flume-embedded-agent/pom.xml
index 0ab5674..ffaa1ea 100644
--- a/flume-embedded-agent/pom.xml
+++ b/flume-embedded-agent/pom.xml
@@ -30,6 +30,8 @@
<description>Flume Embedded Agent: Stable public API for Embedding a Flume 2.x Agent</description>
<properties>
+ <!-- This artifact was never released before -->
+ <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
<!-- TODO fix pmd violations -->
<pmd.maxAllowedViolations>2</pmd.maxAllowedViolations>
<module.name>org.apache.flume.agent.embedded</module.name>
@@ -88,4 +90,28 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.13.0</version>
+ <!-- Use a recent version -->
+ <configuration>
+ <compilerArgs>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/flume-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java b/flume-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java
index 65b905e..26a6792 100644
--- a/flume-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java
+++ b/flume-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java
@@ -16,7 +16,11 @@
*/
package org.apache.flume.agent.embedded;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
diff --git a/flume-rpc-avro/pom.xml b/flume-rpc-avro/.flattened-pom.xml
similarity index 90%
copy from flume-rpc-avro/pom.xml
copy to flume-rpc-avro/.flattened-pom.xml
index 1bee65a..006a566 100644
--- a/flume-rpc-avro/pom.xml
+++ b/flume-rpc-avro/.flattened-pom.xml
@@ -15,24 +15,31 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.flume</groupId>
<artifactId>flume-rpc</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
<groupId>org.apache.flume</groupId>
<artifactId>flume-rpc-avro</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
<name>Flume RPC Avro</name>
-
+ <url>https://logging.apache.org/flume/2.x/index.html/flume-rpc/flume-rpc-avro</url>
+ <licenses>
+ <license>
+ <name>Apache-2.0</name>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
<properties>
- <module.name>org.apache.flume.rpc.avro</module.name>
<spotbugs.maxAllowedViolations>55</spotbugs.maxAllowedViolations>
+ <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
<pmd.maxAllowedViolations>121</pmd.maxAllowedViolations>
+ <module.name>org.apache.flume.rpc.avro</module.name>
</properties>
<dependencies>
<dependency>
@@ -43,7 +50,6 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc-netty</artifactId>
</dependency>
-
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
@@ -54,8 +60,7 @@
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-sdk</artifactId>
- <classifier>tests</classifier>
+ <artifactId>flume-ng-sdk-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -80,25 +85,21 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -107,12 +108,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -128,11 +127,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${mvn-compiler-plugin.version}</version>
<configuration>
- <release>${releaseJavaVersion}</release>
+ <release>${maven.compiler.release}</release>
<compilerArgs>
<arg>-parameters</arg>
</compilerArgs>
@@ -142,6 +139,15 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>${rat.version}</version>
+ <executions>
+ <execution>
+ <id>verify.rat</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<excludes>
<exclude>**/.idea/</exclude>
@@ -154,7 +160,6 @@
<exclude>**/*.yml</exclude>
<exclude>**/*.yaml</exclude>
<exclude>**/*.json</exclude>
- <!-- ASF jenkins box puts the Maven repo in our root directory. -->
<exclude>.repository/</exclude>
<exclude>**/*.diff</exclude>
<exclude>**/*.patch</exclude>
@@ -173,40 +178,29 @@
</excludes>
<consoleOutput>true</consoleOutput>
</configuration>
- <executions>
- <execution>
- <id>verify.rat</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
- <configuration>
- <stringType>CharSequence</stringType>
- </configuration>
<executions>
<execution>
<id>Avro Generate</id>
+ <phase>generate-sources</phase>
<goals>
<goal>idl-protocol</goal>
<goal>schema</goal>
</goals>
- <phase>generate-sources</phase>
<configuration>
<sourceDirectory>${project.basedir}/src/main/avro</sourceDirectory>
<outputDirectory>${project.build.directory}/generated-sources/avro</outputDirectory>
</configuration>
</execution>
</executions>
+ <configuration>
+ <stringType>CharSequence</stringType>
+ </configuration>
</plugin>
-
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
diff --git a/flume-rpc-avro/pom.xml b/flume-rpc-avro/pom.xml
index 1bee65a..4f6ba5a 100644
--- a/flume-rpc-avro/pom.xml
+++ b/flume-rpc-avro/pom.xml
@@ -30,6 +30,8 @@
<name>Flume RPC Avro</name>
<properties>
+ <!-- This artifact was never released before -->
+ <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
<module.name>org.apache.flume.rpc.avro</module.name>
<spotbugs.maxAllowedViolations>55</spotbugs.maxAllowedViolations>
<pmd.maxAllowedViolations>121</pmd.maxAllowedViolations>
@@ -54,8 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-sdk</artifactId>
- <classifier>tests</classifier>
+ <artifactId>flume-ng-sdk-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -130,9 +131,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${mvn-compiler-plugin.version}</version>
<configuration>
- <release>${releaseJavaVersion}</release>
+ <release>${maven.compiler.release}</release>
<compilerArgs>
<arg>-parameters</arg>
</compilerArgs>
diff --git a/flume-rpc-avro/src/main/java/org/apache/flume/rpc/avro/source/SpoolDirectorySource.java b/flume-rpc-avro/src/main/java/org/apache/flume/rpc/avro/source/SpoolDirectorySource.java
index 9815e97..ddc87d3 100644
--- a/flume-rpc-avro/src/main/java/org/apache/flume/rpc/avro/source/SpoolDirectorySource.java
+++ b/flume-rpc-avro/src/main/java/org/apache/flume/rpc/avro/source/SpoolDirectorySource.java
@@ -16,7 +16,45 @@
*/
package org.apache.flume.rpc.avro.source;
-import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.*;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.BASENAME_HEADER;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.BASENAME_HEADER_KEY;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.BATCH_SIZE;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.BUFFER_MAX_LINE_LENGTH;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.CONSUME_ORDER;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.ConsumeOrder;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DECODE_ERROR_POLICY;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_BASENAME_HEADER;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_BASENAME_HEADER_KEY;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_BATCH_SIZE;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_CONSUME_ORDER;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_DECODE_ERROR_POLICY;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_DELETE_POLICY;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_DESERIALIZER;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_FILENAME_HEADER_KEY;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_FILE_HEADER;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_IGNORE_PAT;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_INCLUDE_PAT;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_INPUT_CHARSET;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_MAX_BACKOFF;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_POLL_DELAY;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_RECURSIVE_DIRECTORY_SEARCH;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_SPOOLED_FILE_SUFFIX;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_TRACKER_DIR;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DEFAULT_TRACKING_POLICY;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DELETE_POLICY;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.DESERIALIZER;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.FILENAME_HEADER;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.FILENAME_HEADER_KEY;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.IGNORE_PAT;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.INCLUDE_PAT;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.INPUT_CHARSET;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.MAX_BACKOFF;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.POLL_DELAY;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.RECURSIVE_DIRECTORY_SEARCH;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.SPOOLED_FILE_SUFFIX;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.SPOOL_DIRECTORY;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.TRACKER_DIR;
+import static org.apache.flume.source.SpoolDirectorySourceConfigurationConstants.TRACKING_POLICY;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
diff --git a/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/serialization/TestSpoolingFileLineReader.java b/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/serialization/TestSpoolingFileLineReader.java
index dd3e892..e66546a 100644
--- a/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/serialization/TestSpoolingFileLineReader.java
+++ b/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/serialization/TestSpoolingFileLineReader.java
@@ -16,7 +16,10 @@
*/
package org.apache.flume.rpc.avro.serialization;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import com.google.common.base.Charsets;
import com.google.common.base.Throwables;
diff --git a/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/sink/TestAvroSink.java b/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/sink/TestAvroSink.java
index 2b7630e..c7f3ae2 100644
--- a/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/sink/TestAvroSink.java
+++ b/flume-rpc-avro/src/test/java/org/apache/flume/rpc/avro/sink/TestAvroSink.java
@@ -54,10 +54,10 @@ import org.apache.flume.instrumentation.SinkCounter;
import org.apache.flume.lifecycle.LifecycleController;
import org.apache.flume.lifecycle.LifecycleState;
import org.apache.flume.rpc.avro.source.AvroSource;
+import org.apache.flume.sdk.test.Whitebox;
import org.apache.flume.source.avro.AvroFlumeEvent;
import org.apache.flume.source.avro.AvroSourceProtocol;
import org.apache.flume.source.avro.Status;
-import org.apache.flume.util.Whitebox;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
diff --git a/flume-rpc-thrift/pom.xml b/flume-rpc-thrift/.flattened-pom.xml
similarity index 76%
copy from flume-rpc-thrift/pom.xml
copy to flume-rpc-thrift/.flattened-pom.xml
index 533c55c..9b4dc89 100644
--- a/flume-rpc-thrift/pom.xml
+++ b/flume-rpc-thrift/.flattened-pom.xml
@@ -15,25 +15,30 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.flume</groupId>
<artifactId>flume-rpc</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
<groupId>org.apache.flume</groupId>
<artifactId>flume-rpc-thrift</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
<name>Flume RPC Thrift</name>
-
+ <url>https://logging.apache.org/flume/2.x/index.html/flume-rpc/flume-rpc-thrift</url>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>
-
+ <licenses>
+ <license>
+ <name>Apache-2.0</name>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
<developers>
<developer>
<id>rgoers</id>
@@ -42,20 +47,18 @@
<organization>Nextiva</organization>
</developer>
</developers>
-
<scm>
<connection>https://gitbox.apache.org/repos/asf/flume-spring-boot.git</connection>
<developerConnection>https://gitbox.apache.org/repos/asf/flume-spring-boot.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf/flume-spring-boot.git</url>
</scm>
-
<properties>
<thrift.version>0.14.2</thrift.version>
- <module.name>org.apache.flume.rpc.thrift</module.name>
<spotbugs.maxAllowedViolations>62</spotbugs.maxAllowedViolations>
+ <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
<pmd.maxAllowedViolations>121</pmd.maxAllowedViolations>
+ <module.name>org.apache.flume.rpc.thrift</module.name>
</properties>
-
<dependencies>
<dependency>
<groupId>org.apache.flume</groupId>
@@ -63,8 +66,7 @@
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-sdk</artifactId>
- <classifier>tests</classifier>
+ <artifactId>flume-ng-sdk-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -104,10 +106,37 @@
</dependencies>
<build>
<plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.13.0</version>
+ <configuration>
+ <compilerArgs>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>${rat.version}</version>
+ <executions>
+ <execution>
+ <id>verify.rat</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<excludes>
<exclude>**/.idea/</exclude>
@@ -120,7 +149,6 @@
<exclude>**/*.yml</exclude>
<exclude>**/*.yaml</exclude>
<exclude>**/*.json</exclude>
- <!-- ASF jenkins box puts the Maven repo in our root directory. -->
<exclude>.repository/</exclude>
<exclude>**/*.diff</exclude>
<exclude>**/*.patch</exclude>
@@ -139,71 +167,59 @@
</excludes>
<consoleOutput>true</consoleOutput>
</configuration>
- <executions>
- <execution>
- <id>verify.rat</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>compileThrift</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
+ <activation />
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>compileThrift</id>
+ <phase>generate-sources</phase>
<goals>
<goal>run</goal>
</goals>
- <phase>generate-sources</phase>
<configuration>
<target>
<echo file="target/compile-thrift.sh">LICENSE=src/main/thrift/aslv2
THRIFT_DIR=src/main/thrift
JAVA_DIR=target/generated-sources/thrift
- mkdir -p $JAVA_DIR 2> /dev/null
+ mkdir -p $JAVA_DIR 2> /dev/null
JSTATUS=$?
if [ $JSTATUS -ne 0 ] ; then
echo "Could not create $JAVA_DIR. Will not generate thrift files."
exit $JSTATUS
fi
- for THRIFT_FILE in `ls $THRIFT_DIR/*.thrift 2> /dev/null`
+ for THRIFT_FILE in `ls $THRIFT_DIR/*.thrift 2> /dev/null`
do
thrift --gen java:hashcode -o $JAVA_DIR $THRIFT_FILE
done
SRC_DIR=$JAVA_DIR/gen-java/org/apache/flume/thrift/
DEST_DIR=src/main/java/org/apache/flume/thrift
if [ ! -d $DEST_DIR ] ; then
- mkdir $DEST_DIR 2> /dev/null
+ mkdir $DEST_DIR 2> /dev/null
STATUS=$?
if [ $STATUS -ne 0 ] ; then
echo "Could not create $DEST_DIR. Will not generate thrift files."
exit $STATUS
fi
fi
- for JAVA_FILE in `ls $SRC_DIR/*.java 2> /dev/null`
+ for JAVA_FILE in `ls $SRC_DIR/*.java 2> /dev/null`
do
echo $JAVA_FILE
- cat $LICENSE > $JAVA_FILE.tmp
- cat $JAVA_FILE >> $JAVA_FILE.tmp
+ cat $LICENSE > $JAVA_FILE.tmp
+ cat $JAVA_FILE >> $JAVA_FILE.tmp
mv $JAVA_FILE.tmp $JAVA_FILE
cp $JAVA_FILE $DEST_DIR
done
rm -rf $JAVA_DIR</echo>
- <exec dir="${basedir}" executable="sh" failonerror="true">
+ <exec failonerror="true" dir="${basedir}" executable="sh">
<arg line="target/compile-thrift.sh" />
</exec>
</target>
diff --git a/flume-rpc-thrift/pom.xml b/flume-rpc-thrift/pom.xml
index 533c55c..ff0b106 100644
--- a/flume-rpc-thrift/pom.xml
+++ b/flume-rpc-thrift/pom.xml
@@ -50,6 +50,8 @@
</scm>
<properties>
+ <!-- This artifact was never released before -->
+ <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
<thrift.version>0.14.2</thrift.version>
<module.name>org.apache.flume.rpc.thrift</module.name>
<spotbugs.maxAllowedViolations>62</spotbugs.maxAllowedViolations>
@@ -63,8 +65,7 @@
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-sdk</artifactId>
- <classifier>tests</classifier>
+ <artifactId>flume-ng-sdk-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -104,6 +105,26 @@
</dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.13.0</version>
+ <!-- Use a recent version -->
+ <configuration>
+ <compilerArgs>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+ <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
diff --git a/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftFlumeEvent.java b/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftFlumeEvent.java
index 320cb1b..4948d68 100644
--- a/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftFlumeEvent.java
+++ b/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftFlumeEvent.java
@@ -31,7 +31,6 @@ import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2017-09-01")
diff --git a/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftSourceProtocol.java b/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftSourceProtocol.java
index 1c44708..0a56d62 100644
--- a/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftSourceProtocol.java
+++ b/flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift/ThriftSourceProtocol.java
@@ -32,7 +32,7 @@ import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
+import org.apache.thrift.server.AbstractNonblockingServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -346,7 +346,8 @@ public class ThriftSourceProtocol {
return new append_args();
}
- public AsyncMethodCallback<Status> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<Status> getResultHandler(
+ final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<Status>() {
public void onComplete(Status o) {
@@ -402,7 +403,8 @@ public class ThriftSourceProtocol {
return new appendBatch_args();
}
- public AsyncMethodCallback<Status> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<Status> getResultHandler(
+ final AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<Status>() {
public void onComplete(Status o) {
diff --git a/flume-rpc-thrift/src/test/java/org/apache/flume/rpc/thrift/ThriftTestingSource.java b/flume-rpc-thrift/src/test/java/org/apache/flume/rpc/thrift/ThriftTestingSource.java
index b74f2c7..7b64c72 100644
--- a/flume-rpc-thrift/src/test/java/org/apache/flume/rpc/thrift/ThriftTestingSource.java
+++ b/flume-rpc-thrift/src/test/java/org/apache/flume/rpc/thrift/ThriftTestingSource.java
@@ -59,7 +59,7 @@ import org.apache.flume.exception.ChannelException;
import org.apache.flume.instrumentation.SourceCounter;
import org.apache.flume.rpc.thrift.client.ThriftRpcClient;
import org.apache.flume.rpc.thrift.source.ThriftSource;
-import org.apache.flume.util.Whitebox;
+import org.apache.flume.sdk.test.Whitebox;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TCompactProtocol;
diff --git a/pom.xml b/pom.xml
index 7209053..8ccfada 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
<netty-all.version>4.2.4.Final</netty-all.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<thrift.version>0.23.0</thrift.version>
+ <rat.version>0.12</rat.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -102,7 +103,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${mvn-surefire-plugin.version}</version>
<configuration>
<argLine>-Djava.net.preferIPv4Stack=true</argLine>
<!-- <argLine>