You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2013/05/08 22:39:12 UTC
svn commit: r1480444 - in /jmeter/trunk: build.properties eclipse.classpath
lib/ lib/aareadme.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Author: pmouawad
Date: Wed May 8 20:39:12 2013
New Revision: 1480444
URL: http://svn.apache.org/r1480444
Log:
Updated to commons-codec 1.8 (from 1.6)
Updated to commons-io 2.4 (from 2.2)
Updated to commons-net 3.2 (from 3.1)
Updated to jdom-1.1.3 (from 1.1.2)
Updated to jodd-lagarto and jodd-core 3.4.3 (from 3.4.1)
Updated to junit 4.11 (from 4.10)
Updated to slf4j-api 1.7.5 (from 1.7.2)
Updated to xmlgraphics-commons 1.5 (from 1.3.1)
Updated to xstream 1.4.4 (from 1.4.2)
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=1480444&r1=1480443&r2=1480444&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Wed May 8 20:39:12 2013
@@ -72,10 +72,10 @@ bcpkix.jar = bcpkix-jdk
bcpkix.loc = ${maven2.repo}/org/bouncycastle/bcpkix-jdk15on/${bcprov.version}
bcpkix.md5 = f8fc0496846f567ec951ac0a0e25ed00
-commons-codec.version = 1.6
+commons-codec.version = 1.8
commons-codec.jar = commons-codec-${commons-codec.version}.jar
commons-codec.loc = ${maven2.repo}/commons-codec/commons-codec/${commons-codec.version}
-commons-codec.md5 = 5970f54883b4831b24b97f1125ba27e6
+commons-codec.md5 = b87aa66fe75685c82d082e750ab51b2e
commons-collections.version = 3.2.1
commons-collections.jar = commons-collections-${commons-collections.version}.jar
@@ -87,10 +87,10 @@ commons-httpclient.jar = commons-ht
commons-httpclient.loc = ${maven2.repo}/commons-httpclient/commons-httpclient/${commons-httpclient.version}
commons-httpclient.md5 = 8AD8C9229EF2D59AB9F59F7050E846A5
-commons-io.version = 2.2
+commons-io.version = 2.4
commons-io.jar = commons-io-${commons-io.version}.jar
commons-io.loc = ${maven2.repo}/commons-io/commons-io/${commons-io.version}
-commons-io.md5 = 6ad49e3e16c2342e9ee9599ce04775e6
+commons-io.md5 = 7f97854dc04c119d461fed14f5d8bb96
commons-jexl.version = 1.1
commons-jexl.jar = commons-jexl-${commons-jexl.version}.jar
@@ -120,10 +120,10 @@ commons-logging.loc = ${maven2.r
#commons-logging.md5 = E2C390FE739B2550A218262B28F290CE
commons-logging.md5 = 7875e042777b17d3d312ea5b90c48c7e
-commons-net.version = 3.1
+commons-net.version = 3.2
commons-net.jar = commons-net-${commons-net.version}.jar
commons-net.loc = ${maven2.repo}/commons-net/commons-net/${commons-net.version}
-commons-net.md5 = 23c94d51e72f341fb412d6a015e16313
+commons-net.md5 = 9b31ea48800bb3209976244ae0313066
excalibur-datasource.version = 1.1.1
excalibur-datasource.jar = excalibur-datasource-${excalibur-datasource.version}.jar
@@ -183,35 +183,35 @@ jcharts.jar = jcharts-${
jcharts.loc = ${maven2.repo}/jcharts/jcharts/${jcharts.version}
jcharts.md5 = 13927D8077C991E7EBCD8CB284746A7A
-jdom.version = 1.1.2
+jdom.version = 1.1.3
jdom.jar = jdom-${jdom.version}.jar
jdom.loc = ${maven2.repo}/org/jdom/jdom/${jdom.version}
-jdom.md5 = 742bb15c2eda90dff56e3d82cf40cd13
+jdom.md5 = 140bfed13341fe2039eee0f26a16d705
js_rhino.version = 1.7R4
js_rhino.jar = rhino-${js_rhino.version}.jar
js_rhino.loc = ${maven2.repo}/org/mozilla/rhino/${js_rhino.version}
js_rhino.md5 = 3850097fb5c9aa1065cc198f1b82dcf1
-jodd-core.version = 3.4.1
+jodd-core.version = 3.4.3
jodd-core.jar = jodd-core-${jodd-core.version}.jar
jodd-core.loc = ${maven2.repo}/org/jodd/jodd-core/${jodd-core.version}
-jodd-core.md5 = 2ab13b8fb06ffad7695f59871331cd96
+jodd-core.md5 = 720ac2f9ffbb5d425ade3879839b7f80
-jodd-lagarto.version = 3.4.1
+jodd-lagarto.version = 3.4.3
jodd-lagarto.jar = jodd-lagarto-${jodd-lagarto.version}.jar
jodd-lagarto.loc = ${maven2.repo}/org/jodd/jodd-lagarto/${jodd-lagarto.version}
-jodd-lagarto.md5 = afa9b73edc739d9b613c99d51606df73
+jodd-lagarto.md5 = 6f127aeac2b560801312659394cd5971
jsoup.version = 1.7.2
jsoup.jar = jsoup-${jsoup.version}.jar
jsoup.loc = ${maven2.repo}/org/jsoup/jsoup/${jsoup.version}
jsoup.md5 = 06cca626f92fca16f8d2dd9994ff9ab0
-junit.version = 4.10
+junit.version = 4.11
junit.jar = junit-${junit.version}.jar
junit.loc = ${maven2.repo}/junit/junit/${junit.version}
-junit.md5 = 68380001b88006ebe49be50cef5bb23a
+junit.md5 = 3c42be5ea7cbf3635716abbb429cb90d
logkit.version = 2.0
logkit.jar = logkit-${logkit.version}.jar
@@ -223,10 +223,10 @@ mongo-java-driver.jar = mongo-java-d
mongo-java-driver.loc = ${maven2.repo}/org/mongodb/mongo-java-driver/${mongo-java-driver.version}
mongo-java-driver.md5 = 3b45f7166ad96adb91dfd9bf044f3071
-slf4j-api.version = 1.7.2
+slf4j-api.version = 1.7.5
slf4j-api.jar = slf4j-api-${slf4j-api.version}.jar
slf4j-api.loc = ${maven2.repo}/org/slf4j/slf4j-api/${slf4j-api.version}
-slf4j-api.md5 = 21216c2ee1bf4f097a51e49418527100
+slf4j-api.md5 = 3b1ececad9ebc3fbad2953ccf4a070ca
soap.version = 2.3.1
soap.jar = soap-${soap.version}.jar
@@ -250,10 +250,10 @@ tika-parsers.loc = ${maven2.r
tika-parsers.md5 = 473ec7a22ef1c4bf00dd0ee4ff7f4526
# XStream can be found at: http://xstream.codehaus.org/
-xstream.version = 1.4.2
+xstream.version = 1.4.4
xstream.jar = xstream-${xstream.version}.jar
xstream.loc = ${maven2.repo}/com/thoughtworks/xstream/xstream/${xstream.version}
-xstream.md5 = 23947B036DD0D9CD23CB2F388C373181
+xstream.md5 = 4b2a6d156777975a7d15fe53a1c37fe7
# XMLPull is required by XStream 1.4.x
xmlpull.version = 1.1.3.1
@@ -293,10 +293,10 @@ xml-apis.loc = ${maven2.r
xml-apis.md5 = 9AE9C29E4497FC35A3EADE1E6DD0BBEB
# Codecs were previously provided by Batik
-xmlgraphics-commons.version = 1.3.1
+xmlgraphics-commons.version = 1.5
xmlgraphics-commons.jar = xmlgraphics-commons-${xmlgraphics-commons.version}.jar
xmlgraphics-commons.loc = ${maven2.repo}/org/apache/xmlgraphics/xmlgraphics-commons/${xmlgraphics-commons.version}
-xmlgraphics-commons.md5 = E63589601D939739349A50A029DAB120
+xmlgraphics-commons.md5 = 86090bc1cfbb6c7bb0efee2d6c6fd7b6
# JavaMail jars (N.B. these are available under CDDL)
activation.version = 1.1.1
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1480444&r1=1480443&r2=1480444&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Wed May 8 20:39:12 2013
@@ -45,15 +45,15 @@
<classpathentry kind="lib" path="lib/avalon-framework-4.1.4.jar"/>
<classpathentry kind="lib" path="lib/bsf-2.4.0.jar"/>
<classpathentry kind="lib" path="lib/bsh-2.0b5.jar"/>
- <classpathentry kind="lib" path="lib/commons-codec-1.6.jar"/>
+ <classpathentry kind="lib" path="lib/commons-codec-1.8.jar"/>
<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-io-2.2.jar"/>
+ <classpathentry kind="lib" path="lib/commons-io-2.4.jar"/>
<classpathentry kind="lib" path="lib/commons-jexl-1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-jexl-2.1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-lang3-3.1.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-1.1.2.jar"/>
- <classpathentry kind="lib" path="lib/commons-net-3.1.jar"/>
+ <classpathentry kind="lib" path="lib/commons-net-3.2.jar"/>
<classpathentry kind="lib" path="lib/excalibur-datasource-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/excalibur-instrument-1.0.jar"/>
<classpathentry kind="lib" path="lib/excalibur-logger-1.1.jar"/>
@@ -65,29 +65,29 @@
<classpathentry kind="lib" path="lib/httpcore-4.2.4.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.2.5.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/jdom-1.1.3.jar"/>
<classpathentry kind="lib" path="lib/rhino-1.7R4.jar"/>
- <classpathentry kind="lib" path="lib/jodd-core-3.4.1.jar"/>
- <classpathentry kind="lib" path="lib/jodd-lagarto-3.4.1.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-core-3.4.3.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-lagarto-3.4.3.jar"/>
<classpathentry kind="lib" path="lib/jsoup-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
- <classpathentry kind="lib" path="lib/junit-4.10.jar"/>
+ <classpathentry kind="lib" path="lib/junit-4.11.jar"/>
<classpathentry kind="lib" path="lib/logkit-2.0.jar"/>
<classpathentry kind="lib" path="lib/mail-1.4.4.jar"/>
<classpathentry kind="lib" path="lib/mongo-java-driver-2.11.1.jar"/>
<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>
<classpathentry kind="lib" path="lib/serializer-2.7.1.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
<classpathentry kind="lib" path="lib/soap-2.3.1.jar"/>
<classpathentry kind="lib" path="lib/tika-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/tika-parsers-1.3.jar"/>
<classpathentry kind="lib" path="lib/xalan-2.7.1.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl-2.9.1.jar"/>
<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
- <classpathentry kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>
+ <classpathentry kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
<classpathentry kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
<classpathentry kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="lib" path="lib/xstream-1.4.2.jar"/>
+ <classpathentry kind="lib" path="lib/xstream-1.4.4.jar"/>
<!-- Needed for build and test -->
<classpathentry kind="lib" path="lib/api/bcmail-jdk15on-1.48.jar"/>
<classpathentry kind="lib" path="lib/api/bcprov-jdk15on-1.48.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May 8 20:39:12 2013
@@ -5,16 +5,16 @@ avalon-framework-4.1.4.jar
bsf-2.4.0.jar
bsh-2.0b5.jar
bshclient.jar
-commons-codec-1.6.jar
+commons-codec-1.8.jar
commons-collections-3.2.1.jar
commons-httpclient-3.1.jar
-commons-io-2.2.jar
+commons-io-2.4.jar
commons-jexl-1.1.jar
commons-jexl-2.1.1.jar
commons-lang-2.6.jar
commons-lang3-3.1.jar
commons-logging-1.1.2.jar
-commons-net-3.1.jar
+commons-net-3.2.jar
excalibur-datasource-1.1.1.jar
excalibur-instrument-1.0.jar
excalibur-logger-1.1.jar
@@ -26,28 +26,28 @@ httpclient-4.2.5.jar
httpcore-4.2.4.jar
httpmime-4.2.5.jar
jcharts-0.7.5.jar
-jdom-1.1.2.jar
+jdom-1.1.3.jar
jms*.jar
-jodd-core-3.4.1.jar
-jodd-lagarto-3.4.1.jar
+jodd-core-3.4.3.jar
+jodd-lagarto-3.4.3.jar
jorphan.jar
jsoup-1.7.2.jar
jtidy-r*.jar
-junit-4.10.jar
+junit-4.11.jar
logkit-2.0.jar
mail-1.4.4.jar
mongo-java-driver-2.11.1.jar
oro-2.0.8.jar
rhino-1.7R4.jar
serializer-2.7.1.jar
-slf4j-api-1.7.2.jar
+slf4j-api-1.7.5.jar
soap-2.3.1.jar
xalan-2.7.1.jar
xercesImpl-2.9.1.jar
xml-apis-1.3.04.jar
-xmlgraphics-commons-1.3.1.jar
+xmlgraphics-commons-1.5.jar
xmlpull-1.1.3.1.jar
xpp3_min-1.1.4c.jar
-xstream-1.4.2.jar
+xstream-1.4.4.jar
tika-core-1.3.jar
tika-parsers-1.3.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1480444&r1=1480443&r2=1480444&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Wed May 8 20:39:12 2013
@@ -28,7 +28,7 @@ bsh-2.0b5.jar (org.bsh)
-------------
- BeanShell test elements
-commons-codec-1.6
+commons-codec-1.8
-----------------
http://commons.apache.org/downloads/download_codec.cgi
- used by commons-httpclient-3.1
@@ -46,7 +46,7 @@ http://hc.apache.org/downloads.cgi
- httpclient version of HTTP sampler
- Cookie manager implementation
-commons-io-2.2
+commons-io-2.4
--------------
http://commons.apache.org/downloads/download_io.cgi
- FTPSampler
@@ -66,12 +66,12 @@ commons-lang3-3.1
http://commons.apache.org/downloads/download_lang.cgi
- URLCollection (unescapeXml)
-commons-logging-1.1.1
+commons-logging-1.1.2
---------------------
http://commons.apache.org/downloads/download_logging.cgi
- httpclient
-commons-net-3.1
+commons-net-3.2
-----------------
http://commons.apache.org/downloads/download_net.cgi
- FTPSampler
@@ -103,18 +103,18 @@ jCharts-0.7.5 (org.jCharts)
http://jcharts.sourceforge.net/downloads.html
- AxisGraph,LineGraph,LineChart
-jdom-1.1.2
+jdom-1.1.3
--------
http://www.jdom.org/downloads/index.html
- XMLAssertion, JMeterTest ONLY
- Anakia
-jodd-core-3.4.1
+jodd-core-3.4.3
--------
http://www.jodd.org/
- CSS/JQuery like extractor dependency
-jodd-lagarto-3.4.1
+jodd-lagarto-3.4.3
--------
http://jodd.org/doc/csselly/
- CSS/JQuery like extractor
@@ -136,7 +136,7 @@ jTidy-r938
- org.xml.sax - various
- XPathUtil (XPath assertion)
-junit 4.10
+junit 4.11
-----------
- unit tests, JUnit sampler
@@ -165,7 +165,7 @@ serialiser-2.7.1
http://www.apache.org/dyn/closer.cgi/xml/xalan-j
- xalan
-slf4j-api-1.7.2
+slf4j-api-1.7.5
----------------
http://www.slf4j.org/
- jodd-core
@@ -204,7 +204,7 @@ http://xerces.apache.org/xerces2-j/downl
The x* jars above are used for XML handling
-xmlgraphics-commons-1.3.1 (org.apache.xmlgraphics.image.codec)
+xmlgraphics-commons-1.5 (org.apache.xmlgraphics.image.codec)
------------------
http://xmlgraphics.apache.org/commons/download.html
- SaveGraphicsService
@@ -222,7 +222,7 @@ or
http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/
- xstream
-xstream-1.4.2
+xstream-1.4.4
-------------
http://xstream.codehaus.org/download.html
- SaveService
\ No newline at end of file
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1480444&r1=1480443&r2=1480444&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Wed May 8 20:39:12 2013
@@ -59,15 +59,15 @@ under the License.
<bcmail.version>1.48</bcmail.version>
<bcprov.version>1.48</bcprov.version>
<bcpkix.version>1.48</bcpkix.version>
- <commons-codec.version>1.6</commons-codec.version>
+ <commons-codec.version>1.8</commons-codec.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
- <commons-io.version>2.2</commons-io.version>
+ <commons-io.version>2.4</commons-io.version>
<commons-jexl.version>1.1</commons-jexl.version>
<commons-jexl2.version>2.1.1</commons-jexl2.version>
<commons-lang3.version>3.1</commons-lang3.version>
<commons-logging.version>1.1.2</commons-logging.version>
- <commons-net.version>3.1</commons-net.version>
+ <commons-net.version>3.2</commons-net.version>
<excalibur-datasource.version>1.1.1</excalibur-datasource.version>
<excalibur-instrument.version>1.0</excalibur-instrument.version>
<excalibur-logger.version>1.1</excalibur-logger.version>
@@ -77,26 +77,26 @@ under the License.
<httpcore.version>4.2.4</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>
- <jodd.version>3.4.1</jodd.version>
+ <jdom.version>1.1.3</jdom.version>
+ <jodd.version>3.4.3</jodd.version>
<jsoup.version>1.7.2</jsoup.version>
<js_rhino.version>1.7R4</js_rhino.version>
- <junit.version>4.10</junit.version>
+ <junit.version>4.11</junit.version>
<logkit.version>2.0</logkit.version>
<mongo-java-driver.version>2.11.1</mongo-java-driver.version>
- <slf4j.version>1.7.2</slf4j.version>
+ <slf4j.version>1.7.5</slf4j.version>
<soap.version>2.3.1</soap.version>
<tidy.version>r938</tidy.version>
<tika-core.version>1.3</tika-core.version>
<tika-parsers.version>1.3</tika-parsers.version>
<xmlpull.version>1.1.3.1</xmlpull.version>
- <xstream.version>1.4.2</xstream.version>
+ <xstream.version>1.4.4</xstream.version>
<xpp3.version>1.1.4c</xpp3.version>
<xalan.version>2.7.1</xalan.version>
<serializer.version>2.7.1</serializer.version>
<xerces.version>2.9.1</xerces.version>
<xml-apis.version>1.3.04</xml-apis.version>
- <xmlgraphics-commons.version>1.3.1</xmlgraphics-commons.version>
+ <xmlgraphics-commons.version>1.5</xmlgraphics-commons.version>
<activation.version>1.1.1</activation.version>
<javamail.version>1.4.4</javamail.version>
<jms.version>1.1.1</jms.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1480444&r1=1480443&r2=1480444&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed May 8 20:39:12 2013
@@ -207,6 +207,15 @@ It was therefore necessary to change the
<li>Updated to commons-logging 1.1.2 (from 1.1.1)</li>
<li>Updated to HttpComponents Client 4.2.5 (from 4.2.3)</li>
<li>Updated to HttpComponents Core 4.2.4 (from 4.2.3)</li>
+<li>Updated to commons-codec 1.8 (from 1.6)</li>
+<li>Updated to commons-io 2.4 (from 2.2)</li>
+<li>Updated to commons-net 3.2 (from 3.1)</li>
+<li>Updated to jdom-1.1.3 (from 1.1.2)</li>
+<li>Updated to jodd-lagarto and jodd-core 3.4.3 (from 3.4.1)</li>
+<li>Updated to junit 4.11 (from 4.10)</li>
+<li>Updated to slf4j-api 1.7.5 (from 1.7.2)</li>
+<li>Updated to xmlgraphics-commons 1.5 (from 1.3.1)</li>
+<li>Updated to xstream 1.4.4 (from 1.4.2)</li>
<li><bugzilla>54912</bugzilla> - JMeterTreeListener should use constants</li>
</ul>