Repository navigation
[v0.11.0] Version upgrades (backport #3183, #3184, #3182, #3196, #3195, #3223) - #3233
Conversation
…ient-v2/com.fasterxml.jackson.core-jackson-core-2.18.11 Bump com.fasterxml.jackson.core:jackson-core from 2.18.8 to 2.18.11 in /examples/client-v2 (cherry picked from commit d68cea5)
…ient-v2/com.fasterxml.jackson.core-jackson-databind-2.18.11 Bump com.fasterxml.jackson.core:jackson-databind from 2.18.10 to 2.18.11 in /examples/client-v2 (cherry picked from commit 12c03e5)
…ient-v2-json-processors/com.fasterxml.jackson.core-jackson-databind-2.22.3 Bump com.fasterxml.jackson.core:jackson-databind from 2.22.2 to 2.22.3 in /examples/client-v2-json-processors (cherry picked from commit 41a9d05)
…bc-v2-json-processors/com.fasterxml.jackson.core-jackson-databind-2.22.3 Bump com.fasterxml.jackson.core:jackson-databind from 2.22.2 to 2.22.3 in /examples/jdbc-v2-json-processors (cherry picked from commit 8fb4c1c)
…-lz4-java-1.11.4 Bump at.yawk.lz4:lz4-java from 1.11.1 to 1.11.4 (cherry picked from commit c216804)
Upgrade dependencies (cherry picked from commit 621f85c)
|
CI on this PR fails before compilation starts. The cause is in the base branch Cause
Evidence
Each PR into Options
Notes:
Which option do you want? Please mention @polyglotAI-bot in your reply. |
Maven 3.10 rejects a dependency declared twice in one POM, so the "Compile examples" CI step fails on v0.11.0. Keep one jackson-databind dependency with the default (compile) scope, as on main. Conflict: the version is 2.18.11 on main and 2.18.10 on v0.11.0. Kept the branch value; the bump is part of the #3233 backport. (cherry picked from commit 2b635d1) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
@polyglotAI-bot sync from |
…v0.11.0-dependency-upgrades # Conflicts: # examples/client-v2/pom.xml
chernser
left a comment
There was a problem hiding this comment.
sync with v0.11.0 to fix the CI build
|
Done. I merged Conflict
Result
Verification (Maven 3.10.0, the CI version)
CI is running on the new head (run 39555085820). This merge dismisses no approval, because the PR had none. Please re-review when CI is green. |
TriageCategory: Summary What this impacts
Concerns
Required reviewer action
|
Summary
Backports six dependency-upgrade PRs from
maintov0.11.0, as requested by @chernser in #3230 (comment):Issue: #3230 (a closing keyword has no effect on a PR into a non-default branch, so close the issue manually after merge).
Cherry-picked PRs
In merge order on
main. Each one isgit cherry-pick -x -m 1 <merge commit>. Each commit keeps its original author and records its source commit.maind68cea51cexamples/client-v2)f9f3b9e83(clean)12c03e561examples/client-v2)14abe0d95(clean)41a9d05dbexamples/client-v2-json-processors)1ce3c38d9(conflict)8fb4c1c91examples/jdbc-v2-json-processors)36ee1c8b1(conflict)c216804222b2cd410e(clean)621f85c05782a1c9a6(conflict)Conflicts and resolution
There are three conflicts, all of the same type. In
examples/client-v2-json-processors/pom.xml,examples/jdbc-v2-json-processors/pom.xmlandexamples/demo-spring-service/pom.xml, the changed line is next to<clickhouse-java.version>. That value is0.11.0-rc1-SNAPSHOTonv0.11.0and0.12.0-rc1-SNAPSHOTonmain.Resolution: keep the branch value of
clickhouse-java.version, and take all other lines from the PR. For #3223, this also removestestcontainers.versionand its comment fromdemo-spring-service/pom.xml, as the PR does onmain.Check: the file set (9 files, +21/−29) and the changed lines (
+/-lines ofgit diff -U0) are identical to the combined diffs of the six PRs onmain, file by file. The branch has no other changes.Test
Done in a devbox (JDK 17 + JDK 8 toolchain, ClickHouse server
latest):mvn -B -DskipTests -Dmaven.javadoc.skip=true install:BUILD SUCCESS, all 9 reactor modules.mvn -B -DskipTests test-compileinexamples/client-v2,examples/client-v2-json-processors,examples/jdbc-v2-json-processors,examples/client-v2-apache-arrow,examples/demo-spring-serviceandperformance(not in the root reactor): all pass.mvn -B -pl clickhouse-data test: 1691 run, 0 failures (113 skipped).client-v2tests for the compression libraries that this PR upgrades. Unit:CompressedBlockInputStreamTest,HttpAPIClientHelperTest, 61 run, 0 failures. Integration:QueryServerContent{LZ4,ZSTD}CompressionTests,QueryServerHttpCompressionTests,InsertClientContent{LZ4,ZSTD}CompressionTests,InsertClientHttpCompressionTests, 433 run, 431 pass. The 2 failures aretestInsertAndReadBackWithSecureConnectionin the LZ4 and ZSTD insert classes. They connect to the hardcodedhttps://localhost:8443, which is not reachable in this environment (the server has a different host name), so the connection is refused. They are not related to this change. CI runs them against a local server.The cherry-picked PRs add and change no tests. This PR adds no tests, docs, CHANGELOG entry or version bump, because the PRs on
mainhave none.Checklist
🤖 Generated with Claude Code
Note
Low Risk
Dependency-only bumps on a release branch; main risk is transitive behavior changes from compression, metrics, Jackson, and Spring Boot upgrades, mitigated by existing tests rather than new code paths.
Overview
Backports six dependency-upgrade PRs from
mainonto thev0.11.0line. There is no application or library source change—only Maven property bumps, example POM pins, CI Python pins, and one wiring fix inclient-v2.The root
pom.xmlraises shared versions for compression and utilities:lz4-java,zstd-jni,snappy-java,micrometer, andguava.client-v2now resolveszstd-jnivia${zstd-jni.version}instead of a hardcoded coordinate;performanceandclient-v2-apache-arrowalignzstd-jnito 1.5.7-23.Jackson patch bumps land in examples:
jackson-core/jackson-databind2.18.11 inexamples/client-v2, andjackson2.22.3 in the JSON processor examples.examples/demo-spring-servicemoves Spring Boot from 3.3.5 to 3.5.16, drops the explicit OpenTelemetry BOM import and the Testcontainers version override (relying on Boot’s managed versions instead)..github/scripts/requirements.txtbumpsjwcryptoand adds pins forPyJWTandurllib3used by CI scripts.Reviewed by Cursor Bugbot for commit 3d8e314. Bugbot is set up for automated code reviews on this repo. Configure here.