This is an automated email from the ASF dual-hosted git repository. ppkarwasz pushed a commit to branch fix/build-project in repository https://gitbox.apache.org/repos/asf/logging-flume-rpc.git
commit 19b8251d5782e63c663f4ffc06ce843c4273fa90 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Wed Sep 2 20:07:48 2026 +0200 Simplify POM files Use `${revision}` for the project version, add the `<scm>` block and remove from the POM files everything that `flume-parent` or `logging-parent` already provides: the Surefire, compiler, RAT and `test-jar` plugin configuration, the redundant properties (four of which were undefined) and the `netty-all` version. RAT excludes move to `.rat-excludes`, which `flume-parent` picks up. - `flume-ng-sdk` with the `tests` classifier has no managed version in Flume 2.x; the tests only use `Whitebox`, so the dependency becomes `flume-ng-sdk-test`. - `flume-rpc-thrift` overrode `thrift.version` to 0.14.2, hiding the root's 0.23.0. The override is gone and the root is pinned to 0.14.2, since the checked-in generated sources do not compile against newer `libthrift`. - `netty-all` moves from the locally pinned 4.2.4.Final to the 4.2.16.Final managed by `flume-third-party-dependencies`; the Netty modules pulled in by `avro-ipc-netty` are excluded, as `flume-rpc-avro` depends on `netty-all`. - `.mvn/jvm.config` provides the `--add-exports` flags Error Prone needs. - The temporary `use-apache-snapshots` profile, activated through `.mvn/maven.config`, resolves the unreleased parent. Assisted-By: Claude Fable 5.1 <[email protected]> Claude-Session: https://claude.ai/code/session_01F9NiqMnCccUGDtqt64uKe6 --- .mvn/jvm.config | 11 +++++ .mvn/maven.config | 1 + .rat-excludes | 5 ++ flume-embedded-agent/pom.xml | 3 +- flume-rpc-avro/pom.xml | 76 +------------------------------ flume-rpc-thrift/pom.xml | 84 +--------------------------------- pom.xml | 106 ++++++++++++++++++++++++++----------------- 7 files changed, 86 insertions(+), 200 deletions(-) diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 0000000..f3b9f7d --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1,11 @@ +--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED +-Dfile.encoding=UTF-8 diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..33b031d --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Puse-apache-snapshots diff --git a/.rat-excludes b/.rat-excludes new file mode 100644 index 0000000..bdb9d8e --- /dev/null +++ b/.rat-excludes @@ -0,0 +1,5 @@ +.rat-excludes +**/src/test/resources/** +**/*.avsc +**/*.avro +**/src/main/thrift/aslv2 diff --git a/flume-embedded-agent/pom.xml b/flume-embedded-agent/pom.xml index 0ab5674..3de0e23 100644 --- a/flume-embedded-agent/pom.xml +++ b/flume-embedded-agent/pom.xml @@ -21,8 +21,7 @@ <parent> <groupId>org.apache.flume</groupId> <artifactId>flume-rpc</artifactId> - <version>2.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <version>${revision}</version> </parent> <artifactId>flume-embedded-agent</artifactId> diff --git a/flume-rpc-avro/pom.xml b/flume-rpc-avro/pom.xml index 1bee65a..fa95662 100644 --- a/flume-rpc-avro/pom.xml +++ b/flume-rpc-avro/pom.xml @@ -21,11 +21,9 @@ <parent> <groupId>org.apache.flume</groupId> <artifactId>flume-rpc</artifactId> - <version>2.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <version>${revision}</version> </parent> - <groupId>org.apache.flume</groupId> <artifactId>flume-rpc-avro</artifactId> <name>Flume RPC Avro</name> @@ -54,8 +52,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> @@ -116,7 +113,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> @@ -127,62 +123,6 @@ </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${mvn-compiler-plugin.version}</version> - <configuration> - <release>${releaseJavaVersion}</release> - <compilerArgs> - <arg>-parameters</arg> - </compilerArgs> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <version>${rat.version}</version> - <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> - <!-- ASF jenkins box puts the Maven repo in our root directory. --> - <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> - <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> @@ -204,18 +144,6 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <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/pom.xml b/flume-rpc-thrift/pom.xml index 533c55c..ff4d6e2 100644 --- a/flume-rpc-thrift/pom.xml +++ b/flume-rpc-thrift/pom.xml @@ -21,36 +21,13 @@ <parent> <groupId>org.apache.flume</groupId> <artifactId>flume-rpc</artifactId> - <version>2.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <version>${revision}</version> </parent> - <groupId>org.apache.flume</groupId> <artifactId>flume-rpc-thrift</artifactId> <name>Flume RPC Thrift</name> - <organization> - <name>Apache Software Foundation</name> - <url>http://www.apache.org</url> - </organization> - - <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> <module.name>org.apache.flume.rpc.thrift</module.name> <spotbugs.maxAllowedViolations>62</spotbugs.maxAllowedViolations> <pmd.maxAllowedViolations>121</pmd.maxAllowedViolations> @@ -63,8 +40,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> @@ -78,13 +54,6 @@ <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> @@ -102,55 +71,6 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <version>${rat.version}</version> - <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> - <!-- ASF jenkins box puts the Maven repo in our root directory. --> - <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> - <executions> - <execution> - <id>verify.rat</id> - <goals> - <goal>check</goal> - </goals> - <phase>verify</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> <profiles> <profile> <id>compileThrift</id> diff --git a/pom.xml b/pom.xml index 7209053..ef4d62d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,46 +26,64 @@ </parent> <artifactId>flume-rpc</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>${revision}</version> <packaging>pom</packaging> <name>Flume RPC</name> + <inceptionYear>2026</inceptionYear> + <modules> <module>flume-rpc-avro</module> <module>flume-rpc-thrift</module> <module>flume-embedded-agent</module> </modules> + <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false"> + <connection>scm:git:https://gitbox.apache.org/repos/asf/logging-flume-rpc.git</connection> + <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/logging-flume-rpc.git</developerConnection> + <tag>rel/${revision}</tag> + <url>https://gitbox.apache.org/repos/asf/logging-flume-rpc.git</url> + </scm> + <properties> + + <revision>2.0.0-SNAPSHOT</revision> + + <!-- These artifacts were never released before --> + <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing> + + <!-- The website is generated by Antora from `flume-project`: skip the per-module `maven-site-plugin` sites. --> + <maven.site.skip>true</maven.site.skip> + <!-- Dummy value; overwritten by CI at release time. Do not edit manually. --> + <project.build.outputTimestamp>2026-01-01T00:00:00Z</project.build.outputTimestamp> + + <!-- Dependency versions --> <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> - <thrift.version>0.23.0</thrift.version> + <!-- + ~ The sources under `flume-rpc-thrift/src/main/java/org/apache/flume/rpc/thrift` were generated by the Thrift 0.14 compiler + ~ and do not compile against newer `libthrift` versions: regenerate them with the `compileThrift` profile before upgrading. + --> + <thrift.version>0.14.2</thrift.version> </properties> + <dependencyManagement> <dependencies> + <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> <version>${avro.version}</version> </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro-compiler</artifactId> - <version>${avro.version}</version> - </dependency> <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro-ipc-netty</artifactId> <version>${avro.version}</version> <exclusions> + <!-- `flume-rpc-avro` depends on `netty-all`, managed by `flume-parent`: skip the older Netty modules pulled in by Avro --> <exclusion> <groupId>io.netty</groupId> - <artifactId>netty</artifactId> + <artifactId>*</artifactId> </exclusion> <exclusion> <groupId>org.mortbay.jetty</groupId> @@ -73,11 +91,7 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${netty-all.version}</version> - </dependency> + <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> @@ -91,6 +105,7 @@ </dependency> </dependencies> </dependencyManagement> + <build> <pluginManagement> <plugins> @@ -99,32 +114,39 @@ <artifactId>avro-maven-plugin</artifactId> <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> - <include>${test.include.pattern}</include> - </includes> - <excludes> - <exclude>**/*$*</exclude> - <exclude>${test.exclude.pattern}</exclude> - </excludes> - </configuration> - </plugin> </plugins> </pluginManagement> </build> + <profiles> + <!-- Temporary copy from org.apache:apache, until the parent POM is released --> + <profile> + <id>use-apache-snapshots</id> + <activation> + <property> + <name>apache.snapshots</name> + </property> + </activation> + <repositories> + <repository> + <releases> + <enabled>false</enabled> + </releases> + <id>apache.snapshots</id> + <name>Apache Snapshot Repository</name> + <url>https://repository.apache.org/snapshots</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <releases> + <enabled>false</enabled> + </releases> + <id>apache.snapshots</id> + <name>Apache Snapshot Repository</name> + <url>https://repository.apache.org/snapshots</url> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> </project>
