[jmeter] 01/03: Upgrade dnsjava to 2.1.9 from 2.1.8

[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>