Repository navigation
Hotfix/zk 3.8.4 jdk21 - #114
Closed
DeliaCraciun wants to merge 5 commits into
Closed
DeliaCraciun wants to merge 5 commits into
DeliaCraciun wants to merge 5 commits into
Conversation
Port alternate Java download sources and optional BuildKit-secret authentication from adobe/koperator#403. Upgrade the ZooKeeper base image to Debian Trixie while retaining Oracle and Java 25 defaults. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit 9d3330b)
Use the documented major-only layout for alternate JDK mirrors. Compile the zu helper to Java 21 bytecode while retaining JDK 25 as the builder and default runtime, and keep image descriptions accurate for alternate runtimes. Validated the complete amd64 image with authenticated Oracle JDK 21.0.13.1+4 downloads, ZooKeeper startup and live zu client access. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit 90bafb9)
Keep java_version in the base Dockerfile as the single runtime setting. Read the selected base JDK release metadata in the native helper builder and use one Gradle property for Java source/target compatibility and the Kotlin JVM target. Verified full Java 21 and Java 25 image builds, matching helper bytecode versions, ZooKeeper startup and live helper operations; all 35 build-script tests pass. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit 9a20f30)
Default javaVersion lazily from the base Dockerfile when no explicit Gradle property is supplied. This restores the CodeQL ./gradlew build command while retaining Java 25 as the shared runtime and compilation default. Docker builds continue to derive targets from the selected base image. Verified bare Gradle build, explicit Java 21 override, full Java 25 image/runtime smoke tests and 35 script regression tests. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit b56b277)
Add production hotfix settings on top of all four separately cherry-picked commits from #113. Keep the donor download implementation, dynamic helper targets, original test names and test contents unchanged. Select approved Oracle JDK 21.0.13.1, rebuild the Apache base and pin the wrapper to its digest. Preserve ZooKeeper server 3.8.4, the deployed helper client dependency 3.9.3 and all existing service source code. Restore upstream build prerequisites missing from the old release: the shared version resolver and helper shell function, plus the Gradle/Kotlin/Shadow toolchain required by the retained JDK 25 native builder. Java and Kotlin bytecode targets still follow the selected Java 21 runtime. Configure trusted manual image validation with the same Artifactory override and add exact Oracle 21.0.13.1+4 process checks and live ZooKeeper/helper smoke tests for both architectures. Retain the old tag-push publishing trigger and document prerequisites; no tag or image is published by this commit. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Change log description
Purpose of the change
Address CVE-2026-114938 in the ZooKeeper runtime without upgrading the production ZooKeeper server version.
The hotfix starts from production tag
0.2.15-adobe-20260225, not master.What the code does
How to verify it
Completed locally:
python3 -B -m unittest discover -s scripts -p 'test_*.py'— passed, 15 tests.env -u GOROOT make check— passed.bash -n scripts/zookeeper-version.sh scripts/test-zookeeper-image.sh— passed.git diff --check— passed.21.0.13.1+4-LTS-22and ZooKeeper3.8.4; readiness, helper access and shutdown succeeded.Before release:
JAVA_DOWNLOAD_BASE_URLandJAVA_DOWNLOAD_APIKEY.zookeeper-imagesworkflow on the reviewed hotfix ref for native AMD64 and ARM64 validation.25.0.5+8. This builder is not included in the final runtime image.