From 6b700e430bf6dbf1ff49e00d7cb456d9f663ec3f Mon Sep 17 00:00:00 2001
From: Luciano Resende <lresende@apache.org>
Date: Sun, 17 Apr 2016 11:42:57 -0700
Subject: [PATCH] [SPARK-14504] Enable Oracle docker tests

---
 external/docker-integration-tests/pom.xml     | 21 +++++++++++--------
 .../sql/jdbc/OracleIntegrationSuite.scala     |  2 +-
 project/SparkBuild.scala                      |  4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml
index 17fd7d781c9a..53a24f3e06e0 100644
--- a/external/docker-integration-tests/pom.xml
+++ b/external/docker-integration-tests/pom.xml
@@ -36,8 +36,12 @@
 
   <repositories>
     <repository>
-      <id>db2</id>
+      <id>db</id>
       <url>https://app.camunda.com/nexus/content/repositories/public/</url>
+      <releases>
+        <enabled>true</enabled>
+        <checksumPolicy>warn</checksumPolicy>
+      </releases>
     </repository>
   </repositories>
 
@@ -143,14 +147,13 @@
      to use a an ojdbc jar for the testcase. The maven dependency here is commented
      because currently the maven repository does not contain the ojdbc jar mentioned.
      Once the jar is available in maven, this could be uncommented. -->
-    <!--
-      <dependency>
-        <groupId>com.oracle</groupId>
-        <artifactId>ojdbc6</artifactId>
-        <version>11.2.0.2.0</version>
-        <scope>test</scope>
-      </dependency>
-    -->
+    <dependency>
+      <groupId>com.oracle</groupId>
+      <artifactId>ojdbc6</artifactId>
+      <version>11.2.0.1.0</version>
+      <scope>test</scope>
+    </dependency>
+
     <!-- Jersey dependencies, used to override version.
      See https://github.com/apache/spark/pull/9503#issuecomment-154369560 for
      background on why we need to use a newer Jersey only in this test module;
diff --git a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
index 2fc174eb1b3a..a48d3e203b4b 100644
--- a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
+++ b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/OracleIntegrationSuite.scala
@@ -62,7 +62,7 @@ class OracleIntegrationSuite extends DockerJDBCIntegrationSuite with SharedSQLCo
   override def dataPreparation(conn: Connection): Unit = {
   }
 
-  ignore("SPARK-12941: String datatypes to be mapped to Varchar in Oracle") {
+  test("SPARK-12941: String datatypes to be mapped to Varchar in Oracle") {
     // create a sample dataframe with string type
     val df1 = sparkContext.parallelize(Seq(("foo"))).toDF("x")
     // write the dataframe to the oracle table tbl
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index a58dd7e7f125..a0df9b6a331f 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -367,9 +367,9 @@ object DockerIntegrationTests {
   // This serves to override the override specified in DependencyOverrides:
   lazy val settings = Seq(
     dependencyOverrides += "com.google.guava" % "guava" % "18.0",
-    resolvers ++= Seq("DB2" at "https://app.camunda.com/nexus/content/repositories/public/")
+    resolvers ++= Seq("DB2" at "https://app.camunda.com/nexus/content/repositories/public/"),
+    libraryDependencies += "com.oracle" % "ojdbc6" % "11.2.0.1.0" from "https://app.camunda.com/nexus/content/repositories/public/com/oracle/ojdbc6/11.2.0.1.0/ojdbc6-11.2.0.1.0.jar" // scalastyle:ignore
   )
-
 }
 
 /**