Return-Path: 
 <commits-return-798-apmail-flume-commits-archive=flume.apache.org@flume.apache.org>
X-Original-To: apmail-flume-commits-archive@www.apache.org
Delivered-To: apmail-flume-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A521BD9DC
	for <apmail-flume-commits-archive@www.apache.org>;
 Fri, 24 Aug 2012 00:56:30 +0000 (UTC)
Received: (qmail 93116 invoked by uid 500); 24 Aug 2012 00:56:30 -0000
Delivered-To: apmail-flume-commits-archive@flume.apache.org
Received: (qmail 93077 invoked by uid 500); 24 Aug 2012 00:56:30 -0000
Mailing-List: contact commits-help@flume.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flume.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flume.apache.org>
List-Post: <mailto:commits@flume.apache.org>
List-Id: <commits.flume.apache.org>
Reply-To: dev@flume.apache.org
Delivered-To: mailing list commits@flume.apache.org
Received: (qmail 93069 invoked by uid 99); 24 Aug 2012 00:56:30 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Aug 2012 00:56:30 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id E66AC1F611; Fri, 24 Aug 2012 00:56:29 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: mubarak@apache.org
To: commits@flume.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: FLUME-1500 Upgrade flume to use latest version of Avro -
 v1.7
Message-Id: <20120824005629.E66AC1F611@tyr.zones.apache.org>
Date: Fri, 24 Aug 2012 00:56:29 +0000 (UTC)

Updated Branches:
  refs/heads/trunk 208f4e96b -> 2c3bbb7c1


FLUME-1500 Upgrade flume to use latest version of Avro - v1.7

(Hari Shreedharan via Mubarak Seyed)


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/2c3bbb7c
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/2c3bbb7c
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/2c3bbb7c

Branch: refs/heads/trunk
Commit: 2c3bbb7c1f164ff94cc2c4d8d3bcb0edf0dd8431
Parents: 208f4e9
Author: Mubarak Seyed <mubarak.seyed@gmail.com>
Authored: Thu Aug 23 17:51:56 2012 -0700
Committer: Mubarak Seyed <mubarak.seyed@gmail.com>
Committed: Thu Aug 23 17:51:56 2012 -0700

----------------------------------------------------------------------
 flume-ng-legacy-sources/flume-avro-source/pom.xml |    3 +++
 flume-ng-sdk/pom.xml                              |    2 +-
 pom.xml                                           |    8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/2c3bbb7c/flume-ng-legacy-sources/flume-avro-source/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-legacy-sources/flume-avro-source/pom.xml b/flume-ng-legacy-sources/flume-avro-source/pom.xml
index 236db8d..b951833 100644
--- a/flume-ng-legacy-sources/flume-avro-source/pom.xml
+++ b/flume-ng-legacy-sources/flume-avro-source/pom.xml
@@ -51,6 +51,9 @@ limitations under the License.
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <stringType>CharSequence</stringType>
+        </configuration>
       </plugin>
     </plugins>
   </build>

http://git-wip-us.apache.org/repos/asf/flume/blob/2c3bbb7c/flume-ng-sdk/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml
index e8c5af6..75acacd 100644
--- a/flume-ng-sdk/pom.xml
+++ b/flume-ng-sdk/pom.xml
@@ -35,7 +35,7 @@ limitations under the License.
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-maven-plugin</artifactId>
         <configuration>
-          <stringType>String</stringType>
+          <stringType>CharSequence</stringType>
         </configuration>
         <executions>
           <execution>

http://git-wip-us.apache.org/repos/asf/flume/blob/2c3bbb7c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 487be1c..b053bc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -521,7 +521,7 @@ limitations under the License.
             <stringType>String</stringType>
           </configuration>
           -->
-          <version>1.6.1</version>
+          <version>1.7.1</version>
         </plugin>
 
         <plugin>
@@ -646,19 +646,19 @@ limitations under the License.
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro</artifactId>
-        <version>1.6.3</version>
+        <version>1.7.1</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-compiler</artifactId>
-        <version>1.6.3</version>
+        <version>1.7.1</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-ipc</artifactId>
-        <version>1.6.3</version>
+        <version>1.7.1</version>
         <exclusions>
           <exclusion>
             <groupId>org.mortbay.jetty</groupId>