diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index ad53fd4cb21..a62ae1b31ba 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 + +sub BA7BF054B50BBA5B +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=x9Cy +-----END PGP PUBLIC KEY BLOCK----- + pub AE5A7FB608A0221C uid Robert Scholte @@ -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) @@ -5779,6 +5946,83 @@ wE0zZV3fOXs1SJRPs0AqwMoUMaKcypgtXhyKJp6YxxuRPvBEVB0Ofz4SKxxjmMBt =vFzc -----END PGP PUBLIC KEY BLOCK----- +pub 37ECFC571637667C +sub 0E325BECB6962A24 +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +X+6qOD4CgbDYd2jOK/xPN/fEt00FppRFrZ4= +=bgDK +-----END PGP PUBLIC KEY BLOCK----- + pub 38F47D3E410C47B1 uid Vladimir Sitnikov diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index dbff8fb66b7..12a731815c0 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -135,6 +135,7 @@ + @@ -549,11 +550,21 @@ + + + + + + + + + + diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts index 4f351f3ba54..a09704537af 100644 --- a/src/bom-thirdparty/build.gradle.kts +++ b/src/bom-thirdparty/build.gradle.kts @@ -55,8 +55,8 @@ dependencies { api("com.google.auto.service:auto-service-annotations:1.1.1") api("com.google.auto.service:auto-service:1.1.1") api("com.google.errorprone:error_prone_annotations:2.24.0") - api("com.helger.commons:ph-commons:10.2.5") - api("com.helger:ph-css:6.5.0") + api("com.helger.commons:ph-commons:12.0.4") + api("com.helger:ph-css:8.0.1") api("com.jayway.jsonpath:json-path:2.8.0") api("com.miglayout:miglayout-core:5.3") api("com.miglayout:miglayout-swing:5.3") diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index 15b2cbc5f1d..1711ea8c62e 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -73,6 +73,7 @@ 78480,jackson-annotations-2.16.1.jar 578125,jackson-core-2.16.1.jar 1637611,jackson-databind-2.16.1.jar +26378,jakarta.annotation-api-3.0.0.jar 78030,javax.activation-1.2.0.jar 142391,jcharts-0.7.5.jar 16555,jcl-over-slf4j-1.7.36.jar @@ -109,8 +110,18 @@ 29680,mxparser-1.2.2.jar 5223562,neo4j-java-driver-4.4.13.jar 65261,oro-2.0.8.jar -1314621,ph-commons-10.2.5.jar -530791,ph-css-6.5.0.jar +41831,ph-annotations-12.0.4.jar +508951,ph-base-12.0.4.jar +31368,ph-cache-12.0.4.jar +196187,ph-collection-12.0.4.jar +122576,ph-commons-12.0.4.jar +525513,ph-css-8.0.1.jar +119770,ph-datetime-12.0.4.jar +148153,ph-io-12.0.4.jar +40268,ph-mime-12.0.4.jar +41515,ph-statistics-12.0.4.jar +158210,ph-text-12.0.4.jar +83971,ph-typeconvert-12.0.4.jar 182088,platf-awt-4.7.3.jar 88933,platf-batik-4.7.3.jar 1525466,plot-api-jvm-4.11.2.jar @@ -122,12 +133,11 @@ 1297525,rsyntaxtextarea-3.3.4.jar 5783933,Saxon-HE-12.9.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/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java index 43aedc9471b..be3dd482ce6 100644 --- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java +++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/CssParserCacheLoader.java @@ -27,7 +27,6 @@ import org.slf4j.LoggerFactory; import com.github.benmanes.caffeine.cache.CacheLoader; -import com.helger.css.ECSSVersion; import com.helger.css.decl.CSSDeclaration; import com.helger.css.decl.CSSExpressionMemberTermURI; import com.helger.css.decl.CSSImportRule; @@ -56,7 +55,6 @@ public URLCollection load(CssParser.CssCacheKey triple) final CSSReaderSettings readerSettings = new CSSReaderSettings() .setBrowserCompliantMode(true) .setFallbackCharset(charset) - .setCSSVersion(ECSSVersion.CSS30) .setCustomErrorHandler(new LoggingCSSParseErrorHandler()) .setUseSourceLocation(false) .setCustomExceptionHandler(