PIG-5302: Remove HttpClient dependency (nkollar via szita)
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1815189 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 5f399aa..7340b2c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,8 @@
IMPROVEMENTS
+PIG-5302: Remove HttpClient dependency (nkollar via szita)
+
PIG-5305: Enable yarn-client mode execution of tests in Spark (1) mode (szita)
PIG-4120: Broadcast the index file in case of POMergeCoGroup and POMergeJoin (satishsaley via rohini)
diff --git a/NOTICE.txt b/NOTICE.txt
index 34031df..b3ecb60 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -36,10 +36,6 @@
Copyright (c) 2001-2010, The HSQL Development Group
All rights reserved.
-This product includes/uses xmlenc (http://xmlenc.sourceforge.net/)
-Copyright 2003-2005, Ernst de Haan <wfe.dehaan@gmail.com>
-All rights reserved.
-
This product includes/uses Joda (http://joda-time.sourceforge.net/)
Copyright 2001-2006 Stephen Colebourne
diff --git a/build.xml b/build.xml
index 531538a..40f0695 100644
--- a/build.xml
+++ b/build.xml
@@ -776,7 +776,6 @@
<fileset dir="${ivy.lib.dir}" includes="commons-codec-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="commons-io-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="commons-logging-*.jar"/>
- <fileset dir="${ivy.lib.dir}" includes="httpclient-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="httpcore-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="log4j-*.jar"/>
<fileset dir="${ivy.lib.dir}" includes="slf4j-*.jar"/>
diff --git a/ivy.xml b/ivy.xml
index 7034524..ef2ca0a 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -55,12 +55,8 @@
<dependencies>
<dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
conf="checkstyle->master"/>
- <!-- <dependency org="antlr" name="antlr" rev="${antlr.version}"
- conf="checkstyle->master"/> -->
<dependency org="commons-beanutils" name="commons-beanutils-core" rev="${commons-beanutils.version}"
conf="checkstyle->master"/>
- <dependency org="xmlenc" name="xmlenc" rev="${xmlenc.version}"
- conf="hadoop2->master"/>
<dependency org="com.sun.jersey" name="jersey-bundle" rev="${jersey.version}"
conf="hadoop2->master"/>
<dependency org="com.sun.jersey" name="jersey-server" rev="${jersey.version}"
@@ -69,8 +65,6 @@
conf="hadoop2->master"/>
<dependency org="commons-codec" name="commons-codec" rev="${commons-codec.version}"
conf="hadoop2->master"/>
- <dependency org="commons-httpclient" name="commons-httpclient" rev="${commons-httpclient.version}"
- conf="hadoop2->master"/>
<dependency org="commons-el" name="commons-el" rev="${commons-el.version}"
conf="compile->master"/>
<dependency org="commons-io" name="commons-io" rev="${commons-io.version}"
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index ccdc6a1..c638727 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -26,13 +26,11 @@
commons-io.version=2.3
commons-el.version=1.0
commons-logging.version=1.1.1
-commons-lang.version=2.4
+commons-lang.version=2.6
commons-configuration.version=1.6
commons-collections.version=3.2.1
commons-collections4.version=4.0
-commons-httpclient.version=3.1
commons-math3.version=3.1.1
-xmlenc.version=0.52
jersey.version=1.8
checkstyle.version=4.2
ivy.version=2.2.0
@@ -44,7 +42,7 @@
hbase1.version=1.2.4
hsqldb.version=1.8.0.10
hive.version=1.2.1
-httpcomponents.version=4.1
+httpcomponents.version=4.4
jackson.version=1.9.13
jackson-pig-3039-test.version=1.9.9
javacc.version=4.2
@@ -95,6 +93,6 @@
leveldbjni.version=1.8
curator.version=2.6.0
htrace.version=3.1.0-incubating
-commons-lang3.version=3.1
+commons-lang3.version=3.6
scala-xml.version=1.0.5
glassfish.el.version=3.0.1-b08
\ No newline at end of file
diff --git a/ivy/pig-template.xml b/ivy/pig-template.xml
index 6fc16b8..5c930c9 100644
--- a/ivy/pig-template.xml
+++ b/ivy/pig-template.xml
@@ -28,16 +28,6 @@
<artifactId>commons-cli</artifactId>
<version>1.2</version>
</dependency>
- <dependency>
- <groupId>xmlenc</groupId>
- <artifactId>xmlenc</artifactId>
- <version>0.52</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
diff --git a/ivy/piggybank-template.xml b/ivy/piggybank-template.xml
index 184f593..44fac48 100644
--- a/ivy/piggybank-template.xml
+++ b/ivy/piggybank-template.xml
@@ -26,7 +26,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
diff --git a/ivy/pigunit-template.xml b/ivy/pigunit-template.xml
index 400d025..ae64384 100644
--- a/ivy/pigunit-template.xml
+++ b/ivy/pigunit-template.xml
@@ -26,7 +26,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
