You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by es...@apache.org on 2011/12/14 23:12:10 UTC
svn commit: r1214504 - in /incubator/flume/branches/flume-728: ./
flume-ng-channels/ flume-ng-channels/flume-file-channel/
flume-ng-channels/flume-jdbc-channel/ flume-ng-dist/
flume-ng-dist/src/main/assembly/ flume-ng-node/ flume-ng-sinks/
flume-ng-sin...
Author: esammer
Date: Wed Dec 14 22:12:09 2011
New Revision: 1214504
URL: http://svn.apache.org/viewvc?rev=1214504&view=rev
Log:
FLUME-878: Write release-ready Maven assembly descriptor
Modified:
incubator/flume/branches/flume-728/flume-ng-channels/flume-file-channel/pom.xml
incubator/flume/branches/flume-728/flume-ng-channels/flume-jdbc-channel/pom.xml
incubator/flume/branches/flume-728/flume-ng-channels/pom.xml
incubator/flume/branches/flume-728/flume-ng-dist/pom.xml
incubator/flume/branches/flume-728/flume-ng-dist/src/main/assembly/dist.xml
incubator/flume/branches/flume-728/flume-ng-node/pom.xml
incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/pom.xml
incubator/flume/branches/flume-728/flume-ng-sinks/pom.xml
incubator/flume/branches/flume-728/pom.xml
Modified: incubator/flume/branches/flume-728/flume-ng-channels/flume-file-channel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-channels/flume-file-channel/pom.xml?rev=1214504&r1=1214503&r2=1214504&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-channels/flume-file-channel/pom.xml (original)
+++ incubator/flume/branches/flume-728/flume-ng-channels/flume-file-channel/pom.xml Wed Dec 14 22:12:09 2011
@@ -27,9 +27,8 @@
<version>0.9.5-SNAPSHOT</version>
</parent>
- <groupId>org.apache.flume</groupId>
+ <groupId>org.apache.flume.flume-ng-channels</groupId>
<artifactId>flume-file-channel</artifactId>
- <version>0.9.5-SNAPSHOT</version>
<name>Flume NG file-based channel</name>
<build>
@@ -46,7 +45,7 @@
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-core</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: incubator/flume/branches/flume-728/flume-ng-channels/flume-jdbc-channel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-channels/flume-jdbc-channel/pom.xml?rev=1214504&r1=1214503&r2=1214504&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-channels/flume-jdbc-channel/pom.xml (original)
+++ incubator/flume/branches/flume-728/flume-ng-channels/flume-jdbc-channel/pom.xml Wed Dec 14 22:12:09 2011
@@ -28,7 +28,6 @@ limitations under the License.
<groupId>org.apache.flume.flume-ng-channels</groupId>
<artifactId>flume-jdbc-channel</artifactId>
- <version>0.9.5-SNAPSHOT</version>
<name>Flume NG JDBC channel</name>
<build>
Modified: incubator/flume/branches/flume-728/flume-ng-channels/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-channels/pom.xml?rev=1214504&r1=1214503&r2=1214504&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-channels/pom.xml (original)
+++ incubator/flume/branches/flume-728/flume-ng-channels/pom.xml Wed Dec 14 22:12:09 2011
@@ -28,7 +28,6 @@ limitations under the License.
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-channels</artifactId>
- <version>0.9.5-SNAPSHOT</version>
<name>Flume NG Channels</name>
<packaging>pom</packaging>
Modified: incubator/flume/branches/flume-728/flume-ng-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-dist/pom.xml?rev=1214504&r1=1214503&r2=1214504&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-dist/pom.xml (original)
+++ incubator/flume/branches/flume-728/flume-ng-dist/pom.xml Wed Dec 14 22:12:09 2011
@@ -25,10 +25,10 @@
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
<version>0.9.5-SNAPSHOT</version>
- <relativePath>..</relativePath>
</parent>
<artifactId>flume-ng-dist</artifactId>
+ <packaging>pom</packaging>
<name>Flume NG distribution</name>
<build>
@@ -45,14 +45,9 @@
</goals>
<inherited>false</inherited>
<configuration>
- <!--
<descriptors>
<descriptor>src/main/assembly/dist.xml</descriptor>
</descriptors>
- -->
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
</configuration>
</execution>
</executions>
@@ -70,12 +65,27 @@
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-core</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-node</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flume.flume-ng-channels</groupId>
+ <artifactId>flume-file-channel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flume.flume-ng-channels</groupId>
+ <artifactId>flume-jdbc-channel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flume.flume-ng-sinks</groupId>
+ <artifactId>flume-hdfs-sink</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: incubator/flume/branches/flume-728/flume-ng-dist/src/main/assembly/dist.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-dist/src/main/assembly/dist.xml?rev=1214504&r1=1214503&r2=1214504&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-dist/src/main/assembly/dist.xml (original)
+++ incubator/flume/branches/flume-728/flume-ng-dist/src/main/assembly/dist.xml Wed Dec 14 22:12:09 2011
@@ -17,8 +17,6 @@
under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
-
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -27,97 +25,86 @@
<id>project</id>
<formats>
- <format>dir</format>
+ <!-- FIXME: This will become tar.gz or tar.bz2 after testing. -->
+ <format>tar.gz</format>
+ <format>zip</format>
</formats>
- <includeBaseDirectory>true</includeBaseDirectory>
+
<baseDirectory>flume-${project.version}</baseDirectory>
<moduleSets>
- <!-- Copy flume core jar to lib -->
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
- <sources>
- <outputDirectory>/</outputDirectory>
- <includes />
- <excludes>
- <!-- maven build stuff -->
- <exclude>**/target/**</exclude>
- <!-- default eclipse junk -->
- <exclude>**/bin/**</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.gitignore</exclude>
- </excludes>
- </sources>
+ <includes>
+ <include>org.apache.flume:flume-ng-core</include>
+ <include>org.apache.flume:flume-ng-node</include>
+ <include>org.apache.flume:flume-ng-dist</include>
+ <include>org.apache.flume:flume-ng-channels</include>
+ <include>org.apache.flume:flume-ng-sinks</include>
+ </includes>
<binaries>
- <outputDirectory>/</outputDirectory>
<unpack>false</unpack>
- <includes />
+ <outputDirectory>lib</outputDirectory>
<dependencySets>
<dependencySet>
- <scope>provided</scope>
- <outputDirectory>/</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
-
- <dependencySet>
- <scope>runtime</scope>
<outputDirectory>lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
</binaries>
- <includes>
- <include>org.apache.flume:flume-ng-core</include>
- </includes>
+ <sources>
+ <includeModuleDirectory>true</includeModuleDirectory>
+ <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
+
+ <fileSets>
+ <fileSet>
+ <excludes>
+ <exclude>target/**</exclude>
+ <exclude>*/target/**</exclude>
+ <exclude>.classpath</exclude>
+ <exclude>*/.classpath</exclude>
+ <exclude>.project</exclude>
+ <exclude>*/.project</exclude>
+ <exclude>.settings/**</exclude>
+ <exclude>*/.settings/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ </sources>
+
</moduleSet>
</moduleSets>
- <fileSets>
-
- <!-- Copy miscellaneous top level files -->
+ <fileSets>
<fileSet>
<directory>../</directory>
+
+ <excludes>
+ <exclude>flume-ng-core/**</exclude>
+ <exclude>flume-ng-node/**</exclude>
+ <exclude>flume-ng-channels/**</exclude>
+ <exclude>flume-ng-sinks/**</exclude>
+ <exclude>flume-ng-dist/**</exclude>
+ <exclude>target/**</exclude>
+ <exclude>lib/**</exclude>
+ </excludes>
+
<includes>
- <include>CHANGELOG.html</include>
<include>DEVNOTES</include>
+ <include>README</include>
<include>LICENSE</include>
<include>NOTICE</include>
- <include>README</include>
+ <include>bin/**</include>
+ <include>conf/**</include>
<include>pom.xml</include>
- <include>pmd.xml</include>
- <include>RELEASENOTES</include>
</includes>
</fileSet>
-
- <!-- Copy flume sources -->
- <fileSet>
- <outputDirectory>/</outputDirectory>
- <directory>../</directory>
- <includes>
- <include>flume-ng-core/**</include>
- <include>flume-ng-node/**</include>
- <include>flume-ng-dist/**</include>
- </includes>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/target</exclude>
- <!-- default eclipse junk -->
- <exclude>**/bin/**</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.gitignore</exclude>
- </excludes>
- </fileSet>
-
</fileSets>
</assembly>
Modified: incubator/flume/branches/flume-728/flume-ng-node/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/pom.xml?rev=1214504&r1=1214503&r2=1214504&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/pom.xml (original)
+++ incubator/flume/branches/flume-728/flume-ng-node/pom.xml Wed Dec 14 22:12:09 2011
@@ -28,9 +28,7 @@
<version>0.9.5-SNAPSHOT</version>
</parent>
- <groupId>org.apache.flume</groupId>
<artifactId>flume-ng-node</artifactId>
- <version>0.9.5-SNAPSHOT</version>
<name>Flume NG Node</name>
<build>
Modified: incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/pom.xml?rev=1214504&r1=1214503&r2=1214504&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/pom.xml (original)
+++ incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/pom.xml Wed Dec 14 22:12:09 2011
@@ -28,7 +28,6 @@ limitations under the License.
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-hdfs-sink</artifactId>
- <version>0.9.5-SNAPSHOT</version>
<name>Flume NG HDFS </name>
<build>
@@ -45,7 +44,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-core</artifactId>
- <version>0.9.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: incubator/flume/branches/flume-728/flume-ng-sinks/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-sinks/pom.xml?rev=1214504&r1=1214503&r2=1214504&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-sinks/pom.xml (original)
+++ incubator/flume/branches/flume-728/flume-ng-sinks/pom.xml Wed Dec 14 22:12:09 2011
@@ -28,7 +28,6 @@ limitations under the License.
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-sinks</artifactId>
- <version>0.9.5-SNAPSHOT</version>
<name>Flume NG Sinks</name>
<packaging>pom</packaging>
Modified: incubator/flume/branches/flume-728/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/pom.xml?rev=1214504&r1=1214503&r2=1214504&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/pom.xml (original)
+++ incubator/flume/branches/flume-728/pom.xml Wed Dec 14 22:12:09 2011
@@ -40,66 +40,6 @@ limitations under the License.
<profiles>
- <!-- full build profile, including docs -->
- <profile>
- <id>full-build</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>flume-core</module>
- <module>flume-config-web</module>
- <module>flume-node-web</module>
- <module>flume-docs</module>
- <module>flume-distribution</module>
- <module>flume-log4j-appender</module>
- <module>plugins/flume-plugin-helloworld</module>
- <module>plugins/flume-plugin-hbasesink</module>
- </modules>
- </profile>
-
- <!-- dev profile for testing, docs not generated -->
- <profile>
- <id>dev</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>flume-core</module>
- <module>flume-config-web</module>
- <module>flume-node-web</module>
- <module>flume-distribution</module>
- <module>flume-log4j-appender</module>
- <module>plugins/flume-plugin-helloworld</module>
- <module>plugins/flume-plugin-hbasesink</module>
- </modules>
- </profile>
-
- <!-- perf profile for microbenchmarks -->
- <profile>
- <id>perf</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>flume-core</module>
- <module>flume-microbenchmarks</module>
- </modules>
- </profile>
-
- <!-- windows package build, docs not generated -->
- <profile>
- <id>windows</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>flume-core</module>
- <module>flume-node-web</module>
- <module>flume-windows-dist</module>
- </modules>
- </profile>
-
<profile>
<id>ng</id>
<activation>
@@ -258,8 +198,8 @@ limitations under the License.
</contributors>
<organization>
- <name>Cloudera</name>
- <url>http://www.cloudera.com</url>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org</url>
</organization>
<pluginRepositories>
@@ -432,6 +372,12 @@ limitations under the License.
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.2</version>
+ </plugin>
+
</plugins>
</pluginManagement>