Author: pmouawad
Date: Sun Dec 23 22:23:32 2018
New Revision: 1849665
URL: http://svn.apache.org/viewvc?rev=1849665&view=rev
Log:
Updated to asm-7.0 (from 6.1)
Added:
jmeter/trunk/licenses/bin/asm-7.0.txt
- copied unchanged from r1846685, jmeter/trunk/licenses/bin/asm-6.1.txt
Removed:
jmeter/trunk/licenses/bin/asm-6.1.txt
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/build.properties
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/changes_history.xml
Modified: jmeter/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1849665&r1=1849664&r2=1849665&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Dec 23 22:23:32 2018
@@ -262,7 +262,7 @@ The following software is provided under
- Software produced outside the ASF which is available under other licenses
(not AL 2.0):
For details, please see the files under: licenses/bin
-* asm-6.1.jar (BSD)
+* asm-7.0.jar (BSD)
* dnsjava-2.1.8.jar (BSD)
* hamcrest-core-1.3.jar (BSD)
* javamail-1.5.0-b01.jar (CDDL Version 1.0)
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1849665&r1=1849664&r2=1849665&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Dec 23 22:23:32 2018
@@ -52,10 +52,10 @@ apache-bsf.jar = bsf-${apac
apache-bsf.loc = ${maven2.repo}/bsf/bsf/${apache-bsf.version}
apache-bsf.sha512 =
CF2FF6EA53CD13EA842CAD398F1BE24539BEC68A5CBBD088492ADAB50BC782CDE6D9F4C0B6A24DEAEEE537809C90631C43F9A680FF2826C28CCF1B39380954E3
-asm.version = 6.1
+asm.version = 7.0
asm.jar = asm-${asm.version}.jar
asm.loc = ${maven2.repo}/org/ow2/asm/asm/${asm.version}
-asm.sha512 =
5AAB6C9CC5D60BE870D36A2B11DE5921B06E148DF26DD84794D6000B9F48520C8D71494E71E40E11D6B1B5435E548D572D7BF5AF9E66C3ED8F1466CC69B32BCC
+asm.sha512 =
B31699F50485DDC4E84466064CF5789A3E61BAFBEC53C4B9CB19FFEF07B36722D3EFDCA8722884FD6D6DEDACA65DB4DD6F71CD886BBA599E8A77971955167A60
beanshell.version = 2.0b6
beanshell.jar = bsh-${beanshell.version}.jar
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 23 22:23:32 2018
@@ -2,7 +2,7 @@ ext
src
accessors-smart-1.2.jar
ApacheJMeter_slf4j_logkit.jar
-asm-6.1.jar
+asm-7.0.jar
bsf-2.4.0.jar
bsh-2.0b6.jar
bshclient.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1849665&r1=1849664&r2=1849665&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Dec 23 22:23:32 2018
@@ -13,7 +13,7 @@ Which jars are used by which modules?
====================================
[not exhaustive]
-asm-6.1 (org.ow2.asm)
+asm-7.0 (org.ow2.asm)
----------------------
- JSON Path extractor
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1849665&r1=1849664&r2=1849665&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Dec 23 22:23:32 2018
@@ -54,7 +54,7 @@ under the License.
<!-- these must agree with the definitions in build.properties -->
<accessors-smart.version>1.2</accessors-smart.version>
<apache-bsf.version>2.4.0</apache-bsf.version>
- <asm.version>6.1</asm.version>
+ <asm.version>7.0</asm.version>
<beanshell.version>2.0b6</beanshell.version>
<bcmail.version>1.60</bcmail.version>
<bcprov.version>1.60</bcprov.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1849665&r1=1849664&r2=1849665&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Dec 23 22:23:32 2018
@@ -146,6 +146,7 @@ of previous time slot as a base. Startin
<li>Updated to Saxon-HE 9.8.0-14 (from 9.8.0-12)</li>
<li>Updated to xstream 1.4.11 (from 1.4.10)</li>
<li>Updated to jodd 5.0.6 (from 4.1.4)</li>
+ <li>Updated to asm-7.0 (from 6.1)</li>
<li><bug>62818</bug>Updated to xercesImpl to 2.12.0 (from 2.11.0).
Reported by Stefan Seide (stefan at trilobyte-se.de)</li>
<li><bug>62821</bug><pr>405</pr>Use SHA-512 checksums instead of MD5 to
verify jar downloads</li>
<li><pr>408</pr>Log an informational message instead of an stack trace,
when JavaFX is not found for the <code>RenderInBrowser</code> component.</li>
Modified: jmeter/trunk/xdocs/changes_history.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes_history.xml?rev=1849665&r1=1849664&r2=1849665&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes_history.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes_history.xml [utf-8] Sun Dec 23 22:23:32 2018
@@ -227,7 +227,7 @@ this behaviour, set <code>httpclient.res
<li><bug>62113</bug>Updated to latest Bouncycastle (v1.60). Based on
contribution by Olaf Flebbe (oflebbe at apache.org)</li>
<li><bug>62171</bug>Remove <code>.md5</code> checksums and keep only
<code>.sha512</code> checksums for source and binary archives</li>
<li>Updated to groovy-all-2.4.15 (from groovy-all-2.4.13)</li>
- <li>Updated to asm-6.1 (from 6.1)</li>
+ <li>Updated to asm-6.1 (from 6.0)</li>
<li>Updated to tika-core and tika-parsers 1.18 (from 1.17)</li>
<li><bug>62482</bug>Sync documentation to the implementation of the
ForEachController. Based on contribution by Ori Marko (orimarko at
gmail.com)</li>
<li><bug>62529</bug>Updated to httpclient-4.5.6 (from httpclient 4.5.5)
and updated to freemarker-2.3.28 (from freemarker-2.3.23). Based on patch by
Ori Marko (orimarko at gmail.com)</li>
