svn commit: r1710706 - in /pig/trunk: CHANGES.txt ivy/libraries.properties test/org/apache/pig/test/TestRegisteredJarVisibility.java

[daijy]

Author: daijy
Date: Mon Oct 26 21:37:07 2015
New Revision: 1710706

URL: http://svn.apache.org/viewvc?rev=1710706&view=rev
Log:
PIG-4468: Pig's jackson version conflicts with that of hadoop 2.6.0 or newer

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/ivy/libraries.properties
    pig/trunk/test/org/apache/pig/test/TestRegisteredJarVisibility.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1710706&r1=1710705&r2=1710706&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Oct 26 21:37:07 2015
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
 
 IMPROVEMENTS
 
+PIG-4468: Pig's jackson version conflicts with that of hadoop 2.6.0 or newer 
(zjffdu via daijy)
+
 PIG-4708: Upgrade joda-time to 2.8 (rohini)
 
 PIG-4697: Pig needs to serialize only part of the udfcontext for each vertex 
(rohini)

Modified: pig/trunk/ivy/libraries.properties
URL: 
http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1710706&r1=1710705&r2=1710706&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Mon Oct 26 21:37:07 2015
@@ -50,7 +50,7 @@ hbase95.version=0.98.12-${hbase.hadoop.v
 hsqldb.version=1.8.0.10
 hive.version=1.2.1
 httpcomponents.version=4.1
-jackson.version=1.8.8
+jackson.version=1.9.13
 jackson-pig-3039-test.version=1.9.9
 javacc.version=4.2
 javax-inject.version=1

Modified: pig/trunk/test/org/apache/pig/test/TestRegisteredJarVisibility.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestRegisteredJarVisibility.java?rev=1710706&r1=1710705&r2=1710706&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestRegisteredJarVisibility.java 
(original)
+++ pig/trunk/test/org/apache/pig/test/TestRegisteredJarVisibility.java Mon Oct 
26 21:37:07 2015
@@ -152,7 +152,7 @@ public class TestRegisteredJarVisibility
         // When jackson jar is not registered, jackson-core from the first jar 
in
         // classpath (pig.jar) should be picked up (version 1.8.8 in this 
case).
         String jacksonJar = 
JarManager.findContainingJar(org.codehaus.jackson.JsonParser.class);
-        Assert.assertTrue(new File(jacksonJar).getName().contains("1.8.8"));
+        Assert.assertTrue(new File(jacksonJar).getName().contains("1.9.13"));
 
         PigServer pigServer = new PigServer(Util.getLocalTestMode(), new 
Properties());
         pigServer.registerJar("test/resources/jackson-core-asl-1.9.9.jar");