aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2016-05-15 15:56:46 +0100
committerSean Owen <sowen@cloudera.com>2016-05-15 15:56:46 +0100
commitf5576a052da0bb59343bc2a6b6ce06c6abaac75b (patch)
treea84680ad72490a346ce68f5a75ccab1380b994a1 /core
parent354f8f11bd4b20fa99bd67a98da3525fd3d75c81 (diff)
downloadspark-f5576a052da0bb59343bc2a6b6ce06c6abaac75b.tar.gz
spark-f5576a052da0bb59343bc2a6b6ce06c6abaac75b.tar.bz2
spark-f5576a052da0bb59343bc2a6b6ce06c6abaac75b.zip
[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.
Diffstat (limited to 'core')
-rw-r--r--core/pom.xml11
1 files changed, 5 insertions, 6 deletions
diff --git a/core/pom.xml b/core/pom.xml
index c9853528b4..4b8fb4e5fb 100644
--- a/core/pom.xml
+++ b/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: -->