Return-Path: 
 <flume-commits-return-390-apmail-incubator-flume-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-flume-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-flume-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B0F4599FC
	for <apmail-incubator-flume-commits-archive@minotaur.apache.org>;
 Mon, 19 Mar 2012 23:13:42 +0000 (UTC)
Received: (qmail 39157 invoked by uid 500); 19 Mar 2012 23:13:42 -0000
Delivered-To: apmail-incubator-flume-commits-archive@incubator.apache.org
Received: (qmail 39131 invoked by uid 500); 19 Mar 2012 23:13:42 -0000
Mailing-List: contact flume-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:flume-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:flume-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:flume-commits@incubator.apache.org>
List-Id: <flume-commits.incubator.apache.org>
Reply-To: flume-dev@incubator.apache.org
Delivered-To: mailing list flume-commits@incubator.apache.org
Received: (qmail 39123 invoked by uid 99); 19 Mar 2012 23:13:42 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Mar 2012 23:13:42 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Mar 2012 23:13:40 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id C6BFA2388CB4;
	Mon, 19 Mar 2012 23:13:20 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1302708 - in /incubator/flume/branches/branch-1.1.0: ./
 flume-ng-clients/flume-ng-log4jappender/ flume-ng-dist/
 flume-ng-dist/src/main/assembly/ flume-ng-sinks/flume-hdfs-sink/
Date: Mon, 19 Mar 2012 23:13:20 -0000
To: flume-commits@incubator.apache.org
From: arvind@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120319231320.C6BFA2388CB4@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: arvind
Date: Mon Mar 19 23:13:20 2012
New Revision: 1302708

URL: http://svn.apache.org/viewvc?rev=1302708&view=rev
Log:
FLUME-1032. Fix Flume NG build.

(Mike Percy via Arvind Prabhakar)

Modified:
    incubator/flume/branches/branch-1.1.0/flume-ng-clients/flume-ng-log4jappender/pom.xml
    incubator/flume/branches/branch-1.1.0/flume-ng-dist/pom.xml
    incubator/flume/branches/branch-1.1.0/flume-ng-dist/src/main/assembly/dist.xml
    incubator/flume/branches/branch-1.1.0/flume-ng-dist/src/main/assembly/src.xml
    incubator/flume/branches/branch-1.1.0/flume-ng-sinks/flume-hdfs-sink/pom.xml
    incubator/flume/branches/branch-1.1.0/pom.xml

Modified: incubator/flume/branches/branch-1.1.0/flume-ng-clients/flume-ng-log4jappender/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/branch-1.1.0/flume-ng-clients/flume-ng-log4jappender/pom.xml?rev=1302708&r1=1302707&r2=1302708&view=diff
==============================================================================
--- incubator/flume/branches/branch-1.1.0/flume-ng-clients/flume-ng-log4jappender/pom.xml (original)
+++ incubator/flume/branches/branch-1.1.0/flume-ng-clients/flume-ng-log4jappender/pom.xml Mon Mar 19 23:13:20 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/branches/branch-1.1.0/flume-ng-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/branch-1.1.0/flume-ng-dist/pom.xml?rev=1302708&r1=1302707&r2=1302708&view=diff
==============================================================================
--- incubator/flume/branches/branch-1.1.0/flume-ng-dist/pom.xml (original)
+++ incubator/flume/branches/branch-1.1.0/flume-ng-dist/pom.xml Mon Mar 19 23:13:20 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/branches/branch-1.1.0/flume-ng-dist/src/main/assembly/dist.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/branch-1.1.0/flume-ng-dist/src/main/assembly/dist.xml?rev=1302708&r1=1302707&r2=1302708&view=diff
==============================================================================
--- incubator/flume/branches/branch-1.1.0/flume-ng-dist/src/main/assembly/dist.xml (original)
+++ incubator/flume/branches/branch-1.1.0/flume-ng-dist/src/main/assembly/dist.xml Mon Mar 19 23:13:20 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/branches/branch-1.1.0/flume-ng-dist/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/branch-1.1.0/flume-ng-dist/src/main/assembly/src.xml?rev=1302708&r1=1302707&r2=1302708&view=diff
==============================================================================
--- incubator/flume/branches/branch-1.1.0/flume-ng-dist/src/main/assembly/src.xml (original)
+++ incubator/flume/branches/branch-1.1.0/flume-ng-dist/src/main/assembly/src.xml Mon Mar 19 23:13:20 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/branches/branch-1.1.0/flume-ng-sinks/flume-hdfs-sink/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/branch-1.1.0/flume-ng-sinks/flume-hdfs-sink/pom.xml?rev=1302708&r1=1302707&r2=1302708&view=diff
==============================================================================
--- incubator/flume/branches/branch-1.1.0/flume-ng-sinks/flume-hdfs-sink/pom.xml (original)
+++ incubator/flume/branches/branch-1.1.0/flume-ng-sinks/flume-hdfs-sink/pom.xml Mon Mar 19 23:13:20 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/branches/branch-1.1.0/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/branch-1.1.0/pom.xml?rev=1302708&r1=1302707&r2=1302708&view=diff
==============================================================================
--- incubator/flume/branches/branch-1.1.0/pom.xml (original)
+++ incubator/flume/branches/branch-1.1.0/pom.xml Mon Mar 19 23:13:20 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.1.0-incubating</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.flume.flume-ng-clients</groupId>
+        <artifactId>flume-ng-log4jappender</artifactId>
+        <version>1.1.0-incubating</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>