This is an automated email from the ASF dual-hosted git repository.
meszibalu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new e8ca69e HBASE-22257 Remove json4s and jackson dependency from hbase
spark connector (#22)
e8ca69e is described below
commit e8ca69e1977f398235ad35b904645d649f0d6f4f
Author: meszibalu <[email protected]>
AuthorDate: Tue Apr 23 09:06:30 2019 +0200
HBASE-22257 Remove json4s and jackson dependency from hbase spark connector
(#22)
* HBASE-22257 Remove json4s and jackson dependency from hbase spark
connector
---
.../src/main/assembly/hbase-connectors-bin.xml | 3 ++
kafka/hbase-kafka-proxy/pom.xml | 9 +----
spark/hbase-spark-it/pom.xml | 11 ++++--
spark/hbase-spark/pom.xml | 43 ----------------------
.../spark/datasources/HBaseTableCatalog.scala | 4 +-
spark/pom.xml | 1 -
6 files changed, 13 insertions(+), 58 deletions(-)
diff --git
a/hbase-connectors-assembly/src/main/assembly/hbase-connectors-bin.xml
b/hbase-connectors-assembly/src/main/assembly/hbase-connectors-bin.xml
index 2c238bf..080608c 100755
--- a/hbase-connectors-assembly/src/main/assembly/hbase-connectors-bin.xml
+++ b/hbase-connectors-assembly/src/main/assembly/hbase-connectors-bin.xml
@@ -32,6 +32,9 @@
<moduleSets>
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
+ <excludes>
+ <exclude>org.apache.hbase.connectors.spark:hbase-spark-it</exclude>
+ </excludes>
<binaries>
<unpack>false</unpack>
<outputDirectory>lib</outputDirectory>
diff --git a/kafka/hbase-kafka-proxy/pom.xml b/kafka/hbase-kafka-proxy/pom.xml
index 3c5a242..c84c220 100755
--- a/kafka/hbase-kafka-proxy/pom.xml
+++ b/kafka/hbase-kafka-proxy/pom.xml
@@ -79,6 +79,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
@@ -120,14 +121,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
</exclusions>
</dependency>
<!--See note on curator.version above for why we include
diff --git a/spark/hbase-spark-it/pom.xml b/spark/hbase-spark-it/pom.xml
index 36cb2e0..9f5782d 100644
--- a/spark/hbase-spark-it/pom.xml
+++ b/spark/hbase-spark-it/pom.xml
@@ -279,10 +279,6 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -318,6 +314,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/spark/hbase-spark/pom.xml b/spark/hbase-spark/pom.xml
index 705da4b..73360aa 100644
--- a/spark/hbase-spark/pom.xml
+++ b/spark/hbase-spark/pom.xml
@@ -86,10 +86,6 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -97,12 +93,6 @@
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
@@ -136,21 +126,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
- <version>${jackson.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<exclusions>
@@ -441,24 +416,6 @@
<artifactId>spark-catalyst_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
</dependency>
- <dependency>
- <groupId>org.json4s</groupId>
- <artifactId>json4s-core_${scala.binary.version}</artifactId>
- <version>${json4s.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.json4s</groupId>
- <artifactId>json4s-ast_${scala.binary.version}</artifactId>
- <version>${json4s.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.json4s</groupId>
- <artifactId>json4s-jackson_${scala.binary.version}</artifactId>
- <version>${json4s.version}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git
a/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/datasources/HBaseTableCatalog.scala
b/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/datasources/HBaseTableCatalog.scala
index d2a8a3e..61e7788 100644
---
a/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/datasources/HBaseTableCatalog.scala
+++
b/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/datasources/HBaseTableCatalog.scala
@@ -22,9 +22,9 @@ import org.apache.yetus.audience.InterfaceAudience
import org.apache.hadoop.hbase.spark.{Logging, SchemaConverters}
import org.apache.hadoop.hbase.util.Bytes
import org.apache.spark.sql.types._
-import org.json4s.jackson.JsonMethods._
import scala.collection.mutable
+import scala.util.parsing.json.JSON
// The definition of each column cell, which may be composite type
// TODO: add avro support
@@ -243,7 +243,7 @@ object HBaseTableCatalog {
val parameters = convert(params)
// println(jString)
val jString = parameters(tableCatalog)
- val map = parse(jString).values.asInstanceOf[Map[String, _]]
+ val map = JSON.parseFull(jString).get.asInstanceOf[Map[String, _]]
val tableMeta = map.get(table).get.asInstanceOf[Map[String, _]]
val nSpace =
tableMeta.get(nameSpace).getOrElse("default").asInstanceOf[String]
val tName = tableMeta.get(tableName).get.asInstanceOf[String]
diff --git a/spark/pom.xml b/spark/pom.xml
index 58a2ac7..7aff2a2 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -46,7 +46,6 @@
Please take caution when this version is modified -->
<scala.version>2.11.12</scala.version>
<scala.binary.version>2.11</scala.binary.version>
- <json4s.version>3.2.11</json4s.version>
</properties>
<dependencyManagement>
<dependencies>
