Skip to content

Commit 699f497

Browse files
Mark GroverJoshRosen
Mark Grover
authored and
JoshRosen
committed
[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 apache#9876 from markgrover/master_docker. (cherry picked from commit 2166c2a) Signed-off-by: Josh Rosen <joshrosen@databricks.com>
1 parent 9fe8dc9 commit 699f497

File tree

3 files changed

+50
-2
lines changed

3 files changed

+50
-2
lines changed

‎docker-integration-tests/pom.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,18 @@
7171
</exclusion>
7272
</exclusions>
7373
</dependency>
74+
<dependency>
75+
<groupId>org.apache.httpcomponents</groupId>
76+
<artifactId>httpclient</artifactId>
77+
<version>4.5</version>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.apache.httpcomponents</groupId>
82+
<artifactId>httpcore</artifactId>
83+
<version>4.4.1</version>
84+
<scope>test</scope>
85+
</dependency>
7486
<!-- Necessary in order to avoid errors in log messages: -->
7587
<dependency>
7688
<groupId>com.google.guava</groupId>
@@ -109,6 +121,16 @@
109121
<version>${project.version}</version>
110122
<scope>test</scope>
111123
</dependency>
124+
<dependency>
125+
<groupId>mysql</groupId>
126+
<artifactId>mysql-connector-java</artifactId>
127+
<scope>test</scope>
128+
</dependency>
129+
<dependency>
130+
<groupId>org.postgresql</groupId>
131+
<artifactId>postgresql</artifactId>
132+
<scope>test</scope>
133+
</dependency>
112134
<!-- Jersey dependencies, used to override version.
113135
See https://github.com/apache/spark/pull/9503#issuecomment-154369560 for
114136
background on why we need to use a newer Jersey only in this test module;

‎pom.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -810,8 +810,36 @@
810810
<artifactId>guava</artifactId>
811811
<groupId>com.google.guava</groupId>
812812
</exclusion>
813+
<exclusion>
814+
<groupId>org.apache.httpcomponents</groupId>
815+
<artifactId>httpclient</artifactId>
816+
</exclusion>
817+
<exclusion>
818+
<groupId>org.apache.httpcomponents</groupId>
819+
<artifactId>httpcore</artifactId>
820+
</exclusion>
821+
<exclusion>
822+
<groupId>commons-logging</groupId>
823+
<artifactId>httpclient</artifactId>
824+
</exclusion>
825+
<exclusion>
826+
<groupId>commons-logging</groupId>
827+
<artifactId>commons-logging</artifactId>
828+
</exclusion>
813829
</exclusions>
814830
</dependency>
831+
<dependency>
832+
<groupId>mysql</groupId>
833+
<artifactId>mysql-connector-java</artifactId>
834+
<version>5.1.34</version>
835+
<scope>test</scope>
836+
</dependency>
837+
<dependency>
838+
<groupId>org.postgresql</groupId>
839+
<artifactId>postgresql</artifactId>
840+
<version>9.3-1102-jdbc41</version>
841+
<scope>test</scope>
842+
</dependency>
815843
<dependency>
816844
<groupId>org.apache.curator</groupId>
817845
<artifactId>curator-recipes</artifactId>

‎sql/core/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,11 @@
9191
<dependency>
9292
<groupId>mysql</groupId>
9393
<artifactId>mysql-connector-java</artifactId>
94-
<version>5.1.34</version>
9594
<scope>test</scope>
9695
</dependency>
9796
<dependency>
9897
<groupId>org.postgresql</groupId>
9998
<artifactId>postgresql</artifactId>
100-
<version>9.3-1102-jdbc41</version>
10199
<scope>test</scope>
102100
</dependency>
103101
<dependency>

0 commit comments

Comments
 (0)