This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 624d3b7 [SPARK-37715][SQL][BUILD][TESTS] Remove `ojdbc6` dependency
and update docker-integration test docs
624d3b7 is described below
commit 624d3b7c49abbf6f7bd82fa519b9270e56c660ee
Author: Danny Guinther <[email protected]>
AuthorDate: Mon Dec 27 22:39:50 2021 -0800
[SPARK-37715][SQL][BUILD][TESTS] Remove `ojdbc6` dependency and update
docker-integration test docs
### What changes were proposed in this pull request?
This PR aims to remove unused `ojdbc6` dependency because we are using
`ojdbc8` in `pom.xml`.
In addition, this updates two image names in documentation.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Pass the GitHub Action Docker test.
Closes #34979 from tdg5/just-the-docker-stuff.
Authored-by: Danny Guinther <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.../scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala | 3 ++-
.../org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala | 3 ++-
project/SparkBuild.scala | 3 +--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
index 78015d8..5992253 100644
---
a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
+++
b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
@@ -28,7 +28,8 @@ import org.apache.spark.tags.DockerTest
/**
* To run this test suite for a specific version (e.g.,
2019-CU13-ubuntu-20.04):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
MSSQLSERVER_DOCKER_IMAGE_NAME=2019-CU13-ubuntu-20.04
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
+ *
MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04
* ./build/sbt -Pdocker-integration-tests
* "testOnly org.apache.spark.sql.jdbc.MsSqlServerIntegrationSuite"
* }}}
diff --git
a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
index 77b7742..75446fb 100644
---
a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
+++
b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
@@ -31,7 +31,8 @@ import org.apache.spark.tags.DockerTest
/**
* To run this test suite for a specific version (e.g.,
2019-CU13-ubuntu-20.04):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
MSSQLSERVER_DOCKER_IMAGE_NAME=2019-CU13-ubuntu-20.04
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
+ *
MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04
* ./build/sbt -Pdocker-integration-tests "testOnly
*v2*MsSqlServerIntegrationSuite"
* }}}
*/
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 2f21561..579822a 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -599,8 +599,7 @@ object DockerIntegrationTests {
// This serves to override the override specified in DependencyOverrides:
lazy val settings = Seq(
dependencyOverrides += "com.google.guava" % "guava" % "18.0",
- resolvers += "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
+ resolvers += "DB2" at
"https://app.camunda.com/nexus/content/repositories/public/";
)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
