aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--external/docker-integration-tests/pom.xml68
-rw-r--r--pom.xml1
2 files changed, 0 insertions, 69 deletions
diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml
index 7417199e76..57d553b75b 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:
diff --git a/pom.xml b/pom.xml
index b514173601..8afc39bb46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -743,7 +743,6 @@
<dependency>
<groupId>com.spotify</groupId>
<artifactId>docker-client</artifactId>
- <classifier>shaded</classifier>
<version>3.6.6</version>
<scope>test</scope>
<exclusions>