[jmeter] branch master updated: fix(deps): update org.jodd to 5.1.5

[vladimirsitnikov]

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov 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 a9feb21636 fix(deps): update org.jodd to 5.1.5
a9feb21636 is described below

commit a9feb21636e2ddb6841146330907f5a0c1fa279f
Author: Vladimir Sitnikov <sitnikov.vladi...@gmail.com>
AuthorDate: Fri Apr 28 20:42:57 2023 +0300

    fix(deps): update org.jodd to 5.1.5
    
    For jodd 5.x, all the versions should be aligned
    
    Fixes https://github.com/apache/jmeter/pull/5838
---
 src/bom-thirdparty/build.gradle.kts | 8 ++++----
 src/licenses/build.gradle.kts       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bom-thirdparty/build.gradle.kts 
b/src/bom-thirdparty/build.gradle.kts
index 14b6f2553a..74f7ce9914 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -122,10 +122,10 @@ dependencies {
         api("org.freemarker:freemarker:2.3.32")
         api("org.hsqldb:hsqldb:2.5.2")
         api("org.jdom:jdom:1.1.3")
-        api("org.jodd:jodd-core:5.0.13")
-        api("org.jodd:jodd-lagarto:5.0.13")
-        api("org.jodd:jodd-log:5.0.13")
-        api("org.jodd:jodd-props:5.0.13")
+        api("org.jodd:jodd-core:5.1.5")
+        api("org.jodd:jodd-lagarto:5.1.5")
+        api("org.jodd:jodd-log:5.1.5")
+        api("org.jodd:jodd-props:5.1.5")
         api("org.jsoup:jsoup:1.15.4")
         api("org.mongodb:mongo-java-driver:2.11.3")
         api("org.mozilla:rhino:1.7.14")
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 6707745809..42f19dca5d 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -122,7 +122,7 @@ val gatherBinaryLicenses by 
tasks.registering(GatherLicenseTask::class) {
     }
 
     for (jodd in listOf("jodd-core", "jodd-lagarto", "jodd-log", 
"jodd-props")) {
-        overrideLicense("org.jodd:$jodd:5.0.13") {
+        overrideLicense("org.jodd:$jodd") {
             expectedLicense = SpdxLicense.BSD_2_Clause // SimpleLicense("The 
BSD 2-Clause License", uri("http://jodd.org/license.html";))
             licenseFiles = "jodd"
         }