You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2012/11/05 10:05:48 UTC

svn commit: r1405715 - in /jmeter/trunk: build.properties eclipse.classpath lib/ lib/aareadme.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml

Author: milamber
Date: Mon Nov  5 09:05:47 2012
New Revision: 1405715

URL: http://svn.apache.org/viewvc?rev=1405715&view=rev
Log:
Upgrade to httpclient and httpmine 4.2.2 from 4.2.1

Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/eclipse.classpath
    jmeter/trunk/lib/   (props changed)
    jmeter/trunk/lib/aareadme.txt
    jmeter/trunk/res/maven/ApacheJMeter_parent.pom
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1405715&r1=1405714&r2=1405715&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Mon Nov  5 09:05:47 2012
@@ -156,16 +156,16 @@ htmlparser.jar              = htmlparser
 htmlparser.md5              = aa05b921026c228f92ef8b4a13c26f8d
 
 # Apache HttpClient 4.x
-httpclient.version          = 4.2.1
+httpclient.version          = 4.2.2
 #
 httpclient.jar              = httpclient-${httpclient.version}.jar
 httpclient.loc              = ${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
-httpclient.md5              = 54b09b6e45ff3e2adf0409aa6e652a8d
+httpclient.md5              = 585886f289fd1450ab241ab8774d7b1b
 
 # Required for HttpClient
 httpmime.jar               = httpmime-${httpclient.version}.jar
 httpmime.loc               = ${maven2.repo}/org/apache/httpcomponents/httpmime/${httpclient.version}
-httpmime.md5               = debbb029073ed28c3a69530cb8e14ef5
+httpmime.md5               = 78ad350f4e743281dbdfd063371e7256
 
 # Required for HttpClient
 httpcore.version            = 4.2.2

Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1405715&r1=1405714&r2=1405715&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Mon Nov  5 09:05:47 2012
@@ -62,9 +62,9 @@
     <classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/htmllexer-2.1.jar"/>
 	<classpathentry kind="lib" path="lib/htmlparser-2.1.jar"/>
-    <classpathentry kind="lib" path="lib/httpclient-4.2.1.jar"/>
+    <classpathentry kind="lib" path="lib/httpclient-4.2.2.jar"/>
     <classpathentry kind="lib" path="lib/httpcore-4.2.2.jar"/>
-    <classpathentry kind="lib" path="lib/httpmime-4.2.1.jar"/>
+    <classpathentry kind="lib" path="lib/httpmime-4.2.2.jar"/>
 	<classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
 	<classpathentry kind="lib" path="lib/jdom-1.1.2.jar"/>
 	<classpathentry kind="lib" path="lib/rhino-1.7R3.jar"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov  5 09:05:47 2012
@@ -24,9 +24,9 @@ excalibur-pool-1.2.jar
 geronimo*.jar
 htmllexer-2.1.jar
 htmlparser-2.1.jar
-httpclient-4.2.1.jar
+httpclient-4.2.2.jar
 httpcore-4.2.2.jar
-httpmime-4.2.1.jar
+httpmime-4.2.2.jar
 jcharts-0.7.5.jar
 jdom-1.1.2.jar
 jms*.jar

Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1405715&r1=1405714&r2=1405715&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Mon Nov  5 09:05:47 2012
@@ -98,6 +98,11 @@ htmllexer-2.1
 http://htmlparser.sourceforge.net/
 - http: parsing html
 
+tika-core-1.2
+tika-parsers-1.2
+----------------------
+- Extract text from various documents
+
 jCharts-0.7.5 (org.jCharts)
 -------------
 http://jcharts.sourceforge.net/downloads.html

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1405715&r1=1405714&r2=1405715&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Mon Nov  5 09:05:47 2012
@@ -72,7 +72,7 @@ under the License.
       <excalibur-logger.version>1.1</excalibur-logger.version>
       <excalibur-pool.version>1.2</excalibur-pool.version>
       <htmlparser.version>2.1</htmlparser.version>
-      <httpclient.version>4.2</httpclient.version>
+      <httpclient.version>4.2.2</httpclient.version>
       <httpcore.version>4.2.2</httpcore.version>
       <jakarta-oro.version>2.0.8</jakarta-oro.version>
       <jcharts.version>0.7.5</jcharts.version>

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1405715&r1=1405714&r2=1405715&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon Nov  5 09:05:47 2012
@@ -178,6 +178,7 @@ and right angle bracket (&gt;) in search
 <h2>Non-functional changes</h2>
 <ul>
 <li><bugzilla>53956</bugzilla> - Add ability to paste (a list of values) from clipboard for Header Manager</li>
+<li>Updated to HttpComponents Client 4.2.2 (from 4.2.1)</li>
 </ul>
 
 </section>