Repository: spark Updated Branches: refs/heads/branch-2.0 c4660d607 -> f56035ba6
[SPARK-17473][SQL] fixing docker integration tests error due to different versions of jars. ## What changes were proposed in this pull request? Docker tests are using older version of jersey jars (1.19), which was used in older releases of spark. In 2.0 releases Spark was upgraded to use 2.x verison of Jersey. After upgrade to new versions, docker tests are failing with AbstractMethodError. Now that spark is upgraded to 2.x jersey version, using of shaded docker jars may not be required any more. Removed the exclusions/overrides of jersey related classes from pom file, and changed the docker-client to use regular jar instead of shaded one. ## How was this patch tested? Tested using existing docker-integration-tests Author: sureshthalamati <[email protected]> Closes #15114 from sureshthalamati/docker_testfix-spark-17473. (cherry picked from commit cdea1d1343d02f0077e1f3c92ca46d04a3d30414) 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/f56035ba Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f56035ba Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f56035ba Branch: refs/heads/branch-2.0 Commit: f56035ba6c86fe93a45fd437f98f812431df0069 Parents: c4660d6 Author: sureshthalamati <[email protected]> Authored: Mon Sep 19 09:56:16 2016 -0700 Committer: Josh Rosen <[email protected]> Committed: Mon Sep 19 10:29:57 2016 -0700 ---------------------------------------------------------------------- external/docker-integration-tests/pom.xml | 68 -------------------------- pom.xml | 1 - 2 files changed, 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/f56035ba/external/docker-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index 18e14c7..0ca94e5 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -49,38 +49,7 @@ <dependency> <groupId>com.spotify</groupId> <artifactId>docker-client</artifactId> - <classifier>shaded</classifier> <scope>test</scope> - <!-- - See https://github.com/spotify/docker-client/pull/272#issuecomment-155249101 - for an explanation of why these exclusions are (necessarily) a mess. - --> - <exclusions> - <exclusion> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-guava</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - <exclusion> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.glassfish.jersey.connectors</groupId> - <artifactId>jersey-apache-connector</artifactId> - </exclusion> - <exclusion> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-json-jackson</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -152,43 +121,6 @@ <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; - we can remove this once https://github.com/spotify/docker-client/pull/272 is - merged and a new docker-client release is published. --> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - <version>1.19</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - <version>1.19</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> - <version>1.19</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-json</artifactId> - <version>1.19</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- End Jersey dependencies --> - <!-- DB2 JCC driver manual installation instructions You can build this datasource if you: http://git-wip-us.apache.org/repos/asf/spark/blob/f56035ba/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a723283..97bb085 100644 --- a/pom.xml +++ b/pom.xml @@ -744,7 +744,6 @@ <dependency> <groupId>com.spotify</groupId> <artifactId>docker-client</artifactId> - <classifier>shaded</classifier> <version>3.6.6</version> <scope>test</scope> <exclusions> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
