Bläddra i källkod

commit 237a8ee3be38e50ffbbe9afd84d00f7f2ae3de90
Author: Luke Lu <llu@yahoo-inc.com>
Date: Tue Dec 14 15:36:10 2010 -0800

Bump avro version to 1.4.1 for mapreduce


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/yahoo-merge@1079152 13f79535-47bb-0310-9956-ffa450edef68

Owen O'Malley 14 år sedan
förälder
incheckning
d59fb77dc5

+ 1 - 1
ivy.xml

@@ -261,7 +261,7 @@
       rev="${slf4j-log4j12.version}"
       conf="common->master">
     </dependency>
-    <dependency org="org.apache.hadoop"
+    <dependency org="org.apache.avro"
       name="avro"
       rev="${avro.version}"
       conf="common->default">

+ 2 - 2
ivy/hadoop-common-template.xml

@@ -119,9 +119,9 @@
       <version>2.0.8</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
+      <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>1.3.2</version>
+      <version>1.4.1</version>
       <exclusions>
         <exclusion>
           <!-- Don't pull in Avro's (later) version of Jetty.-->

+ 1 - 1
ivy/libraries.properties

@@ -16,7 +16,7 @@
 #These are the versions of our dependencies (in alphabetical order)
 ant-task.version=2.0.10
 
-avro.version=1.3.2
+avro.version=1.4.1
 
 checkstyle.version=4.2
 

+ 2 - 2
src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java

@@ -184,7 +184,7 @@ public class TestAvroRpc extends TestCase {
         (AvroSpecificTestProtocol)RPC.getProxy(AvroSpecificTestProtocol.class, 
             0, addr, conf);
       
-      Utf8 echo = proxy.echo(new Utf8("hello world"));
+      CharSequence echo = proxy.echo("hello world");
       assertEquals("hello world", echo.toString());
 
       int intResult = proxy.add(1, 2);
@@ -204,7 +204,7 @@ public class TestAvroRpc extends TestCase {
     }
 
     @Override
-    public Utf8 echo(Utf8 msg) throws AvroRemoteException {
+    public CharSequence echo(CharSequence msg) throws AvroRemoteException {
       return msg;
     }