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 2015/02/27 23:06:35 UTC
svn commit: r1662830 - in /jmeter/trunk: build.properties eclipse.classpath
lib/ lib/aareadme.txt licenses/bin/rhino-1.7R4.txt
licenses/bin/rhino-1.7R5.txt res/maven/ApacheJMeter_parent.pom
xdocs/changes.xml
Author: pmouawad
Date: Fri Feb 27 22:06:34 2015
New Revision: 1662830
URL: http://svn.apache.org/r1662830
Log:
Update rhino-1.7R5 from 1.7R4
Added:
jmeter/trunk/licenses/bin/rhino-1.7R5.txt (contents, props changed)
- copied, changed from r1656228, jmeter/trunk/licenses/bin/rhino-1.7R4.txt
Removed:
jmeter/trunk/licenses/bin/rhino-1.7R4.txt
Modified:
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/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1662830&r1=1662829&r2=1662830&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Fri Feb 27 22:06:34 2015
@@ -214,10 +214,10 @@ jdom.jar = jdom-${jdo
jdom.loc = ${maven2.repo}/org/jdom/jdom/${jdom.version}
jdom.md5 = 140bfed13341fe2039eee0f26a16d705
-rhino.version = 1.7R4
+rhino.version = 1.7R5
rhino.jar = rhino-${rhino.version}.jar
rhino.loc = ${maven2.repo}/org/mozilla/rhino/${rhino.version}
-rhino.md5 = 3850097fb5c9aa1065cc198f1b82dcf1
+rhino.md5 = 515233bd8a534c0468f6e397fc6b1925
jodd-core.version = 3.6.4
jodd-core.jar = jodd-core-${jodd-core.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1662830&r1=1662829&r2=1662830&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Fri Feb 27 22:06:34 2015
@@ -82,7 +82,7 @@
<classpathentry kind="lib" path="lib/mail-1.5.0-b01.jar"/>
<classpathentry kind="lib" path="lib/mongo-java-driver-2.11.3.jar"/>
<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>
- <classpathentry kind="lib" path="lib/rhino-1.7R4.jar"/>
+ <classpathentry kind="lib" path="lib/rhino-1.7R5.jar"/>
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.3.jar"/>
<classpathentry kind="lib" path="lib/serializer-2.7.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 27 22:06:34 2015
@@ -43,7 +43,7 @@ mail-1.5.0-b01.jar
mongo-java-driver-2.11.3.jar
rsyntaxtextarea-2.5.3.jar
oro-2.0.8.jar
-rhino-1.7R4.jar
+rhino-1.7R5.jar
serializer-2.7.2.jar
slf4j-api-1.7.5.jar
slf4j-nop-1.7.5.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1662830&r1=1662829&r2=1662830&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Fri Feb 27 22:06:34 2015
@@ -144,10 +144,12 @@ jsoup-1.8.1
http://www.jsoup.org/
- CSS/JQuery like extractor
-rhino-1.7R4
+rhino-1.7R5
--------
http://www.mozilla.org/rhino/download.html
- javascript function
+- IfController
+- WhileController
- BSF (Javascript)
jTidy-r938
Copied: jmeter/trunk/licenses/bin/rhino-1.7R5.txt (from r1656228, jmeter/trunk/licenses/bin/rhino-1.7R4.txt)
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/rhino-1.7R5.txt?p2=jmeter/trunk/licenses/bin/rhino-1.7R5.txt&p1=jmeter/trunk/licenses/bin/rhino-1.7R4.txt&r1=1656228&r2=1662830&rev=1662830&view=diff
==============================================================================
(empty)
Propchange: jmeter/trunk/licenses/bin/rhino-1.7R5.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1662830&r1=1662829&r2=1662830&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Fri Feb 27 22:06:34 2015
@@ -87,7 +87,7 @@ under the License.
<jodd-lagarto.version>3.6.4</jodd-lagarto.version>
<jodd-log.version>3.6.4</jodd-log.version>
<jsoup.version>1.8.1</jsoup.version>
- <rhino.version>1.7R4</rhino.version>
+ <rhino.version>1.7R5</rhino.version>
<junit.version>4.12</junit.version>
<logkit.version>2.0</logkit.version>
<mongo-java-driver.version>2.11.3</mongo-java-driver.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1662830&r1=1662829&r2=1662830&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Feb 27 22:06:34 2015
@@ -133,6 +133,7 @@ Summary
<li>Updated to dnsjava-2.1.7.jar (from 2.1.6)</li>
<li>Updated to jodd-3.6.4.jar (from 3.6.1)</li>
<li>Updated to junit-4.12.jar (from 4.11)</li>
+<li>Updated to rhino-1.7R5 (from rhino-1.7R4)</li>
<li><bug>57276</bug>RMIC no longer needed since Java 5</li>
<li><bug>57310</bug>Replace System.getProperty("file.separator") with File.separator throughout (Also "path.separator" with File.pathSeparator)</li>
<li><bug>57389</bug>Fix potential NPE in converters</li>