Author: pmouawad
Date: Wed Nov 28 22:12:14 2012
New Revision: 1414963
URL: http://svn.apache.org/viewvc?rev=1414963&view=rev
Log:
Bug 54199 - Move to Java 6
No more need for bsf-api (apache-jsr223-api) as it's in JDK
Bugzilla Id: 54199
Modified:
jmeter/trunk/build.properties
jmeter/trunk/build.xml
jmeter/trunk/eclipse.classpath
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1414963&r1=1414962&r2=1414963&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Wed Nov 28 22:12:14 2012
@@ -46,11 +46,6 @@ apache-bsf.jar = bsf-${apac
apache-bsf.loc = ${maven2.repo}/bsf/bsf/${apache-bsf.version}
apache-bsf.md5 = 16e82d858c648962fb5c959f21959039
-apache-jsr223-api.version = 3.1
-apache-jsr223-api.jar = bsf-api-${apache-jsr223-api.version}.jar
-apache-jsr223-api.loc =
${maven2.repo}/org/apache/bsf/bsf-api/${apache-jsr223-api.version}
-apache-jsr223-api.md5 = 147c6cb39f889f640036f096f8a4bf59
-
avalon-framework.version = 4.1.4
avalon-framework.jar = avalon-framework-${avalon-framework.version}.jar
avalon-framework.loc =
${maven2.repo}/avalon-framework/avalon-framework/${avalon-framework.version}
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1414963&r1=1414962&r2=1414963&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Wed Nov 28 22:12:14 2012
@@ -349,7 +349,6 @@
<patternset id="external.jars">
<include name="${lib.dir}/${activation.jar}"/>
<include name="${lib.dir}/${apache-bsf.jar}"/>
- <include name="${lib.dir}/${apache-jsr223-api.jar}"/>
<include name="${lib.dir}/${avalon-framework.jar}"/>
<include name="${lib.dir}/${beanshell.jar}"/>
<include name="${lib.dir}/${commons-codec.jar}"/>
@@ -414,7 +413,6 @@
<!-- Externally produced jars -->
<pathelement location="${lib.dir}/${activation.jar}"/>
<pathelement location="${lib.dir}/${apache-bsf.jar}"/>
- <pathelement location="${lib.dir}/${apache-jsr223-api.jar}"/>
<pathelement location="${lib.dir}/${avalon-framework.jar}"/>
<pathelement location="${lib.dir}/${beanshell.jar}"/>
<pathelement location="${lib.dir}/${commons-codec.jar}"/>
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1414963&r1=1414962&r2=1414963&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Wed Nov 28 22:12:14 2012
@@ -44,7 +44,6 @@
<classpathentry kind="lib" path="lib/activation-1.1.1.jar"/>
<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/bsf-api-3.1.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-collections-3.2.1.jar"/>
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1414963&r1=1414962&r2=1414963&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Wed Nov 28 22:12:14 2012
@@ -103,11 +103,6 @@ under the License.
<version>${apache-bsf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.bsf</groupId>
- <artifactId>bsf-api</artifactId>
- <version>${apache-jsr223-api.version}</version>
- </dependency>
- <dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
<version>${avalon-framework.version}</version>
