You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by ar...@apache.org on 2012/03/20 00:15:43 UTC
svn commit: r1302711 - in /incubator/flume/trunk:
flume-ng-clients/flume-ng-log4jappender/pom.xml flume-ng-dist/pom.xml
flume-ng-dist/src/main/assembly/dist.xml
flume-ng-dist/src/main/assembly/src.xml
flume-ng-sinks/flume-hdfs-sink/pom.xml pom.xml
Author: arvind
Date: Mon Mar 19 23:15:42 2012
New Revision: 1302711
URL: http://svn.apache.org/viewvc?rev=1302711&view=rev
Log:
FLUME-1032. Fix Flume NG build.
(Mike Percy via Arvind Prabhakar)
Modified:
incubator/flume/trunk/flume-ng-clients/flume-ng-log4jappender/pom.xml
incubator/flume/trunk/flume-ng-dist/pom.xml
incubator/flume/trunk/flume-ng-dist/src/main/assembly/dist.xml
incubator/flume/trunk/flume-ng-dist/src/main/assembly/src.xml
incubator/flume/trunk/flume-ng-sinks/flume-hdfs-sink/pom.xml
incubator/flume/trunk/pom.xml
Modified: incubator/flume/trunk/flume-ng-clients/flume-ng-log4jappender/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-clients/flume-ng-log4jappender/pom.xml?rev=1302711&r1=1302710&r2=1302711&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-clients/flume-ng-log4jappender/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-clients/flume-ng-log4jappender/pom.xml Mon Mar 19 23:15:42 2012
@@ -25,7 +25,7 @@ limitations under the License.
<relativePath>..</relativePath>
</parent>
- <groupId>org.apache.flume</groupId>
+ <groupId>org.apache.flume.flume-ng-clients</groupId>
<artifactId>flume-ng-log4jappender</artifactId>
<name>Flume NG Log4j Appender</name>
Modified: incubator/flume/trunk/flume-ng-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-dist/pom.xml?rev=1302711&r1=1302710&r2=1302711&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-dist/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-dist/pom.xml Mon Mar 19 23:15:42 2012
@@ -65,6 +65,10 @@
<dependencies>
<dependency>
<groupId>org.apache.flume</groupId>
+ <artifactId>flume-ng-sdk</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flume</groupId>
<artifactId>flume-ng-core</artifactId>
</dependency>
<dependency>
@@ -95,6 +99,18 @@
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
<artifactId>flume-avro-source</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
+ <artifactId>flume-avro-source</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
+ <artifactId>flume-thrift-source</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flume.flume-ng-clients</groupId>
+ <artifactId>flume-ng-log4jappender</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/flume/trunk/flume-ng-dist/src/main/assembly/dist.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-dist/src/main/assembly/dist.xml?rev=1302711&r1=1302710&r2=1302711&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-dist/src/main/assembly/dist.xml (original)
+++ incubator/flume/trunk/flume-ng-dist/src/main/assembly/dist.xml Mon Mar 19 23:15:42 2012
@@ -38,11 +38,14 @@
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
+ <include>org.apache.flume:flume-ng-sdk</include>
<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>
+ <include>org.apache.flume:flume-ng-legacy-sources</include>
+ <include>org.apache.flume:flume-ng-clients</include>
</includes>
<binaries>
@@ -86,10 +89,13 @@
<directory>../</directory>
<excludes>
+ <exclude>flume-ng-sdk/**</exclude>
<exclude>flume-ng-core/**</exclude>
<exclude>flume-ng-node/**</exclude>
<exclude>flume-ng-channels/**</exclude>
<exclude>flume-ng-sinks/**</exclude>
+ <exclude>flume-ng-legacy-sources/**</exclude>
+ <exclude>flume-ng-clients/**</exclude>
<exclude>flume-ng-dist/**</exclude>
<exclude>target/**</exclude>
<exclude>lib/**</exclude>
Modified: incubator/flume/trunk/flume-ng-dist/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-dist/src/main/assembly/src.xml?rev=1302711&r1=1302710&r2=1302711&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-dist/src/main/assembly/src.xml (original)
+++ incubator/flume/trunk/flume-ng-dist/src/main/assembly/src.xml Mon Mar 19 23:15:42 2012
@@ -38,11 +38,14 @@
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
+ <include>org.apache.flume:flume-ng-sdk</include>
<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>
+ <include>org.apache.flume:flume-ng-legacy-sources</include>
+ <include>org.apache.flume:flume-ng-clients</include>
</includes>
<sources>
@@ -74,10 +77,13 @@
<directory>../</directory>
<excludes>
+ <exclude>flume-ng-sdk/**</exclude>
<exclude>flume-ng-core/**</exclude>
<exclude>flume-ng-node/**</exclude>
<exclude>flume-ng-channels/**</exclude>
<exclude>flume-ng-sinks/**</exclude>
+ <exclude>flume-ng-legacy-sources/**</exclude>
+ <exclude>flume-ng-clients/**</exclude>
<exclude>flume-ng-dist/**</exclude>
<exclude>target/**</exclude>
<exclude>lib/**</exclude>
Modified: incubator/flume/trunk/flume-ng-sinks/flume-hdfs-sink/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-sinks/flume-hdfs-sink/pom.xml?rev=1302711&r1=1302710&r2=1302711&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-sinks/flume-hdfs-sink/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-sinks/flume-hdfs-sink/pom.xml Mon Mar 19 23:15:42 2012
@@ -93,19 +93,11 @@ limitations under the License.
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
+ <artifactId>hadoop-hdfs</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
</dependency>
</dependencies>
</profile>
Modified: incubator/flume/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/pom.xml?rev=1302711&r1=1302710&r2=1302711&view=diff
==============================================================================
--- incubator/flume/trunk/pom.xml (original)
+++ incubator/flume/trunk/pom.xml Mon Mar 19 23:15:42 2012
@@ -107,7 +107,7 @@ limitations under the License.
</property>
</activation>
<properties>
- <hadoop.version>0.23.1-SNAPSHOT</hadoop.version>
+ <hadoop.version>0.23.1</hadoop.version>
<hadoop.common.artifact.id>hadoop-common</hadoop.common.artifact.id>
</properties>
<dependencyManagement>
@@ -119,12 +119,18 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<version>${hadoop.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
+
<profile>
<id>compileThrift</id>
<activation>
@@ -483,18 +489,6 @@ limitations under the License.
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.6</version>
- </dependency>
-
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>10.0.1</version>
@@ -529,12 +523,6 @@ limitations under the License.
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jcl</artifactId>
- <version>1.6.4</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.6.1</version>
@@ -656,6 +644,12 @@ limitations under the License.
<version>1.2.0-incubating-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.flume.flume-ng-clients</groupId>
+ <artifactId>flume-ng-log4jappender</artifactId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>