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
commit 58339bb86a77821d7efce6e7af4b0f5a8ff2c887 Author: Renovate Bot <[email protected]> AuthorDate: Sat Apr 29 06:34:22 2023 +0000 fix(deps): update dependency org.neo4j.driver:neo4j-java-driver to v4.4.11 Fixes https://github.com/apache/jmeter/pull/5861 --- checksum.xml | 1 + .../94/326ba6bd408bfa94.fingerprints | 1 + .../50a628ffaf58480736b1079fd1031d14464180e0.asc | 26 ++++++++++++++++++++++ .../e0/d1031d14464180e0.fingerprints | 1 + src/bom-thirdparty/build.gradle.kts | 2 +- src/licenses/build.gradle.kts | 8 ++----- src/licenses/licenses/reactive-streams/LICENSE | 11 +++++---- 7 files changed, 37 insertions(+), 13 deletions(-) diff --git a/checksum.xml b/checksum.xml index f1c40c6cc5..88cecad263 100644 --- a/checksum.xml +++ b/checksum.xml @@ -183,6 +183,7 @@ <trusted-key id='a5bd02b93e7a40482eb1d66a5f69ad087600b22c' group='org.ow2.asm' /> <trusted-key id='908366594e746bf3c449f5622be5d98f751f4136' group='org.pcollections' /> <trusted-key id='e0d98c5fd55a8af232290e58dee12b9896f97e34' group='org.pcollections' /> + <trusted-key id='50a628ffaf58480736b1079fd1031d14464180e0' group='org.reactivestreams' /> <trusted-key id='a33a0b49a4c1ab590b0a4ddc1364c5e2df3e99c5' group='org.reactivestreams' /> <trusted-key id='3f2a008a91d11a7fac4a0786f13d3e721d56bd54' group='org.reflections' /> <trusted-key id='475f3b8e59e6e63aa78067482c7b12f2a511e325' group='org.slf4j' /> diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/94/326ba6bd408bfa94.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/326ba6bd408bfa94.fingerprints new file mode 100644 index 0000000000..b993675856 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/94/326ba6bd408bfa94.fingerprints @@ -0,0 +1 @@ +50a628ffaf58480736b1079fd1031d14464180e0 diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/50a628ffaf58480736b1079fd1031d14464180e0.asc b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/50a628ffaf58480736b1079fd1031d14464180e0.asc new file mode 100644 index 0000000000..c2d4f8157a --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/50a628ffaf58480736b1079fd1031d14464180e0.asc @@ -0,0 +1,26 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGKFXcwBEACSech69oRvhkVobrVShZGpJzl6DA/DxMNdWME3wI5XUFHmZKp5 +pD8VDhyOdYhXiF5MosdHsJtsHCz0dr+ss6FCHk3m6LEm8HHeTMFA20rbQKDcLj2P +8o/Rl9njB8mBIsyNc3FSBtI/Gle0pXTgbfZP1FTDRvoXpQO4WJP1GC9kU3q11HKp +XPbKRzlxfEuxKEaAywIMumkpVORvYm46sNHkavWUKbCxaPHMGgpueURUx1t5wiHk +PmrBc/XCN1XGt6tFQSJYYiZZl9WwwOdTA9CjaM2hEHp5yZAAtWmH9a1DS6JpJuL1 +4wGiS4z0S4VxPYWfMVuMfp6aa5fl1TGbIiHx0sujagTnyu/NmYn8IwU1Y5wLAW4x +e4SaUr4Ue7ZzdSNHEUId1sgS6JpdfbfyQpwbnN9UN34XYkl2+c6GuLegg/2vcgeF +PsxEIkn3t/Ecuuw1zFiKMG3/gxf4dd/sWbYC4N4rSuli/0ehByY5H0McdfjEtfjM +THoS39Dd47jnOG8tkhRuPlQCwQl2dpFtNl71nvQRcNtUfwSKf4CXUZkC2o5qchub +tcAM1ptMF8swGsS8lwoxlZwVIPvJLo+Z/Bw+L1Xkn2oD8ySDiypcS/cA6m1JGXon +1NEHLOrh6HEy4uHNvxZJplRBllOHR7icF9rYcqvSczlqQq/6E0yfJkg0gwARAQAB +uQINBGKFXcwBEAC+7NJ7OePu3xiA0k6HZwgcL1SLB3wdJcf1EetIDDE+ECv0EY2c +961lPg//khp/TKs06ZDxe8nmAbd+piSOopdgmXcmAHvybi1DecdVU7fLcYlJUf6O +MZ128b0gxu7XtmSWm4g2MYKisDGRgh1/aBueBbCoIRtEtDth8LSUC1OwfZG8VV0o +UAVcq/vIru7TCHx3BQV2vysc2FcuZMXNtn93D+45bjjMxyVz7Jq1a0e9O5Au8Pye +nQmMDAT3cB83zxish/9RDgu0omILlM+aDEaKNHWUSBGpC2Wdtg68TpLAXYKqlMXE +oJGzOv5zU7PUgfIHEqtxYPopZqOq3n6dVUBf/GlULLa6gyxOpgIWsLMC1gaCAOQw +//MYeKOkvmyoHVzHQnrfs+lwOm40+j5bLkBpPsJ6qmy7DFRQFsq/NzfXYY3xOgZD +NTLP4+EdSbXgEox1gbV6R6CvK8mhHWiRXOHui063R3uBcku8CzQaIvBDFENEQXyh +BvCMjxxSrB2nehixb3B6WnPE8L7mp982Ej3/Bgcy/1hea2VDzYGsNDprukJwE1B2 +14BLZ86E5NVEde3JKZWJLY1LhlWu/AyeR+arYze0itPEDw4oW9FBmIfR4Wb3L9lY +TnFBn2Vb9/eIcwIK4i75Ffjk9Ty9+NcVVgqCvOV+KzHd83V5ApqMZ8PWqwARAQAB +=HlgM +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/d1031d14464180e0.fingerprints b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/d1031d14464180e0.fingerprints new file mode 100644 index 0000000000..b993675856 --- /dev/null +++ b/gradle/checksum-dependency-plugin/cached-pgp-keys/e0/d1031d14464180e0.fingerprints @@ -0,0 +1 @@ +50a628ffaf58480736b1079fd1031d14464180e0 diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts index a8be7b7d1b..601338026d 100644 --- a/src/bom-thirdparty/build.gradle.kts +++ b/src/bom-thirdparty/build.gradle.kts @@ -118,7 +118,7 @@ dependencies { api("org.jsoup:jsoup:1.15.4") api("org.mongodb:mongo-java-driver:2.11.3") api("org.mozilla:rhino:1.7.14") - api("org.neo4j.driver:neo4j-java-driver:4.4.6") + api("org.neo4j.driver:neo4j-java-driver:4.4.11") api("org.slf4j:jcl-over-slf4j:1.7.36") api("org.slf4j:slf4j-api:1.7.36") api("oro:oro:2.0.8") diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts index 42f19dca5d..338c893df6 100644 --- a/src/licenses/build.gradle.kts +++ b/src/licenses/build.gradle.kts @@ -129,12 +129,7 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) { } overrideLicense("org.reactivestreams:reactive-streams") { - expectedLicense = - SimpleLicense( - "CC0", - uri("http://creativecommons.org/publicdomain/zero/1.0/";) - ) - effectiveLicense = SpdxLicense.CC0_1_0 + expectedLicense = SpdxLicense.MIT_0 } overrideLicense("org.brotli:dec:0.1.2") { @@ -195,6 +190,7 @@ val renderLicenseForBinary by tasks.registering(Apache2LicenseRenderer::class) { ).expression, AsfLicenseCategory.A ) + licenseCategory.put(SpdxLicense.MIT_0.expression, AsfLicenseCategory.A) } tasks.build.configure { diff --git a/src/licenses/licenses/reactive-streams/LICENSE b/src/licenses/licenses/reactive-streams/LICENSE index eadae05fc8..1e141c13dd 100644 --- a/src/licenses/licenses/reactive-streams/LICENSE +++ b/src/licenses/licenses/reactive-streams/LICENSE @@ -1,8 +1,7 @@ -Licensed under Public Domain (CC0) +MIT No Attribution -To the extent possible under law, the person who associated CC0 with -this code has waived all copyright and related or neighboring -rights to this code. +Copyright 2014 Reactive Streams -You should have received a copy of the CC0 legalcode along with this -work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. \ No newline at end of file +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. + +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.
