This is an automated email from the ASF dual-hosted git repository.
pmouawad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new ee1de08 Updated to Mozilla Rhino 1.7.11 (from 1.7.10)
ee1de08 is described below
commit ee1de08500a9cc3e80bb292a0045ffab2f00bad6
Author: pmouawad <[email protected]>
AuthorDate: Sun Sep 29 22:26:02 2019 +0200
Updated to Mozilla Rhino 1.7.11 (from 1.7.10)
---
gradle.properties | 2 +-
lib/aareadme.txt | 2 +-
src/licenses/build.gradle.kts | 5 +++++
xdocs/changes.xml | 1 +
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 96bdcf0..dbdefef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -89,7 +89,7 @@ objenesis.version=2.6
oro.version=2.0.8
ph-commons.version=9.3.7
ph-css.version=6.2.0
-rhino.version=1.7.10
+rhino.version=1.7.11
rsyntaxtextarea.version=3.0.4
Saxon-HE.version=9.9.1-1
slf4j.version=1.7.25
diff --git a/lib/aareadme.txt b/lib/aareadme.txt
index c25fbde..7b4e643 100644
--- a/lib/aareadme.txt
+++ b/lib/aareadme.txt
@@ -194,7 +194,7 @@ ph-commons-9.3.7
https://github.com/phax/ph-commons
- CssParser
-rhino-1.7.10
+rhino-1.7.11
--------
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Rhino/Download_Rhino
- javascript function
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index e03d5a1..0fc2900 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -144,6 +144,11 @@ val gatherBinaryLicenses by
tasks.registering(GatherLicenseTask::class) {
overrideLicense("net.sf.saxon:Saxon-HE:9.9.1-1") {
expectedLicense = SpdxLicense.MPL_2_0
}
+
+ overrideLicense("org.mozilla:rhino:1.7.11") {
+ expectedLicense = SimpleLicense("MPL",
uri("https://github.com/mozilla/rhino/blob/master/LICENSE.txt";))
+ effectiveLicense = SpdxLicense.MPL_2_0
+ }
overrideLicense("com.sun.mail:all:1.5.0-b01") {
// Multiple licenses, specify explicitly
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index ec2492d..dd19b56 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -146,6 +146,7 @@ to view the last release notes of version 5.1.1.
<li>Updated to log4j 2.12.1 (from 2.11.1)</li>
<li>Updated to ph-commons 9.3.7 (from 9.2.1)</li>
<li>Updated to ph-css 6.2.0 (from 6.1.1)</li>
+ <li>Updated to Mozilla Rhino 1.7.11 (from 1.7.10)</li>
<li><bug>63396</bug>JSR223 Test Elements: Description of Parameters is
misleading, same for Script</li>
<li><bug>63480</bug>XPathAssertion and XPathAssertion2: Improve test
coverage for input coming from variable. Contributed by Ubik Load Pack (support
at ubikloadpack.com)</li>
<li><bug>63452</bug>Tools / Import from cURL: Complete coverage of all
command line options that are valid in JMeter use case. Contributed by Ubik
Load Pack (support at ubikloadpack.com)</li>
