jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1812231 - in /jmeter/trunk: LICENSE build.properties build.xml eclipse.classpath lib/ lib/aareadme.txt licenses/bin/beanshell-2.0b5.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Date Sun, 15 Oct 2017 20:10:42 GMT
Author: pmouawad
Date: Sun Oct 15 20:10:42 2017
New Revision: 1812231

URL: http://svn.apache.org/viewvc?rev=1812231&view=rev
Log:
Bug 61618 - Upgrade Beanshell to 2.0b6
Bugzilla Id: 61618

Removed:
    jmeter/trunk/licenses/bin/beanshell-2.0b5.txt
Modified:
    jmeter/trunk/LICENSE
    jmeter/trunk/build.properties
    jmeter/trunk/build.xml
    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=1812231&r1=1812230&r2=1812231&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Oct 15 20:10:42 2017
@@ -210,6 +210,7 @@ The following software is provided under
 - 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
@@ -257,7 +258,6 @@ The following software is provided under
 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)

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1812231&r1=1812230&r2=1812231&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Oct 15 20:10:42 2017
@@ -57,10 +57,10 @@ asm.jar                     = asm-${asm.
 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

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1812231&r1=1812230&r2=1812231&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Oct 15 20:10:42 2017
@@ -3233,7 +3233,7 @@ run JMeter unless all the JMeter jars ar
     <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 -->

Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1812231&r1=1812230&r2=1812231&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Oct 15 20:10:42 2017
@@ -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"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Oct 15 20:10:42 2017
@@ -4,7 +4,7 @@ accessors-smart-1.2.jar
 ApacheJMeter_slf4j_logkit.jar
 asm-5.2.jar
 bsf-2.4.0.jar
-bsh-2.0b5.jar
+bsh-2.0b6.jar
 bshclient.jar
 caffeine-2.5.5.jar
 commons-codec-1.10.jar

Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1812231&r1=1812230&r2=1812231&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Oct 15 20:10:42 2017
@@ -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
 

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1812231&r1=1812230&r2=1812231&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Oct 15 20:10:42 2017
@@ -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>
@@ -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>

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1812231&r1=1812230&r2=1812231&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Oct 15 20:10:42 2017
@@ -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 =================== -->



Mime
View raw message