Return-Path: 
 <commits-return-4023-apmail-hc-commits-archive=hc.apache.org@hc.apache.org>
X-Original-To: apmail-hc-commits-archive@www.apache.org
Delivered-To: apmail-hc-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3F41F2289
	for <apmail-hc-commits-archive@www.apache.org>;
 Mon, 25 Apr 2011 13:52:59 +0000 (UTC)
Received: (qmail 97564 invoked by uid 500); 25 Apr 2011 13:52:59 -0000
Delivered-To: apmail-hc-commits-archive@hc.apache.org
Received: (qmail 97531 invoked by uid 500); 25 Apr 2011 13:52:59 -0000
Mailing-List: contact commits-help@hc.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hc.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hc.apache.org>
List-Post: <mailto:commits@hc.apache.org>
List-Id: <commits.hc.apache.org>
Reply-To: "HttpComponents Project" <dev@hc.apache.org>
Delivered-To: mailing list commits@hc.apache.org
Received: (qmail 97524 invoked by uid 99); 25 Apr 2011 13:52:59 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Apr 2011 13:52:59 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Apr 2011 13:52:58 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 59D312388A32; Mon, 25 Apr 2011 13:52:37 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: 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
Date: Mon, 25 Apr 2011 13:52:37 -0000
To: commits@hc.apache.org
From: olegk@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110425135237.59D312388A32@eris.apache.org>

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>