[bahir] branch master updated: Updated sql-cloudant dependencies (#90)

[lresende]

This is an automated email from the ASF dual-hosted git repository.

lresende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bahir.git


The following commit(s) were added to refs/heads/master by this push:
     new 221c1f4  Updated sql-cloudant dependencies (#90)
221c1f4 is described below

commit 221c1f4b6d17d977a186b007bfe593035df09e1c
Author: Esteban Laver <emla...@us.ibm.com>
AuthorDate: Wed Jun 12 16:26:19 2019 -0400

    Updated sql-cloudant dependencies (#90)
    
    Bumped java-cloudant to 2.17.0 and okhttp to 3.12.2
---
 sql-cloudant/pom.xml                               | 24 ++--------------------
 .../bahir/cloudant/CloudantChangesDFSuite.scala    |  7 ++-----
 .../bahir/cloudant/CloudantOptionSuite.scala       |  3 ++-
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/sql-cloudant/pom.xml b/sql-cloudant/pom.xml
index a14862b..8a9fa58 100644
--- a/sql-cloudant/pom.xml
+++ b/sql-cloudant/pom.xml
@@ -50,12 +50,12 @@
     <dependency>
       <groupId>com.cloudant</groupId>
       <artifactId>cloudant-client</artifactId>
-      <version>2.11.0</version>
+      <version>2.17.0</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>3.9.0</version>
+      <version>3.12.2</version>
     </dependency>
     <dependency>
       <groupId>com.typesafe</groupId>
@@ -63,26 +63,6 @@
       <version>1.3.1</version>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-      <version>2.6.7</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>2.6.7</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>2.6.7</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>2.6.7</version>
-    </dependency>
-    <dependency>
       <groupId>org.scalaj</groupId>
       <artifactId>scalaj-http_${scala.binary.version}</artifactId>
     </dependency>
diff --git 
a/sql-cloudant/src/test/scala/org/apache/bahir/cloudant/CloudantChangesDFSuite.scala
 
b/sql-cloudant/src/test/scala/org/apache/bahir/cloudant/CloudantChangesDFSuite.scala
index a4b9029..dd5d508 100644
--- 
a/sql-cloudant/src/test/scala/org/apache/bahir/cloudant/CloudantChangesDFSuite.scala
+++ 
b/sql-cloudant/src/test/scala/org/apache/bahir/cloudant/CloudantChangesDFSuite.scala
@@ -24,7 +24,8 @@ import org.apache.spark.sql.SparkSession
 class CloudantChangesDFSuite extends ClientSparkFunSuite {
   val endpoint = "_changes"
 
-  before {
+  override def beforeAll() {
+    super.beforeAll()
     spark = SparkSession.builder().config(conf)
       .config("cloudant.protocol", TestUtils.getProtocol)
       .config("cloudant.host", TestUtils.getHost)
@@ -35,10 +36,6 @@ class CloudantChangesDFSuite extends ClientSparkFunSuite {
       .getOrCreate()
   }
 
-  after {
-    spark.close()
-  }
-
   testIf("load and save data from Cloudant database", TestUtils.shouldRunTest) 
{
     // Loading data from Cloudant db
     val df = spark.read.format("org.apache.bahir.cloudant").load("n_flight")
diff --git 
a/sql-cloudant/src/test/scala/org/apache/bahir/cloudant/CloudantOptionSuite.scala
 
b/sql-cloudant/src/test/scala/org/apache/bahir/cloudant/CloudantOptionSuite.scala
index 08f00e0..f5df759 100644
--- 
a/sql-cloudant/src/test/scala/org/apache/bahir/cloudant/CloudantOptionSuite.scala
+++ 
b/sql-cloudant/src/test/scala/org/apache/bahir/cloudant/CloudantOptionSuite.scala
@@ -135,6 +135,7 @@ class CloudantOptionSuite extends ClientSparkFunSuite with 
BeforeAndAfter {
       spark.read.format("org.apache.bahir.cloudant").load("db")
     }
     assert(thrown.getMessage === s"Option \'cloudant.numberOfRetries\' failed 
with exception " +
-      s"""java.lang.NumberFormatException: For input string: "five"""")
+      s"java.lang.NumberFormatException: Illegal value for config key 
cloudant.numberOfRetries: " +
+      s"""For input string: "five"""")
   }
 }