Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions flume-bom/.logging-parent-bom-activator
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-License-Identifier: Apache-2.0
# Marker file to activate BOM flattening
52 changes: 10 additions & 42 deletions flume-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,22 @@
<parent>
<groupId>org.apache.flume</groupId>
<artifactId>flume-project</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<groupId>org.apache.flume</groupId>

<artifactId>flume-dependencies</artifactId>
<packaging>pom</packaging>

<name>Apache Flume Artifacts</name>
<name>Apache Flume BOM</name>
<description>Bill of materials (BOM) of Apache Flume.
It provides a coherent set of versions for all Apache Flume artifacts in the official distribution.</description>

<properties>
<!-- <flume-hadoop.version>2.0.0-SNAPSHOT</flume-hadoop.version>-->
<!-- Re-enable publishing: `flume-project` disables it, but this BOM must be installed and deployed. -->
<maven.install.skip>false</maven.install.skip>
<maven.deploy.skip>false</maven.deploy.skip>

<flume-hadoop.version>2.0.0-SNAPSHOT</flume-hadoop.version>
<flume-http.version>2.0.0-SNAPSHOT</flume-http.version>
<flume-irc.version>2.0.0-SNAPSHOT</flume-irc.version>
<flume-jdbc.version>2.0.0-SNAPSHOT</flume-jdbc.version>
Expand Down Expand Up @@ -235,42 +241,4 @@
</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>
2 changes: 2 additions & 0 deletions flume-third-party/.logging-parent-bom-activator
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-License-Identifier: Apache-2.0
# Marker file to activate BOM flattening
72 changes: 10 additions & 62 deletions flume-third-party/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,37 +22,21 @@
<parent>
<groupId>org.apache.flume</groupId>
<artifactId>flume-project</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<version>${revision}</version>
</parent>
<groupId>org.apache.flume</groupId>

<artifactId>flume-third-party-dependencies</artifactId>
<packaging>pom</packaging>

<name>Apache Flume Third Party Dependencies</name>

<inceptionYear>2009</inceptionYear>

<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<scm>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/flume.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/flume.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=flume.git;a=tree;h=refs/heads/trunk;hb=trunk</url>
</scm>
<description>Bill of materials (BOM) for the third-party dependencies of Apache Flume.
It matches the versions of the runtime dependencies used by the corresponding `flume-dependencies` artifacts.</description>

<properties>
<flume-project.version>2.0.0-SNAPSHOT</flume-project.version>
<!-- Re-enable publishing: `flume-project` disables it, but this BOM must be installed and deployed. -->
<maven.install.skip>false</maven.install.skip>
<maven.deploy.skip>false</maven.deploy.skip>

<commons-cli.version>1.5.0</commons-cli.version>
<commons-codec.version>1.22.0</commons-codec.version>
<commons-collections.version>3.2.2</commons-collections.version>
Expand Down Expand Up @@ -280,15 +264,15 @@
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-dependencies</artifactId>
<version>${flume-project.version}</version>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>build-support</artifactId>
<version>${flume-project.version}</version>
<version>${project.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -481,40 +465,4 @@
</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>
Loading
Loading