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 <[email protected]> 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>[email protected]</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>
