aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorJosh Rosen <joshrosen@databricks.com>2015-11-10 15:58:30 -0800
committerReynold Xin <rxin@databricks.com>2015-11-10 15:58:30 -0800
commit1dde39d796bbf42336051a86bedf871c7fddd513 (patch)
treea3a90cade110fe4b3c70039934b9a12d572ab8fa /pom.xml
parent32790fe7249b0efe2cbc5c4ee2df0fb687dcd624 (diff)
downloadspark-1dde39d796bbf42336051a86bedf871c7fddd513.tar.gz
spark-1dde39d796bbf42336051a86bedf871c7fddd513.tar.bz2
spark-1dde39d796bbf42336051a86bedf871c7fddd513.zip
[SPARK-9818] Re-enable Docker tests for JDBC data source
This patch re-enables tests for the Docker JDBC data source. These tests were reverted in #4872 due to transitive dependency conflicts introduced by the `docker-client` library. This patch should avoid those problems by using a version of `docker-client` which shades its transitive dependencies and by performing some build-magic to work around problems with that shaded JAR. In addition, I significantly refactored the tests to simplify the setup and teardown code and to fix several Docker networking issues which caused problems when running in `boot2docker`. Closes #8101. Author: Josh Rosen <joshrosen@databricks.com> Author: Yijie Shen <henry.yijieshen@gmail.com> Closes #9503 from JoshRosen/docker-jdbc-tests.
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/pom.xml b/pom.xml
index fd8c773513..c499a80aa0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,7 @@
<module>sql/catalyst</module>
<module>sql/core</module>
<module>sql/hive</module>
+ <module>docker-integration-tests</module>
<module>unsafe</module>
<module>assembly</module>
<module>external/twitter</module>
@@ -779,6 +780,19 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-client</artifactId>
+ <classifier>shaded</classifier>
+ <version>3.2.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
<version>${curator.version}</version>