Author: sebb
Date: Thu Jun 14 22:40:41 2012
New Revision: 1350417
URL: http://svn.apache.org/viewvc?rev=1350417&view=rev
Log:
Update to HttpCore 4.2.1
Modified:
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
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=1350417&r1=1350416&r2=1350417&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Thu Jun 14 22:40:41 2012
@@ -15,6 +15,15 @@
# **** External jars (not built as part of JMeter) and needed for
build/release ****
+# N.B.
+# When updating this file, please also update the versions in
+# - res/maven/ApacheJMeter_parent.pom
+# - eclipse.classpath
+# - xdocs/changes.xml
+#
+# Also, please update the lib/ directory ignore list
+# [Please don't use wild-card versions, because that makes it harder to
detect obsolete jars]
+
# property name conventions:
#
# xxx.jar - name of the jar as used in JMeter
@@ -153,10 +162,10 @@ httpmime.loc = ${maven2.re
httpmime.md5 = b1008eeefe9b4744effe21b77f3e2469
# Required for HttpClient
-httpcore.version = 4.2
+httpcore.version = 4.2.1
httpcore.jar = httpcore-${httpcore.version}.jar
httpcore.loc =
${maven2.repo}/org/apache/httpcomponents/httpcore/${httpcore.version}
-httpcore.md5 = 6db815039bebb9c837960e7dca0e9001
+httpcore.md5 = a777e8a2af991b8f1d07b23e77831aaf
jakarta-oro.version = 2.0.8
jakarta-oro.jar = oro-${jakarta-oro.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1350417&r1=1350416&r2=1350417&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Thu Jun 14 22:40:41 2012
@@ -63,7 +63,7 @@
<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.jar"/>
- <classpathentry kind="lib" path="lib/httpcore-4.2.jar"/>
+ <classpathentry kind="lib" path="lib/httpcore-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.2.jar"/>
<classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
<classpathentry kind="lib" path="lib/jdom-1.1.2.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jun 14 22:40:41 2012
@@ -23,9 +23,9 @@ excalibur-pool-1.2.jar
geronimo*.jar
htmllexer-2.1.jar
htmlparser-2.1.jar
-httpclient-4.1.3.jar
-httpcore-4.1.4.jar
-httpmime-4.1.3.jar
+httpclient-4.2.jar
+httpcore-4.2.1.jar
+httpmime-4.2.jar
jcharts-0.7.5.jar
jdom-1.1.2.jar
jms*.jar
@@ -45,7 +45,3 @@ xmlgraphics-commons-1.3.1.jar
xpp3_min-1.1.4c.jar
xstream-1.4.2.jar
xmlpull-1.1.3.1.jar
-httpclient-*.jar
-httpmime-*.jar
-
-httpcore*.jar
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1350417&r1=1350416&r2=1350417&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Thu Jun 14 22:40:41 2012
@@ -73,7 +73,7 @@ under the License.
<excalibur-pool.version>1.2</excalibur-pool.version>
<htmlparser.version>2.1</htmlparser.version>
<httpclient.version>4.2</httpclient.version>
- <httpcore.version>4.2</httpcore.version>
+ <httpcore.version>4.2.1</httpcore.version>
<jakarta-oro.version>2.0.8</jakarta-oro.version>
<jcharts.version>0.7.5</jcharts.version>
<jdom.version>1.1.2</jdom.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1350417&r1=1350416&r2=1350417&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Jun 14 22:40:41 2012
@@ -133,7 +133,7 @@ or a Debug Sampler with all fields set t
<ul>
<li><bugzilla>53311</bugzilla> - JMeterUtils#runSafe should not throw Error
when interrupted</li>
<li>Updated to commons-net-3.1 (from 3.0.1)</li>
-<li>Updated to HttpComponents Core 4.2 (from 4.1.4) and HttpComponents Client
4.2 (from 4.1.3)</li>
+<li>Updated to HttpComponents Core 4.2.1 (from 4.1.4) and HttpComponents
Client 4.2 (from 4.1.3)</li>
</ul>
</section>
