This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch flatten in repository https://gitbox.apache.org/repos/asf/logging-flume.git
commit e407167f7d0cfa197593392b544182884eeb7314 Author: Ralph Goers <[email protected]> AuthorDate: Sun Jun 14 12:58:26 2026 -0700 Resolve the variables so the parent and bom poms can be used by other builds --- flume-bom/pom.xml | 38 ++++++++++++++++++++++++++++++++++++++ flume-parent/pom.xml | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/flume-bom/pom.xml b/flume-bom/pom.xml index 90fcb70f4..67ce79ed2 100644 --- a/flume-bom/pom.xml +++ b/flume-bom/pom.xml @@ -235,4 +235,42 @@ </dependencies> </dependencyManagement> + <build> + <plugins> + + <!-- Enable BOM flattening --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.7.3</version> + <executions> + <execution> + <id>flatten-bom</id> + <goals> + <goal>flatten</goal> + </goals> + <phase>process-resources</phase> + <inherited>false</inherited> + <configuration> + <updatePomFile>true</updatePomFile> + <flattenMode>bom</flattenMode> + <pomElements> + <dependencyManagement>resolve</dependencyManagement> + <properties>flatten</properties> + </pomElements> + </configuration> + </execution> + <!-- ensure proper cleanup --> + <execution> + <id>flatten.clean</id> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </project> diff --git a/flume-parent/pom.xml b/flume-parent/pom.xml index a4fd6fa75..c9f381ce4 100644 --- a/flume-parent/pom.xml +++ b/flume-parent/pom.xml @@ -991,7 +991,7 @@ <artifactId>maven-pmd-plugin</artifactId> <version>${mvn-pmd-plugin.version}</version> <configuration> - <targetJdk>${targetJavaVersion}</targetJdk> + <targetJdk>${releaseJavaVersion}</targetJdk> <excludeRoots> <excludeRoot>${project.build.directory}/generated-sources</excludeRoot> </excludeRoots> @@ -1207,6 +1207,38 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> </plugin> + <!-- Enable Parent POM flattening --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.7.3</version> + <executions> + <execution> + <id>flatten-bom</id> + <goals> + <goal>flatten</goal> + </goals> + <phase>process-resources</phase> + <inherited>false</inherited> + <configuration> + <updatePomFile>true</updatePomFile> + <flattenMode>bom</flattenMode> + <pomElements> + <dependencyManagement>resolve</dependencyManagement> + <pluginManagement>resolve</pluginManagement> + <properties>flatten</properties> + </pomElements> + </configuration> + </execution> + <!-- ensure proper cleanup --> + <execution> + <id>flatten.clean</id> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> <extensions> <extension>
