aboutsummaryrefslogtreecommitdiff
path: root/docker-integration-tests
diff options
context:
space:
mode:
authorMark Grover <mgrover@cloudera.com>2015-12-09 18:37:35 -0800
committerJosh Rosen <joshrosen@databricks.com>2015-12-09 18:39:36 -0800
commit2166c2a75083c2262e071a652dd52b1a33348b6e (patch)
tree9e4292217ca29e5bdda07d833e2832a18fa4faeb /docker-integration-tests
parentac8cdf1cdc148bd21290ecf4d4f9874f8c87cc14 (diff)
downloadspark-2166c2a75083c2262e071a652dd52b1a33348b6e.tar.gz
spark-2166c2a75083c2262e071a652dd52b1a33348b6e.tar.bz2
spark-2166c2a75083c2262e071a652dd52b1a33348b6e.zip
[SPARK-11796] Fix httpclient and httpcore depedency issues related to docker-client
This commit fixes dependency issues which prevented the Docker-based JDBC integration tests from running in the Maven build. Author: Mark Grover <mgrover@cloudera.com> Closes #9876 from markgrover/master_docker.
Diffstat (limited to 'docker-integration-tests')
-rw-r--r--docker-integration-tests/pom.xml22
1 files changed, 22 insertions, 0 deletions
diff --git a/docker-integration-tests/pom.xml b/docker-integration-tests/pom.xml
index dee0c4aa37..39d3f34461 100644
--- a/docker-integration-tests/pom.xml
+++ b/docker-integration-tests/pom.xml
@@ -71,6 +71,18 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.1</version>
+ <scope>test</scope>
+ </dependency>
<!-- Necessary in order to avoid errors in log messages: -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -109,6 +121,16 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <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;