You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/09/16 16:22:03 UTC
svn commit: r1523667 - in /manifoldcf/trunk: ./ connectors/elasticsearch/
connectors/generic/ connectors/opensearchserver/ connectors/rss/
connectors/sharepoint/ connectors/webcrawler/ connectors/wiki/
framework/api-service/ framework/authority-service...
Author: kwright
Date: Mon Sep 16 14:22:03 2013
New Revision: 1523667
URL: http://svn.apache.org/r1523667
Log:
Upgrade to use httpclient 4.2.6. Fix for CONNECTORS-775.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/elasticsearch/pom.xml
manifoldcf/trunk/connectors/generic/pom.xml
manifoldcf/trunk/connectors/opensearchserver/pom.xml
manifoldcf/trunk/connectors/rss/pom.xml
manifoldcf/trunk/connectors/sharepoint/pom.xml
manifoldcf/trunk/connectors/webcrawler/pom.xml
manifoldcf/trunk/connectors/wiki/pom.xml
manifoldcf/trunk/framework/api-service/pom.xml
manifoldcf/trunk/framework/authority-service/pom.xml
manifoldcf/trunk/framework/combined-service/pom.xml
manifoldcf/trunk/framework/core/pom.xml
manifoldcf/trunk/framework/crawler-ui/pom.xml
manifoldcf/trunk/framework/jetty-runner/pom.xml
manifoldcf/trunk/framework/pull-agent/pom.xml
manifoldcf/trunk/framework/script-engine/pom.xml
manifoldcf/trunk/pom.xml
manifoldcf/trunk/tests/alfresco/pom.xml
manifoldcf/trunk/tests/cmis/pom.xml
manifoldcf/trunk/tests/elasticsearch/pom.xml
manifoldcf/trunk/tests/filesystem/pom.xml
manifoldcf/trunk/tests/rss/pom.xml
manifoldcf/trunk/tests/sharepoint/pom.xml
manifoldcf/trunk/tests/webcrawler/pom.xml
manifoldcf/trunk/tests/wiki/pom.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Sep 16 14:22:03 2013
@@ -3,6 +3,9 @@ $Id$
======================= 1.4-dev =====================
+CONNECTORS-775: Use httpclient 4.2.6.
+(Karl Wright)
+
CONNECTORS-774: Add support for proxies to Wiki connector.
(Karl Wright)
Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Mon Sep 16 14:22:03 2013
@@ -3268,14 +3268,14 @@ Use Apache Forrest version forrest-0.9-d
<antcall target="download-via-maven">
<param name="project-path" value="org/apache/httpcomponents"/>
- <param name="artifact-version" value="4.2.4"/>
+ <param name="artifact-version" value="4.2.5"/>
<param name="target" value="lib"/>
<param name="artifact-name" value="httpcore"/>
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven">
<param name="project-path" value="org/apache/httpcomponents"/>
- <param name="artifact-version" value="4.2.5"/>
+ <param name="artifact-version" value="4.2.6"/>
<param name="target" value="lib"/>
<param name="artifact-name" value="httpclient"/>
<param name="artifact-type" value="jar"/>
@@ -3283,7 +3283,7 @@ Use Apache Forrest version forrest-0.9-d
<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.5"/>
+ <param name="artifact-version" value="4.2.6"/>
<param name="artifact-name" value="httpmime"/>
<param name="artifact-type" value="jar"/>
</antcall>
Modified: manifoldcf/trunk/connectors/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/pom.xml (original)
+++ manifoldcf/trunk/connectors/elasticsearch/pom.xml Mon Sep 16 14:22:03 2013
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/connectors/generic/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/generic/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/generic/pom.xml (original)
+++ manifoldcf/trunk/connectors/generic/pom.xml Mon Sep 16 14:22:03 2013
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
</dependencies>
</project>
Modified: manifoldcf/trunk/connectors/opensearchserver/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/pom.xml (original)
+++ manifoldcf/trunk/connectors/opensearchserver/pom.xml Mon Sep 16 14:22:03 2013
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/connectors/rss/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/pom.xml (original)
+++ manifoldcf/trunk/connectors/rss/pom.xml Mon Sep 16 14:22:03 2013
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/connectors/sharepoint/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/pom.xml (original)
+++ manifoldcf/trunk/connectors/sharepoint/pom.xml Mon Sep 16 14:22:03 2013
@@ -195,7 +195,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/connectors/webcrawler/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/webcrawler/pom.xml (original)
+++ manifoldcf/trunk/connectors/webcrawler/pom.xml Mon Sep 16 14:22:03 2013
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/connectors/wiki/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/wiki/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/wiki/pom.xml (original)
+++ manifoldcf/trunk/connectors/wiki/pom.xml Mon Sep 16 14:22:03 2013
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/framework/api-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/api-service/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/framework/api-service/pom.xml (original)
+++ manifoldcf/trunk/framework/api-service/pom.xml Mon Sep 16 14:22:03 2013
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: manifoldcf/trunk/framework/authority-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/authority-service/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/framework/authority-service/pom.xml (original)
+++ manifoldcf/trunk/framework/authority-service/pom.xml Mon Sep 16 14:22:03 2013
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: manifoldcf/trunk/framework/combined-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/combined-service/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/framework/combined-service/pom.xml (original)
+++ manifoldcf/trunk/framework/combined-service/pom.xml Mon Sep 16 14:22:03 2013
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: manifoldcf/trunk/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/pom.xml (original)
+++ manifoldcf/trunk/framework/core/pom.xml Mon Sep 16 14:22:03 2013
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: manifoldcf/trunk/framework/crawler-ui/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/pom.xml (original)
+++ manifoldcf/trunk/framework/crawler-ui/pom.xml Mon Sep 16 14:22:03 2013
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: manifoldcf/trunk/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/jetty-runner/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/framework/jetty-runner/pom.xml (original)
+++ manifoldcf/trunk/framework/jetty-runner/pom.xml Mon Sep 16 14:22:03 2013
@@ -338,7 +338,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: manifoldcf/trunk/framework/pull-agent/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/pom.xml (original)
+++ manifoldcf/trunk/framework/pull-agent/pom.xml Mon Sep 16 14:22:03 2013
@@ -136,7 +136,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: manifoldcf/trunk/framework/script-engine/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/script-engine/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/framework/script-engine/pom.xml (original)
+++ manifoldcf/trunk/framework/script-engine/pom.xml Mon Sep 16 14:22:03 2013
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Mon Sep 16 14:22:03 2013
@@ -48,7 +48,9 @@
<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.5</httpcomponent.version>
+ <httpcomponent.httpclient.version>4.2.6</httpcomponent.httpclient.version>
+ <httpcomponent.httpcore.version>4.2.5</httpcomponent.httpcore.version>
+ <httpcomponent.httpmime.version>4.2.6</httpcomponent.httpmime.version>
<solr.version>4.3.1</solr.version>
<commons-el.version>1.0</commons-el.version>
<commons-lang.version>2.6</commons-lang.version>
Modified: manifoldcf/trunk/tests/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/alfresco/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/tests/alfresco/pom.xml (original)
+++ manifoldcf/trunk/tests/alfresco/pom.xml Mon Sep 16 14:22:03 2013
@@ -322,7 +322,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/tests/cmis/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/cmis/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/tests/cmis/pom.xml (original)
+++ manifoldcf/trunk/tests/cmis/pom.xml Mon Sep 16 14:22:03 2013
@@ -311,7 +311,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/tests/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/elasticsearch/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/tests/elasticsearch/pom.xml (original)
+++ manifoldcf/trunk/tests/elasticsearch/pom.xml Mon Sep 16 14:22:03 2013
@@ -326,7 +326,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/tests/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/filesystem/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/tests/filesystem/pom.xml (original)
+++ manifoldcf/trunk/tests/filesystem/pom.xml Mon Sep 16 14:22:03 2013
@@ -296,7 +296,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/tests/rss/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/rss/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/tests/rss/pom.xml (original)
+++ manifoldcf/trunk/tests/rss/pom.xml Mon Sep 16 14:22:03 2013
@@ -290,7 +290,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/tests/sharepoint/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/sharepoint/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/tests/sharepoint/pom.xml (original)
+++ manifoldcf/trunk/tests/sharepoint/pom.xml Mon Sep 16 14:22:03 2013
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/tests/webcrawler/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/webcrawler/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/tests/webcrawler/pom.xml (original)
+++ manifoldcf/trunk/tests/webcrawler/pom.xml Mon Sep 16 14:22:03 2013
@@ -276,7 +276,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: manifoldcf/trunk/tests/wiki/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/wiki/pom.xml?rev=1523667&r1=1523666&r2=1523667&view=diff
==============================================================================
--- manifoldcf/trunk/tests/wiki/pom.xml (original)
+++ manifoldcf/trunk/tests/wiki/pom.xml Mon Sep 16 14:22:03 2013
@@ -282,7 +282,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpcomponent.version}</version>
+ <version>${httpcomponent.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>