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
commit 406dc4a355a40203c28e515aa5bef5c432b4b44f Author: pmouawad <[email protected]> AuthorDate: Sun Sep 29 21:33:54 2019 +0200 Updated to jsoup 1.12.1 (from 1.11.3) --- gradle.properties | 2 +- lib/aareadme.txt | 2 +- src/licenses/build.gradle.kts | 5 +++++ xdocs/changes.xml | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 093d493..8c72891 100644 --- a/gradle.properties +++ b/gradle.properties @@ -77,7 +77,7 @@ jmespath-jackson.version=0.3.0 jodd.version=5.0.6 json-path.version=2.4.0 json-smart.version=2.3 -jsoup.version=1.11.3 +jsoup.version=1.12.1 jtidy.version=r938 junit4.version=4.12 junit5.version=5.5.1 diff --git a/lib/aareadme.txt b/lib/aareadme.txt index e0523f7..3555682 100644 --- a/lib/aareadme.txt +++ b/lib/aareadme.txt @@ -174,7 +174,7 @@ https://github.com/netplex/json-smart-v2 - JSON Path Extractor - JSON Path Renderer -jsoup-1.11.3 +jsoup-1.12.1 -------- http://www.jsoup.org/ - CSS/JQuery like extractor diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts index b73a5b7..5fe4bea 100644 --- a/src/licenses/build.gradle.kts +++ b/src/licenses/build.gradle.kts @@ -126,6 +126,11 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) { expectedLicense = SpdxLicense.MIT } + overrideLicense("org.jsoup:jsoup:1.12.1") { + expectedLicense = SimpleLicense("MIT", uri("https://github.com/jhy/jsoup/blob/master/LICENSE";)) + effectiveLicense = SpdxLicense.MIT + } + overrideLicense("org.slf4j:jcl-over-slf4j:1.7.25") { expectedLicense = SpdxLicense.MIT // See https://github.com/qos-ch/slf4j/blob/v_1.7.25/jcl-over-slf4j/LICENSE.txt diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 65cd50e..d19f3a3 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -132,7 +132,8 @@ to view the last release notes of version 5.1.1. <h3>General</h3> <ul> <li>Updated to httpclient/httpmime 4.5.8 (from 4.5.7)</li> - <li>Updated to dnsjava/dnsjava 2.1.9 (from 2.1.8)</li> + <li>Updated to dnsjava 2.1.9 (from 2.1.8)</li> + <li>Updated to jsoup 1.12.1 (from 1.11.3)</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>
