Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C4BC5200D26 for ; Fri, 20 Oct 2017 16:20:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C3673160BED; Fri, 20 Oct 2017 14:20:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BB5E71609E1 for ; Fri, 20 Oct 2017 16:20:39 +0200 (CEST) Received: (qmail 17703 invoked by uid 500); 20 Oct 2017 14:20:38 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 17690 invoked by uid 99); 20 Oct 2017 14:20:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Oct 2017 14:20:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BEBB4DF9F1; Fri, 20 Oct 2017 14:20:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mdrob@apache.org To: commits@hbase.apache.org Date: Fri, 20 Oct 2017 14:20:38 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] hbase git commit: HBASE-16338 Remove Jackson1 deps archived-at: Fri, 20 Oct 2017 14:20:41 -0000 Repository: hbase Updated Branches: refs/heads/master a43a00e89 -> 5facaded9 http://git-wip-us.apache.org/repos/asf/hbase/blob/5facaded/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp index cc18d5b..f0df0c0 100644 --- a/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp @@ -29,7 +29,7 @@ import="java.lang.management.GarbageCollectorMXBean" import="org.apache.hadoop.hbase.util.JSONMetricUtil" import="org.apache.hadoop.hbase.procedure2.util.StringUtils" - import="org.codehaus.jackson.JsonNode" + import="com.fasterxml.jackson.databind.JsonNode" %> <% RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean(); http://git-wip-us.apache.org/repos/asf/hbase/blob/5facaded/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java index ee5a364..dab8673 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java @@ -23,6 +23,8 @@ import java.io.IOException; import java.util.Map; import java.util.NavigableSet; +import com.fasterxml.jackson.core.JsonGenerationException; +import com.fasterxml.jackson.databind.JsonMappingException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -32,8 +34,6 @@ import org.apache.hadoop.hbase.testclassification.IOTests; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.io.hfile.TestCacheConfig.DataCacheEntry; import org.apache.hadoop.hbase.io.hfile.TestCacheConfig.IndexCacheEntry; -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.map.JsonMappingException; import org.junit.After; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/hbase/blob/5facaded/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestJSONMetricUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestJSONMetricUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestJSONMetricUtil.java index 30da26a..1135039 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestJSONMetricUtil.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestJSONMetricUtil.java @@ -22,6 +22,7 @@ import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; import java.util.Hashtable; import java.util.List; +import java.util.Map; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; @@ -29,13 +30,14 @@ import javax.management.openmbean.CompositeData; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.JsonProcessingException; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -51,17 +53,14 @@ public class TestJSONMetricUtil { String[] values = {"MemoryPool", "Par Eden Space"}; String[] values2 = {"MemoryPool", "Par Eden Space", "Test"}; String[] emptyValue = {}; - Hashtable properties = JSONMetricUtil.buldKeyValueTable(keys, values); - Hashtable nullObject = JSONMetricUtil.buldKeyValueTable(keys, values2); - Hashtable nullObject1 = JSONMetricUtil.buldKeyValueTable(keys, emptyValue); - Hashtable nullObject2 = JSONMetricUtil.buldKeyValueTable(emptyKey, values2); - Hashtable nullObject3 = JSONMetricUtil.buldKeyValueTable(emptyKey, emptyValue); - assertEquals(properties.get("type"), values[0]); - assertEquals(properties.get("name"), values[1]); - assertEquals(nullObject, null); - assertEquals(nullObject1, null); - assertEquals(nullObject2, null); - assertEquals(nullObject3, null); + Map properties = JSONMetricUtil.buldKeyValueTable(keys, values); + assertEquals(values[0], properties.get("type")); + assertEquals(values[1], properties.get("name")); + + assertNull(JSONMetricUtil.buldKeyValueTable(keys, values2)); + assertNull(JSONMetricUtil.buldKeyValueTable(keys, emptyValue)); + assertNull(JSONMetricUtil.buldKeyValueTable(emptyKey, values2)); + assertNull(JSONMetricUtil.buldKeyValueTable(emptyKey, emptyValue)); } @Test @@ -73,10 +72,10 @@ public class TestJSONMetricUtil { JsonNode r2 = JSONMetricUtil.searchJson(node, "data2"); JsonNode r3 = JSONMetricUtil.searchJson(node, "data3"); JsonNode r4 = JSONMetricUtil.searchJson(node, "data4"); - assertEquals(r1.getIntValue(), 100); - assertEquals(r2.getTextValue(), "hello"); - assertEquals(r3.get(0).getIntValue(), 1); - assertEquals(r4.getIntValue(), 0); + assertEquals(100, r1.intValue()); + assertEquals("hello", r2.textValue()); + assertEquals(1, r3.get(0).intValue()); + assertEquals(0, r4.intValue()); } @Test http://git-wip-us.apache.org/repos/asf/hbase/blob/5facaded/hbase-shaded/hbase-shaded-mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml index 2afa3c2..1f2a2bf 100644 --- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml +++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml @@ -145,10 +145,6 @@ org.glassfish.jersey.containers jersey-container-servlet-core - - org.glassfish.jersey.media - jersey-media-json-jackson1 - http://git-wip-us.apache.org/repos/asf/hbase/blob/5facaded/hbase-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index 4104946..7f92901 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -176,6 +176,10 @@ com.dropwizard org.apache.hadoop.hbase.shaded.com.dropwizard + + com.fasterxml + org.apache.hadoop.hbase.shaded.com.fasterxml + http://git-wip-us.apache.org/repos/asf/hbase/blob/5facaded/hbase-shell/src/main/ruby/hbase/taskmonitor.rb ---------------------------------------------------------------------- diff --git a/hbase-shell/src/main/ruby/hbase/taskmonitor.rb b/hbase-shell/src/main/ruby/hbase/taskmonitor.rb index 849752b..1580486 100644 --- a/hbase-shell/src/main/ruby/hbase/taskmonitor.rb +++ b/hbase-shell/src/main/ruby/hbase/taskmonitor.rb @@ -74,7 +74,7 @@ module Hbase # Returns a filtered list of tasks on the given host def tasksOnHost(filter, host) java_import 'java.net.URL' - java_import 'org.codehaus.jackson.map.ObjectMapper' + java_import 'com.fasterxml.jackson.databind.ObjectMapper' infoport = @admin.getClusterStatus.getLoad(host).getInfoServerPort.to_s http://git-wip-us.apache.org/repos/asf/hbase/blob/5facaded/hbase-spark/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml index 320104b..ba54e99 100644 --- a/hbase-spark/pom.xml +++ b/hbase-spark/pom.xml @@ -124,6 +124,21 @@ test + com.fasterxml.jackson.module + jackson-module-scala_${scala.binary.version} + ${jackson.version} + + + org.scala-lang + scala-library + + + org.scala-lang + scala-reflect + + + + org.apache.hadoop hadoop-client ${hadoop-two.version} @@ -336,6 +351,11 @@ org.apache.hbase + hbase-protocol-shaded + ${project.version} + + + org.apache.hbase hbase-annotations ${project.version} http://git-wip-us.apache.org/repos/asf/hbase/blob/5facaded/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index cb8b11f..8e1d7c7 100755 --- a/pom.xml +++ b/pom.xml @@ -1399,11 +1399,10 @@ 4.5.3 4.4.6 3.2.1 - 2.23.2 + 2.9.1 2.2.12 9.4.6.v20170531 9.2.19.v20160908 - 1.9.13 3.1.0 2.0.1 2.25.1 @@ -1871,28 +1870,15 @@ joni ${joni.version} - - org.codehaus.jackson - jackson-core-asl - ${jackson1.version} - - - org.codehaus.jackson - jackson-mapper-asl - ${jackson1.version} - - - org.codehaus.jackson - jackson-jaxrs - ${jackson1.version} + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson.version} - org.codehaus.jackson - jackson-xc - ${jackson1.version} + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} org.jamon @@ -1982,11 +1968,6 @@ ${jersey.version} - org.glassfish.jersey.media - jersey-media-json-jackson1 - ${jackson.version} - - org.glassfish.web javax.servlet.jsp @@ -2409,6 +2390,14 @@ javax.inject javax.inject + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -2467,6 +2456,14 @@ xerces xercesImpl + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + ${hadoop-two.version} @@ -2497,6 +2494,14 @@ xerces xercesImpl + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -2537,6 +2542,14 @@ junit junit + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -2623,6 +2636,14 @@ javax.inject javax.inject + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -2669,6 +2690,14 @@ xerces xercesImpl + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + ${hadoop-three.version} @@ -2695,6 +2724,14 @@ xerces xercesImpl + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + @@ -2741,6 +2778,14 @@ junit junit + + org.codehause.jackson + jackson-core-asl + + + org.codehause.jackson + jackson-mapper-asl +