Merge pull request #222 from InterestingLab/rickyhuo.fix.tidb

Rickyhuo.fix.tidb
apache · Jan 15, 2019 · fc2cb89 · fc2cb89
2 parents 5298561 + 9f0f7fa
commit fc2cb89
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,5 @@
 name         := "Waterdrop"
-version      := "1.1.4"
+version      := "1.1.5"
 organization := "io.github.interestinglab.waterdrop"
 
 scalaVersion := "2.11.8"

diff --git a/docs/zh-cn/configuration/input-plugins/File.md b/docs/zh-cn/configuration/input-plugins/File.md
@@ -57,7 +57,7 @@ file {
 ```
 file {
     table_name = "books"
-    path = "file///data0/src/books.xml"
+    path = "file:///data0/src/books.xml"
     options.rowTag = "book"
     format = "xml"
 }

diff --git a/docs/zh-cn/configuration/output-plugins/Tidb.md b/docs/zh-cn/configuration/output-plugins/Tidb.md
@@ -58,7 +58,7 @@ useSSL
 
 ```
 tidb {
-    url = "jdbc:mysql://127.0.0.1:4000/test?rewriteBatchedStatements=true"
+    url = "jdbc:mysql://127.0.0.1:4000/test??useUnicode=true&characterEncoding=utf8"
     table = "access"
     user = "username"
     password = "password"

diff --git a/waterdrop-core/build.sbt b/waterdrop-core/build.sbt
@@ -47,7 +47,8 @@ libraryDependencies ++= Seq(
   "org.elasticsearch" % "elasticsearch-spark-20_2.11" % "5.6.3",
   "com.github.scopt" %% "scopt" % "3.7.0",
   "org.apache.commons" % "commons-compress" % "1.15",
-  "com.pingcap.tispark" % "tispark-core" % "1.1",
+  "com.pingcap.tispark" % "tispark-core" % "1.1"
+    excludeAll(ExclusionRule(organization="com.fasterxml.jackson.core")),
   "com.pingcap.tikv" % "tikv-client" % "1.1",
   "ru.yandex.clickhouse" % "clickhouse-jdbc" % "0.1.39"
     exclude("com.google.guava","guava")