commit 3191eb5996c14d25417ec6472f3db41ad26b929b Author: Janaki Lahorani Date: Thu Feb 8 09:19:55 2018 -0800 HIVE-18433: Upgrade Jackson version to 2.9.2 Change-Id: Ibe30f160d42e53a951865c3b1b92e20954acddcd diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java index 2f956b179b31e043d1fd1b1bfe6f19cf6ca28384..beb53a0213e2b78b4ecb94e1dc6b0001940546f9 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java @@ -95,6 +95,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.Reader; +import java.io.DataInput; import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; @@ -262,7 +263,7 @@ public static String getURL(HttpClient client, URL url) throws IOException { } for (FileStatus fileStatus : fss) { final DataSegment segment = JSON_MAPPER - .readValue(fs.open(fileStatus.getPath()), DataSegment.class); + .readValue((DataInput)fs.open(fileStatus.getPath()), DataSegment.class); publishedSegmentsBuilder.add(segment); } return publishedSegmentsBuilder.build(); diff --git hcatalog/core/pom.xml hcatalog/core/pom.xml index 560e438c266c3aad3f54634547a019bcb2128ad0..9e0879ec8f762240a96ed5da9286d363df5c4f3a 100644 --- hcatalog/core/pom.xml +++ hcatalog/core/pom.xml @@ -81,8 +81,18 @@ ${guava.version} - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind ${jackson.version} diff --git hcatalog/server-extensions/pom.xml hcatalog/server-extensions/pom.xml index 797341c881614b2c5c2e31d7b339c9f180e6edd1..c8096e87b31579b4a5b73f4cee1cf3ef981f7506 100644 --- hcatalog/server-extensions/pom.xml +++ hcatalog/server-extensions/pom.xml @@ -52,8 +52,18 @@ ${jms.version} - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind ${jackson.version} diff --git hcatalog/webhcat/svr/pom.xml hcatalog/webhcat/svr/pom.xml index a22bc2243094d8bf89ef0d78ec02a32e15523b0f..615f9c7308e55cf6bbf9a0cbcd6a6d6f2cdf3a27 100644 --- hcatalog/webhcat/svr/pom.xml +++ hcatalog/webhcat/svr/pom.xml @@ -124,13 +124,18 @@ ${zookeeper.version} - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-annotations ${jackson.version} - - org.codehaus.jackson - jackson-mapper-asl + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind ${jackson.version} diff --git pom.xml pom.xml index 5ae63da06af28764c6071db73025dc928e9f7e67..3177759c86d5d4736c46022f981c68c1dcce59eb 100644 --- pom.xml +++ pom.xml @@ -155,7 +155,7 @@ 4.5.2 4.4.4 2.4.0 - 1.9.13 + 2.9.2 2.6.5 5.5.23 @@ -597,23 +597,18 @@ ${groovy.version} - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-annotations ${jackson.version} - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-core ${jackson.version} - org.codehaus.jackson - jackson-jaxrs - ${jackson.version} - - - org.codehaus.jackson - jackson-xc + com.fasterxml.jackson.core + jackson-databind ${jackson.version} diff --git ql/pom.xml ql/pom.xml index 2d1034cfed75368baf0e18aada9eb5d865255b56..f0640188d0f66c1f9dc4d8d7a220ba00b92888e0 100644 --- ql/pom.xml +++ ql/pom.xml @@ -334,20 +334,25 @@ groovy-all ${groovy.version} - - org.codehaus.jackson - jackson-core-asl - ${jackson.version} - org.jodd jodd-core ${jodd.version} - org.codehaus.jackson - jackson-mapper-asl - ${jackson.version} + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} org.datanucleus diff --git testutils/ptest2/pom.xml testutils/ptest2/pom.xml index dbcfb010d3a2e0cdc2c23a896541a587a015c7b9..e579b30972b7cd393c7179c79610515223ba0bde 100644 --- testutils/ptest2/pom.xml +++ testutils/ptest2/pom.xml @@ -115,9 +115,19 @@ limitations under the License. 1.7 - org.codehaus.jackson - jackson-mapper-asl - 1.9.12 + com.fasterxml.jackson.core + jackson-annotations + 2.9.2 + + + com.fasterxml.jackson.core + jackson-core + 2.9.2 + + + com.fasterxml.jackson.core + jackson-databind + 2.9.2 org.slf4j diff --git testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java index 914345267da0e6bf8703d9cae8384fd9c29cbfec..53c8681910564aa25f7782e663936c2e48ef2e26 100644 --- testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java +++ testutils/ptest2/src/main/java/org/apache/hive/ptest/api/client/PTestClient.java @@ -53,12 +53,12 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; -import org.codehaus.jackson.map.ObjectMapper; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.io.Resources; +import com.fasterxml.jackson.databind.ObjectMapper; /** * Quick and dirty REST client for the PTest server. It's not expected the scope diff --git testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java index ff1dbd4bafaba9a0e88321c6507a47bbe0421833..61fb2106357283428f3e71ad31a47901d17bc0c8 100644 --- testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java +++ testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/JIRAService.java @@ -49,16 +49,16 @@ import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.ExecutionContext; import org.apache.http.protocol.HttpContext; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; import org.slf4j.Logger; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; class JIRAService { static final int MAX_MESSAGES = 200;