[SPARK-12972][CORE] Update org.apache.httpcomponents.httpclient
## What changes were proposed in this pull request? (Retry of https://github.com/apache/spark/pull/13049) - update to httpclient 4.5 / httpcore 4.4 - remove some defunct exclusions - manage httpmime version to match - update selenium / httpunit to support 4.5 (possible now that Jetty 9 is used) ## How was this patch tested? Jenkins tests. Also, locally running the same test command of one Jenkins profile that failed: `mvn -Phadoop-2.6 -Pyarn -Phive -Phive-thriftserver -Pkinesis-asl ...` Author: Sean Owen <sowen@cloudera.com> Closes #13117 from srowen/SPARK-12972.2.
This commit is contained in:
parent
354f8f11bd
commit
f5576a052d
11
core/pom.xml
11
core/pom.xml
|
@ -275,12 +275,11 @@
|
|||
<dependency>
|
||||
<groupId>org.seleniumhq.selenium</groupId>
|
||||
<artifactId>selenium-java</artifactId>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.seleniumhq.selenium</groupId>
|
||||
<artifactId>selenium-htmlunit-driver</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- Added for selenium: -->
|
||||
|
|
|
@ -69,8 +69,8 @@ hadoop-yarn-server-web-proxy-2.2.0.jar
|
|||
hk2-api-2.4.0-b34.jar
|
||||
hk2-locator-2.4.0-b34.jar
|
||||
hk2-utils-2.4.0-b34.jar
|
||||
httpclient-4.3.2.jar
|
||||
httpcore-4.3.2.jar
|
||||
httpclient-4.5.2.jar
|
||||
httpcore-4.4.4.jar
|
||||
ivy-2.4.0.jar
|
||||
jackson-annotations-2.5.3.jar
|
||||
jackson-core-2.5.3.jar
|
||||
|
|
|
@ -71,8 +71,8 @@ hadoop-yarn-server-web-proxy-2.3.0.jar
|
|||
hk2-api-2.4.0-b34.jar
|
||||
hk2-locator-2.4.0-b34.jar
|
||||
hk2-utils-2.4.0-b34.jar
|
||||
httpclient-4.3.2.jar
|
||||
httpcore-4.3.2.jar
|
||||
httpclient-4.5.2.jar
|
||||
httpcore-4.4.4.jar
|
||||
ivy-2.4.0.jar
|
||||
jackson-annotations-2.5.3.jar
|
||||
jackson-core-2.5.3.jar
|
||||
|
|
|
@ -71,8 +71,8 @@ hadoop-yarn-server-web-proxy-2.4.0.jar
|
|||
hk2-api-2.4.0-b34.jar
|
||||
hk2-locator-2.4.0-b34.jar
|
||||
hk2-utils-2.4.0-b34.jar
|
||||
httpclient-4.3.2.jar
|
||||
httpcore-4.3.2.jar
|
||||
httpclient-4.5.2.jar
|
||||
httpcore-4.4.4.jar
|
||||
ivy-2.4.0.jar
|
||||
jackson-annotations-2.5.3.jar
|
||||
jackson-core-2.5.3.jar
|
||||
|
|
|
@ -77,8 +77,8 @@ hk2-api-2.4.0-b34.jar
|
|||
hk2-locator-2.4.0-b34.jar
|
||||
hk2-utils-2.4.0-b34.jar
|
||||
htrace-core-3.0.4.jar
|
||||
httpclient-4.3.2.jar
|
||||
httpcore-4.3.2.jar
|
||||
httpclient-4.5.2.jar
|
||||
httpcore-4.4.4.jar
|
||||
ivy-2.4.0.jar
|
||||
jackson-annotations-2.5.3.jar
|
||||
jackson-core-2.5.3.jar
|
||||
|
|
|
@ -77,8 +77,8 @@ hk2-api-2.4.0-b34.jar
|
|||
hk2-locator-2.4.0-b34.jar
|
||||
hk2-utils-2.4.0-b34.jar
|
||||
htrace-core-3.1.0-incubating.jar
|
||||
httpclient-4.3.2.jar
|
||||
httpcore-4.3.2.jar
|
||||
httpclient-4.5.2.jar
|
||||
httpcore-4.4.4.jar
|
||||
ivy-2.4.0.jar
|
||||
jackson-annotations-2.5.3.jar
|
||||
jackson-core-2.5.3.jar
|
||||
|
|
2
external/docker-integration-tests/pom.xml
vendored
2
external/docker-integration-tests/pom.xml
vendored
|
@ -85,13 +85,11 @@
|
|||
<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: -->
|
||||
|
|
54
pom.xml
54
pom.xml
|
@ -149,8 +149,8 @@
|
|||
<!-- the producer is used in tests -->
|
||||
<aws.kinesis.producer.version>0.10.2</aws.kinesis.producer.version>
|
||||
<!-- org.apache.httpcomponents/httpclient-->
|
||||
<commons.httpclient.version>4.3.2</commons.httpclient.version>
|
||||
<commons.httpcore.version>4.3.2</commons.httpcore.version>
|
||||
<commons.httpclient.version>4.5.2</commons.httpclient.version>
|
||||
<commons.httpcore.version>4.4.4</commons.httpcore.version>
|
||||
<!-- commons-httpclient/commons-httpclient-->
|
||||
<httpclient.classic.version>3.1</httpclient.classic.version>
|
||||
<commons.math3.version>3.4.1</commons.math3.version>
|
||||
|
@ -179,6 +179,7 @@
|
|||
<libthrift.version>0.9.2</libthrift.version>
|
||||
<antlr4.version>4.5.2-1</antlr4.version>
|
||||
<jpam.version>1.1</jpam.version>
|
||||
<selenium.version>2.52.0</selenium.version>
|
||||
|
||||
<test.java.home>${java.home}</test.java.home>
|
||||
<test.exclude.tags></test.exclude.tags>
|
||||
|
@ -410,6 +411,11 @@
|
|||
<artifactId>httpclient</artifactId>
|
||||
<version>${commons.httpclient.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpmime</artifactId>
|
||||
<version>${commons.httpclient.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpcore</artifactId>
|
||||
|
@ -418,7 +424,7 @@
|
|||
<dependency>
|
||||
<groupId>org.seleniumhq.selenium</groupId>
|
||||
<artifactId>selenium-java</artifactId>
|
||||
<version>2.45.0</version> <!-- 2.46.0+ requires Jetty 9 -->
|
||||
<version>${selenium.version}</version>
|
||||
<scope>test</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
|
@ -431,6 +437,12 @@
|
|||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.seleniumhq.selenium</groupId>
|
||||
<artifactId>selenium-htmlunit-driver</artifactId>
|
||||
<version>${selenium.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- Added for selenium only, and should match its dependent version: -->
|
||||
<dependency>
|
||||
<groupId>xml-apis</groupId>
|
||||
|
@ -731,18 +743,6 @@
|
|||
<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>
|
||||
|
@ -1448,14 +1448,6 @@
|
|||
<groupId>${hive.group}</groupId>
|
||||
<artifactId>hive-shims</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpclient</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpcore</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.apache.curator</groupId>
|
||||
<artifactId>curator-framework</artifactId>
|
||||
|
@ -1807,14 +1799,6 @@
|
|||
<artifactId>libthrift</artifactId>
|
||||
<version>${libthrift.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpclient</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpcore</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
|
@ -1826,14 +1810,6 @@
|
|||
<artifactId>libfb303</artifactId>
|
||||
<version>${libthrift.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpclient</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpcore</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
|
|
|
@ -70,6 +70,11 @@
|
|||
<artifactId>selenium-java</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.seleniumhq.selenium</groupId>
|
||||
<artifactId>selenium-htmlunit-driver</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-sql_${scala.binary.version}</artifactId>
|
||||
|
@ -106,12 +111,6 @@
|
|||
</sources>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>add-source</id>
|
||||
<phase>generate-sources</phase>
|
||||
|
|
|
@ -97,6 +97,11 @@
|
|||
<artifactId>selenium-java</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.seleniumhq.selenium</groupId>
|
||||
<artifactId>selenium-htmlunit-driver</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-core</artifactId>
|
||||
|
|
Loading…
Reference in a new issue