diff options
author | Mark Grover <mgrover@cloudera.com> | 2015-12-09 18:37:35 -0800 |
---|---|---|
committer | Josh Rosen <joshrosen@databricks.com> | 2015-12-09 18:39:36 -0800 |
commit | 2166c2a75083c2262e071a652dd52b1a33348b6e (patch) | |
tree | 9e4292217ca29e5bdda07d833e2832a18fa4faeb /pom.xml | |
parent | ac8cdf1cdc148bd21290ecf4d4f9874f8c87cc14 (diff) | |
download | spark-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 'pom.xml')
-rw-r--r-- | pom.xml | 28 |
1 files changed, 28 insertions, 0 deletions
@@ -810,9 +810,37 @@ <artifactId>guava</artifactId> <groupId>com.google.guava</groupId> </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.34</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>9.3-1102-jdbc41</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> <version>${curator.version}</version> |