You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by cu...@apache.org on 2011/03/29 22:41:43 UTC
svn commit: r1086732 - in /avro/branches/branch-1.5: ./ CHANGES.txt
lang/java/pom.xml
Author: cutting
Date: Tue Mar 29 20:41:42 2011
New Revision: 1086732
URL: http://svn.apache.org/viewvc?rev=1086732&view=rev
Log:
Merge -c 1086730 from trunk to 1.5 branch. Fixes: AVRO-785.
Modified:
avro/branches/branch-1.5/ (props changed)
avro/branches/branch-1.5/CHANGES.txt
avro/branches/branch-1.5/lang/java/pom.xml
Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 29 20:41:42 2011
@@ -1 +1 @@
-/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1086727
+/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1086727,1086730
Modified: avro/branches/branch-1.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/CHANGES.txt?rev=1086732&r1=1086731&r2=1086732&view=diff
==============================================================================
--- avro/branches/branch-1.5/CHANGES.txt (original)
+++ avro/branches/branch-1.5/CHANGES.txt Tue Mar 29 20:41:42 2011
@@ -2,6 +2,11 @@ Avro Change Log
Avro 1.5.1 (unreleased)
+ IMPROVEMENTS
+
+ AVRO-785. Java: Squash a Velocity warning by upgrading to Velocity 1.7.
+ (cutting)
+
BUG FIXES
AVRO-786. Java: Fix equals() to work on objects containing maps. (cutting)
Modified: avro/branches/branch-1.5/lang/java/pom.xml
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/pom.xml?rev=1086732&r1=1086731&r2=1086732&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/pom.xml Tue Mar 29 20:41:42 2011
@@ -41,7 +41,7 @@
<slf4j-version>1.6.1</slf4j-version>
<jackson-version>1.7.3</jackson-version>
<hadoop-version>0.20.2</hadoop-version>
- <velocity-version>1.6.4</velocity-version>
+ <velocity-version>1.7</velocity-version>
<jetty-version>6.1.26</jetty-version>
<netty-version>3.2.4.Final</netty-version>
<jopt-simple-version>3.2</jopt-simple-version>