Repository: spark Updated Branches: refs/heads/branch-1.6 9fe8dc916 -> 699f497cf
[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 <[email protected]> Closes #9876 from markgrover/master_docker. (cherry picked from commit 2166c2a75083c2262e071a652dd52b1a33348b6e) Signed-off-by: Josh Rosen <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/699f497c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/699f497c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/699f497c Branch: refs/heads/branch-1.6 Commit: 699f497cf7ceefbaed689b6f3515f8a2ebc636ca Parents: 9fe8dc9 Author: Mark Grover <[email protected]> Authored: Wed Dec 9 18:37:35 2015 -0800 Committer: Josh Rosen <[email protected]> Committed: Wed Dec 9 18:39:59 2015 -0800 ---------------------------------------------------------------------- docker-integration-tests/pom.xml | 22 ++++++++++++++++++++++ pom.xml | 28 ++++++++++++++++++++++++++++ sql/core/pom.xml | 2 -- 3 files changed, 50 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/699f497c/docker-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/docker-integration-tests/pom.xml b/docker-integration-tests/pom.xml index dee0c4a..39d3f34 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; http://git-wip-us.apache.org/repos/asf/spark/blob/699f497c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a47fd78..4050b43 100644 --- a/pom.xml +++ b/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/spark/blob/699f497c/sql/core/pom.xml ---------------------------------------------------------------------- diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 9fd6b5a..06841b0 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -91,13 +91,11 @@ <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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
