Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 61618 - Upgrade Beanshell to 2.0b6
Bugzilla Id: 61618

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1812231 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
pmouawad committed Oct 15, 2017
1 parent b66817b commit a61f236
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 198 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Expand Up @@ -210,6 +210,7 @@ The following software is provided under the Apache License V 2.0 (as above):
- Software produced at the ASF:

* apache-bsf-2.4.0.jar
* beanshell-2.0b6.jar
* commons-codec-1.10.jar
* commons-collections-3.2.2.jar
* commons-dbcp2-2.1.1.jar
Expand Down Expand Up @@ -257,7 +258,6 @@ The following software is provided under the Apache License V 2.0 (as above):
For details, please see the files under: licenses/bin

* asm-5.2.jar (BSD)
* beanshell-2.0b5.jar (SPL)
* dnsjava-2.1.8.jar (BSD)
* hamcrest-core-1.3.jar (BSD)
* javamail-1.5.0-b01.jar (CDDL Version 1.0)
Expand Down
6 changes: 3 additions & 3 deletions build.properties
Expand Up @@ -57,10 +57,10 @@ asm.jar = asm-${asm.version}.jar
asm.loc = ${maven2.repo}/org/ow2/asm/asm/${asm.version}
asm.md5 = 8bb8efe7c0f8488c4a2d6297066632aa

beanshell.version = 2.0b5
beanshell.version = 2.0b6
beanshell.jar = bsh-${beanshell.version}.jar
beanshell.loc = ${maven2.repo}/org/beanshell/bsh/${beanshell.version}
beanshell.md5 = 02F72336919D06A8491E82346E10B4D5
beanshell.loc = ${maven2.repo}/org/apache-extras/beanshell/bsh/${beanshell.version}
beanshell.md5 = 0f27117d5b4cfeea1d0634125313fac0

# Bouncy Castle jars (compile and test only - not distributed)
# Currently only needed for SMIMEAssertion
Expand Down
2 changes: 1 addition & 1 deletion build.xml
Expand Up @@ -3233,7 +3233,7 @@ run JMeter unless all the JMeter jars are added.
<delete verbose="true">
<!-- bcprov jars no longer have the same prefix so the wildcard delete does not work; drop any old ones -->
<fileset dir="${lib.api}" includes="bcmail-jdk15-*.jar bcprov-jdk15-*.jar"/>
<fileset dir="${lib.dir}" includes="ApacheJMeter_slf4j_logkit.jar" />
<fileset dir="${lib.dir}" includes="ApacheJMeter_slf4j_logkit.jar bsh-2.0b5.jar" />
<!-- tidy up unused Excalibur jars -->
<fileset dir="${lib.dir}" includes="avalon-framework-4.1.4.jar excalibur-datasource-2.1.jar excalibur-instrument-1.0.jar excalibur-logger-1.1.jar excalibur-pool-api-2.1.jar excalibur-pool-impl-2.1.jar excalibur-pool-instrumented-2.1.jar"/>
<!-- jdom jar has moved; drop the old one -->
Expand Down
2 changes: 1 addition & 1 deletion eclipse.classpath
Expand Up @@ -48,7 +48,7 @@
<classpathentry kind="lib" path="lib/accessors-smart-1.2.jar"/>
<classpathentry kind="lib" path="lib/asm-5.2.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/bsh-2.0b6.jar"/>
<classpathentry kind="lib" path="lib/caffeine-2.5.5.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.10.jar"/>
<classpathentry kind="lib" path="lib/commons-collections-3.2.2.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/aareadme.txt
Expand Up @@ -26,7 +26,7 @@ bsf-2.4.0.jar (org.apache.bsf)
http://jakarta.apache.org/site/downloads/downloads_bsf.cgi
- BSF test elements (sampler etc.)

bsh-2.0b5.jar (org.bsh)
bsh-2.0b6.jar (org.bsh)
-------------
- BeanShell test elements

Expand Down
189 changes: 0 additions & 189 deletions licenses/bin/beanshell-2.0b5.txt

This file was deleted.

4 changes: 2 additions & 2 deletions res/maven/ApacheJMeter_parent.pom
Expand Up @@ -55,7 +55,7 @@ under the License.
<accessors-smart.version>1.2</accessors-smart.version>
<apache-bsf.version>2.4.0</apache-bsf.version>
<asm.version>5.2</asm.version>
<beanshell.version>2.0b5</beanshell.version>
<beanshell.version>2.0b6</beanshell.version>
<bcmail.version>1.49</bcmail.version>
<bcprov.version>1.49</bcprov.version>
<bcpkix.version>1.49</bcpkix.version>
Expand Down Expand Up @@ -135,7 +135,7 @@ under the License.
<version>${apache-bsf.version}</version>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>
<groupId>org.apache-extras.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>${beanshell.version}</version>
</dependency>
Expand Down
1 change: 1 addition & 0 deletions xdocs/changes.xml
Expand Up @@ -124,6 +124,7 @@ Summary

<ch_section>Non-functional changes</ch_section>
<ul>
<li>Updated to bsh-2.0b6 (from bsh-2.0b5)</li>
</ul>

<!-- =================== Bug fixes =================== -->
Expand Down

0 comments on commit a61f236

Please sign in to comment.