You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2012/02/05 14:17:59 UTC
svn commit: r1240719 - in /jmeter/trunk: build.properties eclipse.classpath
lib/aareadme.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Author: pmouawad
Date: Sun Feb 5 13:17:58 2012
New Revision: 1240719
URL: http://svn.apache.org/viewvc?rev=1240719&view=rev
Log:
Upgrade from js-1.7R2.jar to rhino-1.7R3.jar
Modified:
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1240719&r1=1240718&r2=1240719&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Feb 5 13:17:58 2012
@@ -173,10 +173,10 @@ jdom.jar = jdom-${jdo
jdom.loc = ${maven2.repo}/org/jdom/jdom/${jdom.version}
jdom.md5 = 742bb15c2eda90dff56e3d82cf40cd13
-js_rhino.version = 1.7R2
-js_rhino.jar = js-${js_rhino.version}.jar
-js_rhino.loc = ${maven2.repo}/rhino/js/${js_rhino.version}
-js_rhino.md5 = a4166cafe6e5d37c363b6795ee92c92c
+js_rhino.version = 1.7R3
+js_rhino.jar = rhino-${js_rhino.version}.jar
+js_rhino.loc = ${maven2.repo}/org/mozilla/rhino/${js_rhino.version}
+js_rhino.md5 = 9dbdb24663f20db43a2c29467c13a204
junit.version = 4.10
junit.jar = junit-${junit.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1240719&r1=1240718&r2=1240719&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Feb 5 13:17:58 2012
@@ -66,7 +66,7 @@
<classpathentry kind="lib" path="lib/httpmime-4.1.2.jar"/>
<classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
<classpathentry kind="lib" path="lib/jdom-1.1.2.jar"/>
- <classpathentry kind="lib" path="lib/js-1.7R2.jar"/>
+ <classpathentry kind="lib" path="lib/rhino-1.7R3.jar"/>
<classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
<classpathentry kind="lib" path="lib/logkit-2.0.jar"/>
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1240719&r1=1240718&r2=1240719&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Feb 5 13:17:58 2012
@@ -104,7 +104,7 @@ http://www.jdom.org/downloads/index.html
- XMLAssertion, JMeterTest ONLY
- Anakia
-js-1.7R2
+rhino-1.7R3
--------
http://www.mozilla.org/rhino/download.html
- javascript function
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1240719&r1=1240718&r2=1240719&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Feb 5 13:17:58 2012
@@ -77,7 +77,7 @@ under the License.
<jakarta-oro.version>2.0.8</jakarta-oro.version>
<jcharts.version>0.7.5</jcharts.version>
<jdom.version>1.1.2</jdom.version>
- <js_rhino.version>1.7R2</js_rhino.version>
+ <js_rhino.version>1.7R3</js_rhino.version>
<junit.version>4.10</junit.version>
<logkit.version>2.0</logkit.version>
<soap.version>2.3.1</soap.version>
@@ -239,8 +239,8 @@ under the License.
</exclusions>
</dependency>
<dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
+ <groupId>org.mozilla</groupId>
+ <artifactId>rhino</artifactId>
<version>${js_rhino.version}</version>
</dependency>
<dependency>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1240719&r1=1240718&r2=1240719&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Feb 5 13:17:58 2012
@@ -140,6 +140,7 @@ or a Debug Sampler with all fields set t
<h2>Non-functional changes</h2>
<ul>
+<li>Upgraded to rhino 1.7R3 (was js-1.7R2.jar)</li>
</ul>
</section>
Re: svn commit: r1240719 - in /jmeter/trunk: build.properties
eclipse.classpath lib/aareadme.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Posted by sebb <se...@gmail.com>.
On 5 February 2012 13:59, Philippe Mouawad <ph...@gmail.com> wrote:
> Maybe we can add some not in Incompatible changes to warn users.
Yes, good idea, so long as we make it clear it may only affect Maven users.
> Usually when this happens, a pom.xml is put in rhino.js to redirect to new
> one, but I didn't find it.
Unfortunately, redirections just don't work in general.
AFAICT there's no guarantee that Maven will ever read the pom
containing the redirect.
It is only applied to one original pom, which may not be referenced by
the build (e.g. if it references an earlier version, before the
redirect was added).
Also, Maven Central don't allow poms to be updated once deployed.
There's no guarantee that downstream users will see the updates anyway.
Had they added the facility to the new pom - i.e.added a replaces
attribute: "this coordinate replaces that old coord" - then it would
be possible to make it work reliably. But AFAICT that cannot now be
added without updating all Maven client installations ...
IMO there's no way to fix the problem.
So - Maven co-ordinates need to be chosen with care, and can be
changed if and only if the package name is changed.
> Regards
> Philippe
>
> On Sun, Feb 5, 2012 at 2:53 PM, sebb <se...@gmail.com> wrote:
>
>> On 5 February 2012 13:17, <pm...@apache.org> wrote:
>> > Author: pmouawad
>> > Date: Sun Feb 5 13:17:58 2012
>> > New Revision: 1240719
>> >
>> > URL: http://svn.apache.org/viewvc?rev=1240719&view=rev
>> > Log:
>> > Upgrade from js-1.7R2.jar to rhino-1.7R3.jar
>>
>> Rather odd - it appears that the Maven co-ordinates have changed from
>>
>> rhino:js
>>
>> to
>>
>> org.mozilla:rhino
>>
>> I don't think this will affect JMeter, but could cause some issues for
>> Maven projects as the package name has not changed.
>>
>> Maven will not realise that 1.7R3 and 1.7R2 are different versions of
>> the same jar.
>> So Maven will allow both to be present on the same classpath; this can
>> cause lots of hard to detect problems.
>>
>> Not a lot we can do about this, except bear it in mind if there are
>> any problems reported.
>>
>> I might try raising an issue with Maven Central.
>>
>> > Modified:
>> > jmeter/trunk/build.properties
>> > jmeter/trunk/eclipse.classpath
>> > jmeter/trunk/lib/aareadme.txt
>> > jmeter/trunk/res/maven/ApacheJMeter_parent.pom
>> > jmeter/trunk/xdocs/changes.xml
>> >
>> > Modified: jmeter/trunk/build.properties
>> > URL:
>> http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1240719&r1=1240718&r2=1240719&view=diff
>> >
>> ==============================================================================
>> > --- jmeter/trunk/build.properties (original)
>> > +++ jmeter/trunk/build.properties Sun Feb 5 13:17:58 2012
>> > @@ -173,10 +173,10 @@ jdom.jar = jdom-${jdo
>> > jdom.loc =
>> ${maven2.repo}/org/jdom/jdom/${jdom.version}
>> > jdom.md5 = 742bb15c2eda90dff56e3d82cf40cd13
>> >
>> > -js_rhino.version = 1.7R2
>> > -js_rhino.jar = js-${js_rhino.version}.jar
>> > -js_rhino.loc =
>> ${maven2.repo}/rhino/js/${js_rhino.version}
>> > -js_rhino.md5 = a4166cafe6e5d37c363b6795ee92c92c
>> > +js_rhino.version = 1.7R3
>> > +js_rhino.jar = rhino-${js_rhino.version}.jar
>> > +js_rhino.loc =
>> ${maven2.repo}/org/mozilla/rhino/${js_rhino.version}
>> > +js_rhino.md5 = 9dbdb24663f20db43a2c29467c13a204
>> >
>> > junit.version = 4.10
>> > junit.jar = junit-${junit.version}.jar
>> >
>> > Modified: jmeter/trunk/eclipse.classpath
>> > URL:
>> http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1240719&r1=1240718&r2=1240719&view=diff
>> >
>> ==============================================================================
>> > --- jmeter/trunk/eclipse.classpath (original)
>> > +++ jmeter/trunk/eclipse.classpath Sun Feb 5 13:17:58 2012
>> > @@ -66,7 +66,7 @@
>> > <classpathentry kind="lib" path="lib/httpmime-4.1.2.jar"/>
>> > <classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
>> > <classpathentry kind="lib" path="lib/jdom-1.1.2.jar"/>
>> > - <classpathentry kind="lib" path="lib/js-1.7R2.jar"/>
>> > + <classpathentry kind="lib" path="lib/rhino-1.7R3.jar"/>
>> > <classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
>> > <classpathentry kind="lib" path="lib/junit-4.10.jar"/>
>> > <classpathentry kind="lib" path="lib/logkit-2.0.jar"/>
>> >
>> > Modified: jmeter/trunk/lib/aareadme.txt
>> > URL:
>> http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1240719&r1=1240718&r2=1240719&view=diff
>> >
>> ==============================================================================
>> > --- jmeter/trunk/lib/aareadme.txt (original)
>> > +++ jmeter/trunk/lib/aareadme.txt Sun Feb 5 13:17:58 2012
>> > @@ -104,7 +104,7 @@ http://www.jdom.org/downloads/index.html
>> > - XMLAssertion, JMeterTest ONLY
>> > - Anakia
>> >
>> > -js-1.7R2
>> > +rhino-1.7R3
>> > --------
>> > http://www.mozilla.org/rhino/download.html
>> > - javascript function
>> >
>> > Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
>> > URL:
>> http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1240719&r1=1240718&r2=1240719&view=diff
>> >
>> ==============================================================================
>> > --- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
>> > +++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Feb 5 13:17:58
>> 2012
>> > @@ -77,7 +77,7 @@ under the License.
>> > <jakarta-oro.version>2.0.8</jakarta-oro.version>
>> > <jcharts.version>0.7.5</jcharts.version>
>> > <jdom.version>1.1.2</jdom.version>
>> > - <js_rhino.version>1.7R2</js_rhino.version>
>> > + <js_rhino.version>1.7R3</js_rhino.version>
>> > <junit.version>4.10</junit.version>
>> > <logkit.version>2.0</logkit.version>
>> > <soap.version>2.3.1</soap.version>
>> > @@ -239,8 +239,8 @@ under the License.
>> > </exclusions>
>> > </dependency>
>> > <dependency>
>> > - <groupId>rhino</groupId>
>> > - <artifactId>js</artifactId>
>> > + <groupId>org.mozilla</groupId>
>> > + <artifactId>rhino</artifactId>
>> > <version>${js_rhino.version}</version>
>> > </dependency>
>> > <dependency>
>> >
>> > Modified: jmeter/trunk/xdocs/changes.xml
>> > URL:
>> http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1240719&r1=1240718&r2=1240719&view=diff
>> >
>> ==============================================================================
>> > --- jmeter/trunk/xdocs/changes.xml (original)
>> > +++ jmeter/trunk/xdocs/changes.xml Sun Feb 5 13:17:58 2012
>> > @@ -140,6 +140,7 @@ or a Debug Sampler with all fields set t
>> >
>> > <h2>Non-functional changes</h2>
>> > <ul>
>> > +<li>Upgraded to rhino 1.7R3 (was js-1.7R2.jar)</li>
>> > </ul>
>> >
>> > </section>
>> >
>> >
>>
>
>
>
> --
> Cordialement.
> Philippe Mouawad.
Re: svn commit: r1240719 - in /jmeter/trunk: build.properties
eclipse.classpath lib/aareadme.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Posted by Philippe Mouawad <ph...@gmail.com>.
Maybe we can add some not in Incompatible changes to warn users.
Usually when this happens, a pom.xml is put in rhino.js to redirect to new
one, but I didn't find it.
Regards
Philippe
On Sun, Feb 5, 2012 at 2:53 PM, sebb <se...@gmail.com> wrote:
> On 5 February 2012 13:17, <pm...@apache.org> wrote:
> > Author: pmouawad
> > Date: Sun Feb 5 13:17:58 2012
> > New Revision: 1240719
> >
> > URL: http://svn.apache.org/viewvc?rev=1240719&view=rev
> > Log:
> > Upgrade from js-1.7R2.jar to rhino-1.7R3.jar
>
> Rather odd - it appears that the Maven co-ordinates have changed from
>
> rhino:js
>
> to
>
> org.mozilla:rhino
>
> I don't think this will affect JMeter, but could cause some issues for
> Maven projects as the package name has not changed.
>
> Maven will not realise that 1.7R3 and 1.7R2 are different versions of
> the same jar.
> So Maven will allow both to be present on the same classpath; this can
> cause lots of hard to detect problems.
>
> Not a lot we can do about this, except bear it in mind if there are
> any problems reported.
>
> I might try raising an issue with Maven Central.
>
> > Modified:
> > jmeter/trunk/build.properties
> > jmeter/trunk/eclipse.classpath
> > jmeter/trunk/lib/aareadme.txt
> > jmeter/trunk/res/maven/ApacheJMeter_parent.pom
> > jmeter/trunk/xdocs/changes.xml
> >
> > Modified: jmeter/trunk/build.properties
> > URL:
> http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1240719&r1=1240718&r2=1240719&view=diff
> >
> ==============================================================================
> > --- jmeter/trunk/build.properties (original)
> > +++ jmeter/trunk/build.properties Sun Feb 5 13:17:58 2012
> > @@ -173,10 +173,10 @@ jdom.jar = jdom-${jdo
> > jdom.loc =
> ${maven2.repo}/org/jdom/jdom/${jdom.version}
> > jdom.md5 = 742bb15c2eda90dff56e3d82cf40cd13
> >
> > -js_rhino.version = 1.7R2
> > -js_rhino.jar = js-${js_rhino.version}.jar
> > -js_rhino.loc =
> ${maven2.repo}/rhino/js/${js_rhino.version}
> > -js_rhino.md5 = a4166cafe6e5d37c363b6795ee92c92c
> > +js_rhino.version = 1.7R3
> > +js_rhino.jar = rhino-${js_rhino.version}.jar
> > +js_rhino.loc =
> ${maven2.repo}/org/mozilla/rhino/${js_rhino.version}
> > +js_rhino.md5 = 9dbdb24663f20db43a2c29467c13a204
> >
> > junit.version = 4.10
> > junit.jar = junit-${junit.version}.jar
> >
> > Modified: jmeter/trunk/eclipse.classpath
> > URL:
> http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1240719&r1=1240718&r2=1240719&view=diff
> >
> ==============================================================================
> > --- jmeter/trunk/eclipse.classpath (original)
> > +++ jmeter/trunk/eclipse.classpath Sun Feb 5 13:17:58 2012
> > @@ -66,7 +66,7 @@
> > <classpathentry kind="lib" path="lib/httpmime-4.1.2.jar"/>
> > <classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
> > <classpathentry kind="lib" path="lib/jdom-1.1.2.jar"/>
> > - <classpathentry kind="lib" path="lib/js-1.7R2.jar"/>
> > + <classpathentry kind="lib" path="lib/rhino-1.7R3.jar"/>
> > <classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
> > <classpathentry kind="lib" path="lib/junit-4.10.jar"/>
> > <classpathentry kind="lib" path="lib/logkit-2.0.jar"/>
> >
> > Modified: jmeter/trunk/lib/aareadme.txt
> > URL:
> http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1240719&r1=1240718&r2=1240719&view=diff
> >
> ==============================================================================
> > --- jmeter/trunk/lib/aareadme.txt (original)
> > +++ jmeter/trunk/lib/aareadme.txt Sun Feb 5 13:17:58 2012
> > @@ -104,7 +104,7 @@ http://www.jdom.org/downloads/index.html
> > - XMLAssertion, JMeterTest ONLY
> > - Anakia
> >
> > -js-1.7R2
> > +rhino-1.7R3
> > --------
> > http://www.mozilla.org/rhino/download.html
> > - javascript function
> >
> > Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
> > URL:
> http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1240719&r1=1240718&r2=1240719&view=diff
> >
> ==============================================================================
> > --- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
> > +++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Feb 5 13:17:58
> 2012
> > @@ -77,7 +77,7 @@ under the License.
> > <jakarta-oro.version>2.0.8</jakarta-oro.version>
> > <jcharts.version>0.7.5</jcharts.version>
> > <jdom.version>1.1.2</jdom.version>
> > - <js_rhino.version>1.7R2</js_rhino.version>
> > + <js_rhino.version>1.7R3</js_rhino.version>
> > <junit.version>4.10</junit.version>
> > <logkit.version>2.0</logkit.version>
> > <soap.version>2.3.1</soap.version>
> > @@ -239,8 +239,8 @@ under the License.
> > </exclusions>
> > </dependency>
> > <dependency>
> > - <groupId>rhino</groupId>
> > - <artifactId>js</artifactId>
> > + <groupId>org.mozilla</groupId>
> > + <artifactId>rhino</artifactId>
> > <version>${js_rhino.version}</version>
> > </dependency>
> > <dependency>
> >
> > Modified: jmeter/trunk/xdocs/changes.xml
> > URL:
> http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1240719&r1=1240718&r2=1240719&view=diff
> >
> ==============================================================================
> > --- jmeter/trunk/xdocs/changes.xml (original)
> > +++ jmeter/trunk/xdocs/changes.xml Sun Feb 5 13:17:58 2012
> > @@ -140,6 +140,7 @@ or a Debug Sampler with all fields set t
> >
> > <h2>Non-functional changes</h2>
> > <ul>
> > +<li>Upgraded to rhino 1.7R3 (was js-1.7R2.jar)</li>
> > </ul>
> >
> > </section>
> >
> >
>
--
Cordialement.
Philippe Mouawad.
Re: svn commit: r1240719 - in /jmeter/trunk: build.properties
eclipse.classpath lib/aareadme.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Posted by sebb <se...@gmail.com>.
On 5 February 2012 13:17, <pm...@apache.org> wrote:
> Author: pmouawad
> Date: Sun Feb 5 13:17:58 2012
> New Revision: 1240719
>
> URL: http://svn.apache.org/viewvc?rev=1240719&view=rev
> Log:
> Upgrade from js-1.7R2.jar to rhino-1.7R3.jar
Rather odd - it appears that the Maven co-ordinates have changed from
rhino:js
to
org.mozilla:rhino
I don't think this will affect JMeter, but could cause some issues for
Maven projects as the package name has not changed.
Maven will not realise that 1.7R3 and 1.7R2 are different versions of
the same jar.
So Maven will allow both to be present on the same classpath; this can
cause lots of hard to detect problems.
Not a lot we can do about this, except bear it in mind if there are
any problems reported.
I might try raising an issue with Maven Central.
> Modified:
> jmeter/trunk/build.properties
> jmeter/trunk/eclipse.classpath
> jmeter/trunk/lib/aareadme.txt
> jmeter/trunk/res/maven/ApacheJMeter_parent.pom
> jmeter/trunk/xdocs/changes.xml
>
> Modified: jmeter/trunk/build.properties
> URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1240719&r1=1240718&r2=1240719&view=diff
> ==============================================================================
> --- jmeter/trunk/build.properties (original)
> +++ jmeter/trunk/build.properties Sun Feb 5 13:17:58 2012
> @@ -173,10 +173,10 @@ jdom.jar = jdom-${jdo
> jdom.loc = ${maven2.repo}/org/jdom/jdom/${jdom.version}
> jdom.md5 = 742bb15c2eda90dff56e3d82cf40cd13
>
> -js_rhino.version = 1.7R2
> -js_rhino.jar = js-${js_rhino.version}.jar
> -js_rhino.loc = ${maven2.repo}/rhino/js/${js_rhino.version}
> -js_rhino.md5 = a4166cafe6e5d37c363b6795ee92c92c
> +js_rhino.version = 1.7R3
> +js_rhino.jar = rhino-${js_rhino.version}.jar
> +js_rhino.loc = ${maven2.repo}/org/mozilla/rhino/${js_rhino.version}
> +js_rhino.md5 = 9dbdb24663f20db43a2c29467c13a204
>
> junit.version = 4.10
> junit.jar = junit-${junit.version}.jar
>
> Modified: jmeter/trunk/eclipse.classpath
> URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1240719&r1=1240718&r2=1240719&view=diff
> ==============================================================================
> --- jmeter/trunk/eclipse.classpath (original)
> +++ jmeter/trunk/eclipse.classpath Sun Feb 5 13:17:58 2012
> @@ -66,7 +66,7 @@
> <classpathentry kind="lib" path="lib/httpmime-4.1.2.jar"/>
> <classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
> <classpathentry kind="lib" path="lib/jdom-1.1.2.jar"/>
> - <classpathentry kind="lib" path="lib/js-1.7R2.jar"/>
> + <classpathentry kind="lib" path="lib/rhino-1.7R3.jar"/>
> <classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
> <classpathentry kind="lib" path="lib/junit-4.10.jar"/>
> <classpathentry kind="lib" path="lib/logkit-2.0.jar"/>
>
> Modified: jmeter/trunk/lib/aareadme.txt
> URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1240719&r1=1240718&r2=1240719&view=diff
> ==============================================================================
> --- jmeter/trunk/lib/aareadme.txt (original)
> +++ jmeter/trunk/lib/aareadme.txt Sun Feb 5 13:17:58 2012
> @@ -104,7 +104,7 @@ http://www.jdom.org/downloads/index.html
> - XMLAssertion, JMeterTest ONLY
> - Anakia
>
> -js-1.7R2
> +rhino-1.7R3
> --------
> http://www.mozilla.org/rhino/download.html
> - javascript function
>
> Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
> URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1240719&r1=1240718&r2=1240719&view=diff
> ==============================================================================
> --- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
> +++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Feb 5 13:17:58 2012
> @@ -77,7 +77,7 @@ under the License.
> <jakarta-oro.version>2.0.8</jakarta-oro.version>
> <jcharts.version>0.7.5</jcharts.version>
> <jdom.version>1.1.2</jdom.version>
> - <js_rhino.version>1.7R2</js_rhino.version>
> + <js_rhino.version>1.7R3</js_rhino.version>
> <junit.version>4.10</junit.version>
> <logkit.version>2.0</logkit.version>
> <soap.version>2.3.1</soap.version>
> @@ -239,8 +239,8 @@ under the License.
> </exclusions>
> </dependency>
> <dependency>
> - <groupId>rhino</groupId>
> - <artifactId>js</artifactId>
> + <groupId>org.mozilla</groupId>
> + <artifactId>rhino</artifactId>
> <version>${js_rhino.version}</version>
> </dependency>
> <dependency>
>
> Modified: jmeter/trunk/xdocs/changes.xml
> URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1240719&r1=1240718&r2=1240719&view=diff
> ==============================================================================
> --- jmeter/trunk/xdocs/changes.xml (original)
> +++ jmeter/trunk/xdocs/changes.xml Sun Feb 5 13:17:58 2012
> @@ -140,6 +140,7 @@ or a Debug Sampler with all fields set t
>
> <h2>Non-functional changes</h2>
> <ul>
> +<li>Upgraded to rhino 1.7R3 (was js-1.7R2.jar)</li>
> </ul>
>
> </section>
>
>