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 3722961e0a2bb15a46de35d9cc01122a32ed8a69 Author: Vladimir Sitnikov <[email protected]> AuthorDate: Fri May 19 21:59:10 2023 +0300 chore: bump httpclient5 to 5.2.1 from 5.1.3 --- renovate.json | 12 ++++++++++-- src/bom-thirdparty/build.gradle.kts | 17 ++++++++++------- src/dist/src/dist/expected_release_jars.csv | 10 +++++----- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/renovate.json b/renovate.json index 47e06ca30f..d3286892a7 100644 --- a/renovate.json +++ b/renovate.json @@ -23,6 +23,10 @@ "matchPackagePrefixes": ["com.github.weisj"], "groupName": "com.github.weisj" }, + { + "matchPackagePrefixes": ["com.google.errorprone", "net.ltgt.errorprone"], + "groupName": "com.google.errorprone" + }, { "matchPackagePrefixes": ["com.helger"], "groupName": "com.helger" @@ -52,8 +56,12 @@ "groupName": "org.apache.ftpserver" }, { - "matchPackagePrefixes": ["org.apache.httpcomponents"], - "groupName": "org.apache.httpcomponents" + "matchPackagePrefixes": ["org.apache.httpcomponents:"], + "groupName": "org.apache.httpcomponents4" + }, + { + "matchPackagePrefixes": ["org.apache.httpcomponents.client5:"], + "groupName": "org.apache.httpcomponents5" }, { "matchPackagePrefixes": ["org.apache.logging.log4j"], diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts index 199b6e19f5..f7f3dfc12a 100644 --- a/src/bom-thirdparty/build.gradle.kts +++ b/src/bom-thirdparty/build.gradle.kts @@ -42,8 +42,6 @@ dependencies { api("bsf:bsf:2.4.0") api("cglib:cglib-nodep:3.3.0") - api("com.google.auto.service:auto-service:1.0.1") - api("com.google.auto.service:auto-service-annotations:1.0.1") api("com.fasterxml.jackson.core:jackson-annotations:2.15.1") api("com.fasterxml.jackson.core:jackson-core:2.15.1") api("com.fasterxml.jackson.core:jackson-databind:2.15.1") @@ -51,9 +49,12 @@ dependencies { api("com.formdev:svgSalamander:1.1.4") api("com.github.ben-manes.caffeine:caffeine:2.9.3") api("com.github.weisj:darklaf-core:2.7.3") - api("com.github.weisj:darklaf-theme:2.7.3") - api("com.github.weisj:darklaf-property-loader:2.7.3") api("com.github.weisj:darklaf-extensions-rsyntaxarea:0.3.4") + api("com.github.weisj:darklaf-property-loader:2.7.3") + api("com.github.weisj:darklaf-theme:2.7.3") + api("com.google.auto.service:auto-service-annotations:1.0.1") + api("com.google.auto.service:auto-service:1.0.1") + api("com.google.errorprone:error_prone_annotations:2.19.1") api("com.helger.commons:ph-commons:10.2.4") api("com.helger:ph-css:6.5.0") api("com.jayway.jsonpath:json-path:2.8.0") @@ -76,6 +77,7 @@ dependencies { api("junit:junit:4.13.2") { because("ApacheJMeter_junit depends on junit4") } + api("org.checkerframework:checker-qual:3.34.0") api("org.hamcrest:hamcrest-core:2.2") { because("ApacheJMeter_junit depends on junit4") } @@ -85,9 +87,6 @@ dependencies { api("org.hamcrest:hamcrest:2.2") { because("ApacheJMeter_junit depends on junit4") } - api("org.jetbrains:annotations:24.0.1") - api("org.jetbrains.lets-plot:lets-plot-batik:3.2.0") - api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.4.1") api("net.minidev:accessors-smart:2.4.11") api("net.minidev:json-smart:2.4.11") api("net.sf.jtidy:jtidy:r938") @@ -102,6 +101,7 @@ dependencies { api("org.apache.commons:commons-pool2:2.11.1") api("org.apache.commons:commons-text:1.10.0") api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1") + api("org.apache.httpcomponents.client5:httpclient5:5.2.1") api("org.apache.httpcomponents:httpasyncclient:4.1.5") api("org.apache.httpcomponents:httpclient:4.5.14") api("org.apache.httpcomponents:httpcore-nio:4.4.16") @@ -124,6 +124,9 @@ dependencies { api("org.exparity:hamcrest-date:2.0.8") api("org.freemarker:freemarker:2.3.32") api("org.jdom:jdom:1.1.3") + api("org.jetbrains.lets-plot:lets-plot-batik:3.2.0") + api("org.jetbrains.lets-plot:lets-plot-kotlin-jvm:4.4.1") + api("org.jetbrains:annotations:24.0.1") api("org.jodd:jodd-core:5.0.13") api("org.jodd:jodd-lagarto:5.0.13") api("org.jodd:jodd-log:5.0.13") diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index f47c4c0ca0..a64ed48994 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -24,7 +24,7 @@ 113369,bsf-2.4.0.jar 389033,bsh-2.0b6.jar 912143,caffeine-2.9.3.jar -222143,checker-qual-3.19.0.jar +224447,checker-qual-3.34.0.jar 353793,commons-codec-1.15.jar 588337,commons-collections-3.2.2.jar 751914,commons-collections4-4.4.jar @@ -49,7 +49,7 @@ 217795,darklaf-windows-2.7.3.jar 98115,dec-0.1.2.jar 320748,dnsjava-2.1.9.jar -15992,error_prone_annotations-2.10.0.jar +16477,error_prone_annotations-2.19.1.jar 1736381,freemarker-2.3.32.jar 32359,geronimo-jms_1.1_spec-1.1.1.jar 8038657,groovy-3.0.17.jar @@ -66,11 +66,11 @@ 109741,hamcrest-date-2.0.8.jar 181512,httpasyncclient-4.1.5.jar 785639,httpclient-4.5.14.jar -797934,httpclient5-5.1.3.jar +839626,httpclient5-5.2.1.jar 327891,httpcore-4.4.16.jar 368896,httpcore-nio-4.4.16.jar -850808,httpcore5-5.1.3.jar -232137,httpcore5-h2-5.1.3.jar +852871,httpcore5-5.2.jar +236827,httpcore5-h2-5.2.jar 41727,httpmime-4.5.14.jar 75564,jackson-annotations-2.15.1.jar 546100,jackson-core-2.15.1.jar
