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 039712cb86 Revert "fix(deps): update com.fasterxml.jackson.core to
v2.15.0"
039712cb86 is described below
commit 039712cb8660b05c412eb85f97a4f9a2126ae9c1
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Fri Apr 28 15:03:34 2023 +0300
Revert "fix(deps): update com.fasterxml.jackson.core to v2.15.0"
This reverts commit 8f29799dd5e76ba30011c2c9fb170622b6e81791.
---
.../02/6ead752b3e2b38e8e2236d7ba9321edaa5cb3202.asc | 21 ---------------------
.../02/a9321edaa5cb3202.fingerprints | 1 -
.../5b/d36db5c489baac5b.fingerprints | 1 -
.../91/9f621f1ae6ef2591.fingerprints | 1 -
.../be/2bfd7825a8984fbe.fingerprints | 1 -
.../be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc | 21 ---------------------
src/bom-thirdparty/build.gradle.kts | 6 +++---
src/licenses/build.gradle.kts | 4 ----
src/licenses/licenses/fastdoubleparser/LICENSE | 21 ---------------------
9 files changed, 3 insertions(+), 74 deletions(-)
diff --git
a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/6ead752b3e2b38e8e2236d7ba9321edaa5cb3202.asc
b/gradle/checksum-dependency-plugin/cached-pgp-keys/02/6ead752b3e2b38e8e2236d7ba9321edaa5cb3202.asc
deleted file mode 100644
index 055840f5dc..0000000000
---
a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/6ead752b3e2b38e8e2236d7ba9321edaa5cb3202.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGBoC2ABDACyCWLqqAo9NeThE90hBoYomtgLci5I8+7PxSYeQfzUYjXzZcnh
-6d/zHaeC0zxGhT2LNe5i3p2e36xSeFDobjG2Il/nv+4jFCgbn3TZ2hEingPuPsg5
-isodOXHBSY9iHPTKInpiu+J79MWP9GVZ6GeOOgQaNSrNN3uDE1w3rukB2SrXGdfT
-/6YZIOtwWZVzc2m9lalPmOAyI4KLI/s37C8Ozfv3c+Bx11WRVzWVpBTo94fU4DPu
-Yzkx2Wxuc4TT5k6bQJI/GHi36M7xkUauXhkRCNvBz+LFVcFjtsv6S37L6RZib6mz
-jZTW+iyD4h66gqzg3hSRxv4YzHgR/Os26Br2ioZNzH6hJFtNktR4oN/2kydmj5Od
-WYjvdMmd/dMbZheZE3f8sziUKCyvWMIddnHAM81uDTXgWcMgYSa3npOGZhfk41z+
-w9o2f1kXIfdurqlA1n8np07PLw5Rfpjvbs7EZxPTJwcc1enaNyL64fb+YIUtFrcW
-Dt1zUMEDkbcZL1UAEQEAAbkBjQRgaAtgAQwA9dZFGqc0/6pUKDUsT+2hMh0z5mIS
-Lc+x6v4wbAqiEcBE9uoKf0LniRfVeehmuJpiUPgOf3TyxNbxeWiFuJELZbnrYztA
-eRE66Zxk6i2Mv+207fdlj3mhphdEWh4f/0AJa2PAmiwlcxq1O3VJ/Wfn3huCqIU5
-cmqnmGKH9LPaW1aJBxWl9+x6mmPVySxpTaQRrnNnumZf9K5lwGEsccvpkLP7J1Nl
-v7HLO8oliPCInEMcsrVqfiKU/bybxNW1wzPJxp8LNLaCNxuLNl4RCp7tPQuZgjco
-Cnz+JwcxnmNGI+FKqSsFXBZyNTWiQJuaFUQa0QON/+Qj3p+OyW15f+FfLjHI/BkN
-Ai4ncNeeazAwuLCMJGMS+dLarHMbbAKLaH0UI062ch3Aq2Sa3io1gU6vYHvoKNMN
-fYdNwoGX85EkzX6A9fm9jBviios1RLkpfO70MoxpWjl/rwHG57GOItWZ7O53ebs6
-HrFPdUYQs0Gz/lj+BaQPwDcMxADfYtGnYMepABEBAAE=
-=xly/
------END PGP PUBLIC KEY BLOCK-----
diff --git
a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/a9321edaa5cb3202.fingerprints
b/gradle/checksum-dependency-plugin/cached-pgp-keys/02/a9321edaa5cb3202.fingerprints
deleted file mode 100644
index 41a0108c9e..0000000000
---
a/gradle/checksum-dependency-plugin/cached-pgp-keys/02/a9321edaa5cb3202.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-6ead752b3e2b38e8e2236d7ba9321edaa5cb3202
diff --git
a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/d36db5c489baac5b.fingerprints
b/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/d36db5c489baac5b.fingerprints
deleted file mode 100644
index 41a0108c9e..0000000000
---
a/gradle/checksum-dependency-plugin/cached-pgp-keys/5b/d36db5c489baac5b.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-6ead752b3e2b38e8e2236d7ba9321edaa5cb3202
diff --git
a/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
b/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
deleted file mode 100644
index 797d391613..0000000000
---
a/gradle/checksum-dependency-plugin/cached-pgp-keys/91/9f621f1ae6ef2591.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe
diff --git
a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
deleted file mode 100644
index 797d391613..0000000000
---
a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/2bfd7825a8984fbe.fingerprints
+++ /dev/null
@@ -1 +0,0 @@
-fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe
diff --git
a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
b/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
deleted file mode 100644
index f0a6e3b512..0000000000
---
a/gradle/checksum-dependency-plugin/cached-pgp-keys/be/fc2c31fc25fede4e7ad0d18c2bfd7825a8984fbe.asc
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGI0UjABDAC98lMPbj3vwHKSwLc8o4oAbOf9PKi/zWxjEYj7KZky4ue9JE7R
-QiaUCY387lWc/fXcq8Wa6/IteqekJBQw2KCrDaKBcAXLjnvO93q51ecc7Eo5U1w9
-xJj31YDQOR7R5XY2x2nvSSgk5CmV3czajM3ZeRYHoVqsqp6QwhjDllp+EaPJRtuS
-Fk5mWk8e//iZcZa6GK5wFEtrZMCSjjofaeE5wrsatguhrXwbtDshbN7oW48vK5Kv
-zM+zpwjLUu3gsvydyV4TPhl0Z5gzHef1GYe88WM5dus+/A8yED8BUJ7I6OkJKNbN
-ivC5aJg3BGvLZQiLCsOLZCYIcJt3ADYBgMVwHLSLmCoNym6sS61Rklu5Ig5Ax1eh
-X1aGL06v2B5oM+pHhEvl22iXIi+AQJYXYR8Lg1MBJzEz+aCaX+h46u+GcjEt0EV+
-WGzvQgBcA5qwEvbSKewu4fG/5SuyEk53ZXHwIJHC11kFQ9SPExPnqIdHHIMFjDj2
-8OG1WtLMdGzxMCkAEQEAAbkBjQRiNFIwAQwAqL0vVX+5uzucp6vQitUmOuEyiS0S
-Wz2wldKVJXKABnNKSP7Irq0pF0FbfvEne8pRGz35NVcAi7KPYwnbXtX43tmUJsO8
-w0Yti/eKBJOzPq5bxLvMabKTLaO3y/NLmRuxCBwre1zkdQGMK21O0TdGu0bxJK6Y
-EJKx/8cX+8f8WiVIlcN7IXlTgkeyz4CohaQfJibuPi0YSYmbhnjIuS8m6S/aMduC
-vAimqzIMk9rgRcbs27JafreWG+sLZ8sYYodixyBHBsLKVnGdkJXNAOwkBD6OCfQS
-W2DOZcNLpAb0yzwxk3sS6pMu7a8lqKDTmC6xCjNhdykoKn9r66AdFLZqRtld8S/i
-TwrdRyLokVZU8cfn+g7uOLe6scKYnKh4cff++QHSjDm5elY/Gr3b371N4qtngUl5
-TECiQK7M311nYBpiGnIu3e+IuB3VFET0HTTetQn5o8qTDoq0BOyhgOErQRvy9DmJ
-pKfq3cbMgRORbbJvCuZL3NSEJ8Y05rEKgmabABEBAAE=
-=Gw4I
------END PGP PUBLIC KEY BLOCK-----
diff --git a/src/bom-thirdparty/build.gradle.kts
b/src/bom-thirdparty/build.gradle.kts
index 5988235a44..8fbcf57654 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -50,9 +50,9 @@ dependencies {
api("bsf:bsf:2.4.0")
api("cglib:cglib-nodep:3.3.0")
- api("com.fasterxml.jackson.core:jackson-annotations:2.15.0")
- api("com.fasterxml.jackson.core:jackson-core:2.15.0")
- api("com.fasterxml.jackson.core:jackson-databind:2.15.0")
+ api("com.fasterxml.jackson.core:jackson-annotations:2.13.4")
+ api("com.fasterxml.jackson.core:jackson-core:2.13.4")
+ api("com.fasterxml.jackson.core:jackson-databind:2.13.4.2")
api("com.fifesoft:rsyntaxtextarea:3.2.0")
api("com.formdev:svgSalamander:1.1.2.4")
api("com.github.ben-manes.caffeine:caffeine:2.9.3")
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 9bcd571eec..6707745809 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -108,10 +108,6 @@ val gatherBinaryLicenses by
tasks.registering(GatherLicenseTask::class) {
expectedLicense = SpdxLicense.BSD_2_Clause
}
- overrideLicense("ch.randelshofer:fastdoubleparser") {
- expectedLicense = SpdxLicense.MIT
- }
-
overrideLicense("com.formdev:svgSalamander") {
// See
https://github.com/blackears/svgSalamander/blob/d6b6fe9a8ece7d0e0e7aeb3de82f027a38a6fe25/www/license/license-bsd.txt
effectiveLicense = SpdxLicense.BSD_3_Clause
diff --git a/src/licenses/licenses/fastdoubleparser/LICENSE
b/src/licenses/licenses/fastdoubleparser/LICENSE
deleted file mode 100644
index 49544bf9a8..0000000000
--- a/src/licenses/licenses/fastdoubleparser/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Werner Randelshofer, Switzerland.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
