Author: kwright
Date: Tue Jan 15 11:12:50 2013
New Revision: 1433355
URL: http://svn.apache.org/viewvc?rev=1433355&view=rev
Log:
Fix for CONNECTORS-582.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/pom.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1433355&r1=1433354&r2=1433355&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Jan 15 11:12:50 2013
@@ -3,6 +3,10 @@ $Id$
======================= 1.1-dev =====================
+CONNECTORS-582: Upgrade to official httpcomponents 4.2.3
+release.
+(Karl Wright)
+
CONNECTORS-612: Disable HttpClient retries everywhere.
(Karl Wright)
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1433355&r1=1433354&r2=1433355&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Tue Jan 15 11:12:50 2013
@@ -2815,27 +2815,25 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-httpcomponents">
<mkdir dir="lib"/>
- <get
src="http://people.apache.org/~kwright/httpcore-4.2.4-SNAPSHOT.jar";
dest="lib/httpcore.jar"/>
- <get
src="http://people.apache.org/~kwright/httpclient-4.2.3-SNAPSHOT.jar";
dest="lib/httpclient.jar"/>
- <!-- antcall target="download-via-maven">
+ <antcall target="download-via-maven">
<param name="project-path" value="org/apache/httpcomponents"/>
- <param name="artifact-version" value="4.2.2"/>
+ <param name="artifact-version" value="4.2.3"/>
<param name="target" value="lib"/>
<param name="artifact-name" value="httpcore"/>
<param name="artifact-type" value="jar"/>
- </antcall -->
- <!-- antcall target="download-via-maven">
+ </antcall>
+ <antcall target="download-via-maven">
<param name="project-path" value="org/apache/httpcomponents"/>
- <param name="artifact-version" value="4.2.2"/>
+ <param name="artifact-version" value="4.2.3"/>
<param name="target" value="lib"/>
<param name="artifact-name" value="httpclient"/>
<param name="artifact-type" value="jar"/>
- </antcall -->
+ </antcall>
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/apache/httpcomponents"/>
- <param name="artifact-version" value="4.2.1"/>
+ <param name="artifact-version" value="4.2.3"/>
<param name="artifact-name" value="httpmime"/>
<param name="artifact-type" value="jar"/>
</antcall>
Modified: manifoldcf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1433355&r1=1433354&r2=1433355&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Tue Jan 15 11:12:50 2013
@@ -48,7 +48,7 @@
<commons-logging.version>1.1.1</commons-logging.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-fileupload.version>1.2.2</commons-fileupload.version>
- <httpcomponent.version>4.2.2</httpcomponent.version>
+ <httpcomponent.version>4.2.3</httpcomponent.version>
<commons-el.version>1.0</commons-el.version>
<commons-lang.version>2.6</commons-lang.version>
<xalan.version>2.7.1</xalan.version>
