Author: pmouawad
Date: Sun Mar 11 21:11:13 2018
New Revision: 1826465
URL: http://svn.apache.org/viewvc?rev=1826465&view=rev
Log:
Upgrade to asm 6.1 from 6.0
Modified:
jmeter/trunk/LICENSE
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/LICENSE
URL:
http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1826465&r1=1826464&r2=1826465&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Mar 11 21:11:13 2018
@@ -261,7 +261,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.0.jar (BSD)
+* asm-6.1.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=1826465&r1=1826464&r2=1826465&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Mar 11 21:11:13 2018
@@ -52,10 +52,10 @@ apache-bsf.jar = bsf-${apac
apache-bsf.loc = ${maven2.repo}/bsf/bsf/${apache-bsf.version}
apache-bsf.md5 = 16e82d858c648962fb5c959f21959039
-asm.version = 6.0
+asm.version = 6.1
asm.jar = asm-${asm.version}.jar
asm.loc = ${maven2.repo}/org/ow2/asm/asm/${asm.version}
-asm.md5 = 305b31315dbca9c3cddac687b4a0e04c
+asm.md5 = 9c0d6d49f51c2ed0d916acef4ba45d0d
beanshell.version = 2.0b6
beanshell.jar = bsh-${beanshell.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1826465&r1=1826464&r2=1826465&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Mar 11 21:11:13 2018
@@ -46,7 +46,7 @@
<classpathentry kind="src" output="build/protocol/tcp"
path="src/protocol/tcp"/>
<classpathentry kind="src" output="build/test" path="test/src"/>
<classpathentry kind="lib" path="lib/accessors-smart-1.2.jar"/>
- <classpathentry kind="lib" path="lib/asm-6.0.jar"/>
+ <classpathentry kind="lib" path="lib/asm-6.1.jar"/>
<classpathentry kind="lib" path="lib/bsf-2.4.0.jar"/>
<classpathentry kind="lib" path="lib/bsh-2.0b6.jar"/>
<classpathentry kind="lib" path="lib/caffeine-2.6.1.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Mar 11 21:11:13 2018
@@ -2,7 +2,7 @@ ext
src
accessors-smart-1.2.jar
ApacheJMeter_slf4j_logkit.jar
-asm-6.0.jar
+asm-6.1.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=1826465&r1=1826464&r2=1826465&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Mar 11 21:11:13 2018
@@ -13,7 +13,7 @@ Which jars are used by which modules?
====================================
[not exhaustive]
-asm-6.0 (org.ow2.asm)
+asm-6.1 (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=1826465&r1=1826464&r2=1826465&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Mar 11 21:11:13 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.0</asm.version>
+ <asm.version>6.1</asm.version>
<beanshell.version>2.0b6</beanshell.version>
<bcmail.version>1.59</bcmail.version>
<bcprov.version>1.59</bcprov.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1826465&r1=1826464&r2=1826465&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Mar 11 21:11:13 2018
@@ -133,6 +133,7 @@ this behaviour, set <code>httpclient.res
<li><bug>62113</bug>Updated to latest Bouncycastle (v1.59). Based on
contribution by Olaf Flebbe (oflebbe at apache.org)</li>
<li><bug>62171</bug>Remove .md5 checksums and keep only .sha512 checksums
for source and binary archives</li>
<li>Updated to groovy-all-2.4.14 (from groovy-all-2.4.13)</li>
+ <li>Updated to asm-6.1 (from 6.1)</li>
</ul>
<!-- =================== Bug fixes =================== -->
