This is an automated email from the ASF dual-hosted git repository. vladimirsitnikov pushed a commit to branch renovate/major-org.apache.tika in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 0704e42fcda57cbe67847e448bc47a4e1a66b1ab Author: Mend Renovate <[email protected]> AuthorDate: Wed Oct 29 10:21:46 2025 +0000 fix(deps): update org.apache.tika to 3.2.3, slf4j to 2.0.17 slf4j 2.0 is required by tika --- gradle/verification-keyring.keys | 167 ++++++++++++++++++++++++++++ gradle/verification-metadata.xml | 5 + src/bom-thirdparty/build.gradle.kts | 7 +- src/core/build.gradle.kts | 9 +- src/dist/src/dist/expected_release_jars.csv | 7 +- src/protocol/http/build.gradle.kts | 9 +- 6 files changed, 180 insertions(+), 24 deletions(-) diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 6aac783a60..1e727e3312 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -1508,6 +1508,132 @@ cDs10GRLphmPfGxL0wSlJeYPTeu0ujcKKUXkRNO1f1EAcszcfqtP8RZ3kTTzu7w/ =ZFeE -----END PGP PUBLIC KEY BLOCK----- +pub AC107B386692DADD +uid AWS SDKs and Tools <[email protected]> + +sub BA7BF054B50BBA5B +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=x9Cy +-----END PGP PUBLIC KEY BLOCK----- + pub AE5A7FB608A0221C uid Robert Scholte <[email protected]> @@ -1735,6 +1861,47 @@ cZYUskQLV+tetMac6Lb3AOJ7HzGV3DSn =6FIP -----END PGP PUBLIC KEY BLOCK----- +pub B59D3D0F9F9C8684 +sub 813F15CDC1270665 +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=KK4E +-----END PGP PUBLIC KEY BLOCK----- + pub B7C3B43D18EAA8B7 uid Karl Heinz Marbaise (SoftwareEntwicklung Beratung Schulung) <[email protected]> diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 06a1536bad..90c300a977 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -197,6 +197,7 @@ <trusted-key id="A9C5DF4D22E99998D9875A5110C01C5A2F6059E7" group="commons-fileupload" name="commons-fileupload" version="1.5"/> <trusted-key id="AA417737BD805456DB3CBDDE6601E5C08DCCBB96" group="info.picocli"/> <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j"/> + <trusted-key id="AA782B04ABD9E36CF3096037B59D3D0F9F9C8684" group="org.apache.cxf"/> <trusted-key id="ADBC987D1A7B91DB6B0AAA81995EFBF4A3D20BEB" group="^com[.]pinterest($|([.].*))" regex="true"/> <trusted-key id="AE9E53FC28FF2AB1012273D0BF1518E0160788A2" group="org.apache"/> <trusted-key id="AEB1E1AEC035C66FA39589D13EFC46EE83C40224" group="com.networknt" name="json-schema-validator" version="1.5.7"/> @@ -292,6 +293,10 @@ </trusted-key> <trusted-key id="FC411CD3CB7DCB0ABC9801058118B3BCDB1A5000" group="jakarta.xml.bind"/> <trusted-key id="FEABFB0DBD7A754822D35DD9BE6397E958AB7594" group="org.jetbrains.lets-plot"/> + <trusted-key id="FEB9209F2F2F3F4664841E55AC107B386692DADD"> + <trusting group="com.amazonaws"/> + <trusting group="software.amazon.awssdk"/> + </trusted-key> <trusted-key id="FF6E2C001948C5F2F38B0CC385911F425EC61B51"> <trusting group="junit"/> <trusting group="org.apiguardian"/> diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts index 0ba7064d26..b0851d67d4 100644 --- a/src/bom-thirdparty/build.gradle.kts +++ b/src/bom-thirdparty/build.gradle.kts @@ -114,8 +114,7 @@ dependencies { api("org.apache.logging.log4j:log4j-core:2.22.1") api("org.apache.logging.log4j:log4j-slf4j-impl:2.22.1") api("org.apache.rat:apache-rat:0.15") - api("org.apache.tika:tika-core:1.28.5") - api("org.apache.tika:tika-parsers:1.28.5") + api("org.apache.tika:tika-core:3.2.3") api("org.apache.velocity:velocity:1.7") api("org.apache.xmlgraphics:xmlgraphics-commons:2.11") api("org.apiguardian:apiguardian-api:1.1.2") @@ -137,8 +136,8 @@ dependencies { api("org.mongodb:mongo-java-driver:2.14.3") api("org.mozilla:rhino:1.7.14") api("org.neo4j.driver:neo4j-java-driver:4.4.13") - api("org.slf4j:jcl-over-slf4j:1.7.36") - api("org.slf4j:slf4j-api:1.7.36") + api("org.slf4j:jcl-over-slf4j:2.0.17") + api("org.slf4j:slf4j-api:2.0.17") api("oro:oro:2.0.8") api("xalan:serializer:2.7.3") api("xalan:xalan:2.7.3") diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts index fb3a14338e..dd8473e803 100644 --- a/src/core/build.gradle.kts +++ b/src/core/build.gradle.kts @@ -108,14 +108,7 @@ dependencies { because("Mean, DescriptiveStatistics") } implementation("org.apache.commons:commons-text") - // For some reason JMeter bundles just tika-core and tika-parsers without transitive - // dependencies. So we exclude those - implementation("org.apache.tika:tika-core") { - isTransitive = false - } - runtimeOnly("org.apache.tika:tika-parsers") { - isTransitive = false - } + implementation("org.apache.tika:tika-core") implementation("org.apache.xmlgraphics:xmlgraphics-commons") implementation("org.freemarker:freemarker") implementation("org.jodd:jodd-core") diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index 3321bc7501..8d11c4d9b6 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -78,7 +78,7 @@ 1637611,jackson-databind-2.16.1.jar 78030,javax.activation-1.2.0.jar 142391,jcharts-0.7.5.jar -16555,jcl-over-slf4j-1.7.36.jar +18423,jcl-over-slf4j-2.0.17.jar 489286,jmespath-core-0.6.0.jar 7090,jmespath-jackson-0.6.0.jar 104067,jodd-core-5.3.0.jar @@ -125,12 +125,11 @@ 1297525,rsyntaxtextarea-3.3.4.jar 5104657,Saxon-HE-11.6.jar 283536,serializer-2.7.3.jar -41125,slf4j-api-1.7.36.jar +69908,slf4j-api-2.0.17.jar 320794,svgSalamander-1.1.4.jar 10192,swing-extensions-laf-support-0.1.3.jar 2539,swing-extensions-visual-padding-0.1.3.jar -736051,tika-core-1.28.5.jar -1588025,tika-parsers-1.28.5.jar +778543,tika-core-3.2.3.jar 3455761,xalan-2.7.3.jar 1446149,xercesImpl-2.12.2.jar 220536,xml-apis-1.4.01.jar diff --git a/src/protocol/http/build.gradle.kts b/src/protocol/http/build.gradle.kts index 36551cd999..24366f86b1 100644 --- a/src/protocol/http/build.gradle.kts +++ b/src/protocol/http/build.gradle.kts @@ -77,12 +77,5 @@ dependencies { testImplementation(testFixtures(projects.src.core)) testImplementation(testFixtures(projects.src.testkitWiremock)) testImplementation("org.wiremock:wiremock") - // For some reason JMeter bundles just tika-core and tika-parsers without transitive - // dependencies. So we exclude those - implementation("org.apache.tika:tika-core") { - isTransitive = false - } - runtimeOnly("org.apache.tika:tika-parsers") { - isTransitive = false - } + implementation("org.apache.tika:tika-core") }
