From a3ce058d1516825a8680a6aadf47f57f5dbcad2c Mon Sep 17 00:00:00 2001 From: Owen O'Malley Date: Tue, 23 May 2017 15:07:04 -0700 Subject: [PATCH] HIVE-15144. Remove dependence on json.org artifacts. --- common/pom.xml | 3 +-- jdbc/pom.xml | 2 +- llap-server/pom.xml | 7 +++++-- .../apache/hadoop/hive/llap/cli/LlapServiceDriver.java | 6 +++--- pom.xml | 16 ++++++++++++++-- ql/pom.xml | 5 ++--- 6 files changed, 26 insertions(+), 13 deletions(-) diff --git common/pom.xml common/pom.xml index e6722babd8..023f084511 100644 --- common/pom.xml +++ common/pom.xml @@ -198,9 +198,8 @@ test - org.json + com.tdunning json - ${json.version} io.dropwizard.metrics diff --git jdbc/pom.xml jdbc/pom.xml index 1294a617e8..fef1923336 100644 --- jdbc/pom.xml +++ jdbc/pom.xml @@ -264,7 +264,7 @@ org.htrace:* org.mortbay.jetty:* org.xerial.snappy:* - org.json:* + com.tdunning:* tomcat:* xmlenc:* xerces:* diff --git llap-server/pom.xml llap-server/pom.xml index b10f05f82b..ff62dc31cd 100644 --- llap-server/pom.xml +++ llap-server/pom.xml @@ -96,9 +96,8 @@ ${libthrift.version} - org.json + com.tdunning json - ${json.version} org.apache.hadoop @@ -231,6 +230,10 @@ + + org.codehaus.jettison + jettison + diff --git llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java index 4d30296c84..5090be2197 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java @@ -52,6 +52,8 @@ import org.apache.hadoop.hive.llap.tezplugins.LlapTezUtils; import org.apache.hadoop.registry.client.binding.RegistryUtils; import org.apache.tez.dag.api.TezConfiguration; +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; @@ -79,8 +81,6 @@ import org.eclipse.jetty.rewrite.handler.Rule; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.joda.time.DateTime; -import org.json.JSONException; -import org.json.JSONObject; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -642,7 +642,7 @@ private void writeConfigJson(Path tmpDir, final FileSystem lfs, } private JSONObject createConfigJson(long containerSize, long cache, long xmx, - String java_home) throws JSONException { + String java_home) throws JSONException { // extract configs for processing by the python fragments in Slider JSONObject configs = new JSONObject(); diff --git pom.xml pom.xml index 30fa50b31b..1474472cda 100644 --- pom.xml +++ pom.xml @@ -162,6 +162,7 @@ 3.1.0 5.5.1 3.0.1 + 1.1 9.3.8.v20160314 1.14 @@ -170,7 +171,7 @@ 1.1 2.8.1 3.5.2 - 20090211 + 1.8 4.11 3.0.3 0.9.3 @@ -610,6 +611,17 @@ ${jackson.version} + org.codehaus.jettison + jettison + ${jettison.version} + + + stax + stax-api + + + + org.eclipse.jetty jetty-rewrite ${jetty.version} @@ -655,7 +667,7 @@ ${datanucleus-jdo.version} - org.json + com.tdunning json ${json.version} diff --git ql/pom.xml ql/pom.xml index 40a216bc8f..d4797e1fbf 100644 --- ql/pom.xml +++ ql/pom.xml @@ -445,9 +445,8 @@ ${gson.version} - org.json + com.tdunning json - ${json.version} stax @@ -870,7 +869,7 @@ commons-lang:commons-lang org.apache.commons:commons-lang3 org.jodd:jodd-core - org.json:json + com.tdunning:json org.apache.avro:avro org.apache.avro:avro-mapred org.apache.hive.shims:hive-shims-0.23 -- 2.12.2