diff options
| -rw-r--r-- | docker-integration-tests/pom.xml | 22 | ||||
| -rw-r--r-- | pom.xml | 28 | ||||
| -rw-r--r-- | sql/core/pom.xml | 2 |
3 files changed, 50 insertions, 2 deletions
diff --git a/docker-integration-tests/pom.xml b/docker-integration-tests/pom.xml index dee0c4aa37..39d3f34461 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; @@ -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> diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 9fd6b5a07e..06841b0945 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> |