You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2011/04/25 15:52:37 UTC
svn commit: r1096482 - in /httpcomponents/httpasyncclient/trunk:
httpasyncclient/pom.xml
httpasyncclient/src/test/java/org/apache/http/localserver/
httpasyncclient/src/test/resources/
httpasyncclient/src/test/resources/test.keystore pom.xml
Author: olegk
Date: Mon Apr 25 13:52:36 2011
New Revision: 1096482
URL: http://svn.apache.org/viewvc?rev=1096482&view=rev
Log:
Upgraded HttpClient dependency to version 4.1.1; removed dependency on HttpClient test classes
Added:
httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/localserver/ (props changed)
- copied from r1096467, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/
httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/resources/
httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/resources/test.keystore
- copied unchanged from r1096480, httpcomponents/httpclient/trunk/httpclient/src/test/resources/test.keystore
Modified:
httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml
httpcomponents/httpasyncclient/trunk/pom.xml
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml?rev=1096482&r1=1096481&r2=1096482&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml Mon Apr 25 13:52:36 2011
@@ -67,13 +67,6 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
</dependencies>
<properties>
Propchange: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/localserver/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 25 13:52:36 2011
@@ -0,0 +1,4 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/java/org/apache/http/localserver:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/java/org/apache/http/localserver:1079518-1080165
+/httpcomponents/httpclient/branches/branch_4_1/httpclient/src/test/java/org/apache/http/localserver:755593-811107
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/test/java/org/apache/http/localserver:1024348-1031454
Modified: httpcomponents/httpasyncclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/pom.xml?rev=1096482&r1=1096481&r2=1096482&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/pom.xml (original)
+++ httpcomponents/httpasyncclient/trunk/pom.xml Mon Apr 25 13:52:36 2011
@@ -73,7 +73,7 @@
<maven.compile.optimize>true</maven.compile.optimize>
<maven.compile.deprecation>true</maven.compile.deprecation>
<httpcore.version>4.1</httpcore.version>
- <httpclient.version>4.1</httpclient.version>
+ <httpclient.version>4.1.1</httpclient.version>
<commons-logging.version>1.1.1</commons-logging.version>
<junit.version>4.8.1</junit.version>
</properties>