You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/08 05:40:12 UTC
svn commit: r1079152 - in /hadoop/common/branches/yahoo-merge: ivy.xml
ivy/hadoop-common-template.xml ivy/libraries.properties
src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java
Author: omalley
Date: Tue Mar 8 04:40:12 2011
New Revision: 1079152
URL: http://svn.apache.org/viewvc?rev=1079152&view=rev
Log:
commit 237a8ee3be38e50ffbbe9afd84d00f7f2ae3de90
Author: Luke Lu <ll...@yahoo-inc.com>
Date: Tue Dec 14 15:36:10 2010 -0800
Bump avro version to 1.4.1 for mapreduce
Modified:
hadoop/common/branches/yahoo-merge/ivy.xml
hadoop/common/branches/yahoo-merge/ivy/hadoop-common-template.xml
hadoop/common/branches/yahoo-merge/ivy/libraries.properties
hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java
Modified: hadoop/common/branches/yahoo-merge/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/ivy.xml?rev=1079152&r1=1079151&r2=1079152&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/ivy.xml (original)
+++ hadoop/common/branches/yahoo-merge/ivy.xml Tue Mar 8 04:40:12 2011
@@ -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">
Modified: hadoop/common/branches/yahoo-merge/ivy/hadoop-common-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/ivy/hadoop-common-template.xml?rev=1079152&r1=1079151&r2=1079152&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/ivy/hadoop-common-template.xml (original)
+++ hadoop/common/branches/yahoo-merge/ivy/hadoop-common-template.xml Tue Mar 8 04:40:12 2011
@@ -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.-->
Modified: hadoop/common/branches/yahoo-merge/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/ivy/libraries.properties?rev=1079152&r1=1079151&r2=1079152&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/ivy/libraries.properties (original)
+++ hadoop/common/branches/yahoo-merge/ivy/libraries.properties Tue Mar 8 04:40:12 2011
@@ -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
Modified: hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java?rev=1079152&r1=1079151&r2=1079152&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java (original)
+++ hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java Tue Mar 8 04:40:12 2011
@@ -184,7 +184,7 @@ public class TestAvroRpc extends TestCas
(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 TestCas
}
@Override
- public Utf8 echo(Utf8 msg) throws AvroRemoteException {
+ public CharSequence echo(CharSequence msg) throws AvroRemoteException {
return msg;
}