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 2019/09/29 19:34:15 UTC
[jmeter] branch master updated (6dfd0d4 -> 406dc4a)
This is an automated email from the ASF dual-hosted git repository.
pmouawad pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 6dfd0d4 Remove unused imports
new 31e9e0c Upgrade dnsjava to 2.1.9 from 2.1.8
new 86100ba Upgrade dnsjava to 2.1.9 from 2.1.8
new 406dc4a Updated to jsoup 1.12.1 (from 1.11.3)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
checksum.xml | 2 +-
gradle.properties | 4 ++--
lib/aareadme.txt | 6 +++---
src/licenses/build.gradle.kts | 12 +++++++++---
xdocs/changes.xml | 2 ++
5 files changed, 17 insertions(+), 9 deletions(-)
[jmeter] 01/03: Upgrade dnsjava to 2.1.9 from 2.1.8
Posted by pm...@apache.org.
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 31e9e0c84098f36814c907e6803567df5c567954
Author: pmouawad <p....@ubik-ingenierie.com>
AuthorDate: Sun Sep 29 21:05:08 2019 +0200
Upgrade dnsjava to 2.1.9 from 2.1.8
---
gradle.properties | 2 +-
lib/aareadme.txt | 4 ++--
src/licenses/build.gradle.kts | 7 ++++---
xdocs/changes.xml | 1 +
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 0b63c8e..093d493 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -52,7 +52,7 @@ commons-pool2.version=2.6.0
commons-text.version=1.6
darcula.version=e208efb96f70e4be9dc362fbb46f6e181ef501dd
dec.version=0.1.2
-dnsjava.version=2.1.8
+dnsjava.version=2.1.9
equalsverifier.version=3.1.9
freemarker.version=2.3.28
ftplet-api.version=1.1.1
diff --git a/lib/aareadme.txt b/lib/aareadme.txt
index 257936f..e0523f7 100644
--- a/lib/aareadme.txt
+++ b/lib/aareadme.txt
@@ -97,9 +97,9 @@ darcula
https://github.com/bulenkov/Darcula/
- Look and Feel
-dnsjava-2.1.8
+dnsjava-2.1.9
-----------------
-http://www.dnsjava.org/download/
+https://github.com/dnsjava/dnsjava
- DNSCacheManager
groovy-all-2.4.16
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 16afd68..b73a5b7 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -29,7 +29,7 @@ plugins {
// See https://docs.gradle.org/current/userguide/troubleshooting_dependency_resolution.html#sub:configuration_resolution_constraints
// Gradle forbids to resolve configurations from other projects, so
-// we create our own copy of the confiruration which belongs to the current project
+// we create our own copy of the configuration which belongs to the current project
// This is the official recommendation:
// In most cases, the deprecation warning can be fixed by defining a configuration in
// the project where the resolution is occurring and setting it to extend from the configuration
@@ -78,8 +78,9 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
// Library is not present in Maven Central
overrideLicense("com.github.bulenkov.darcula:darcula:e208efb96f70e4be9dc362fbb46f6e181ef501dd", SpdxLicense.Apache_2_0)
- overrideLicense("dnsjava:dnsjava:2.1.8") {
- expectedLicense = SpdxLicense.BSD_2_Clause
+ overrideLicense("dnsjava:dnsjava:2.1.9") {
+ expectedLicense = SimpleLicense("BSD", uri("https://github.com/dnsjava/dnsjava/blob/master/LICENSE"))
+ effectiveLicense = SpdxLicense.BSD_2_Clause
}
overrideLicense("com.fifesoft:rsyntaxtextarea:3.0.2") {
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 01ad75b..65cd50e 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -132,6 +132,7 @@ 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><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>
[jmeter] 02/03: Upgrade dnsjava to 2.1.9 from 2.1.8
Posted by pm...@apache.org.
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 86100ba4ad385eb10614b734e7d3de2247314d9b
Author: pmouawad <p....@ubik-ingenierie.com>
AuthorDate: Sun Sep 29 21:33:26 2019 +0200
Upgrade dnsjava to 2.1.9 from 2.1.8
---
checksum.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/checksum.xml b/checksum.xml
index feaae90..af7c0c5 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -45,7 +45,7 @@
<trusted-key id='33cd6733af5ec452' group='commons-logging' />
<trusted-key id='a41f13c999945293' group='commons-logging' />
<trusted-key id='7a8860944fad5f62' group='commons-net' />
- <trusted-key id='93391910f494b50c' group='dnsjava' />
+ <trusted-key id='3449ec3ac2efe8aa' group='dnsjava' />
<trusted-key id='379ce192d401ab61' group='info.picocli' />
<trusted-key id='b2ca0dfe9ed21c6e' group='io.burt' />
<trusted-key id='5b30d3b10694f057' group='io.codearte.gradle.nexus' />
[jmeter] 03/03: Updated to jsoup 1.12.1 (from 1.11.3)
Posted by pm...@apache.org.
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 <p....@ubik-ingenierie.com>
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>