Migrate Consul client to kiwiproject fork to clear okhttp CVE-2021-0341#13920
Merged
Conversation
… okhttp CVE Migrate the Consul cluster and configuration plugins from the abandoned com.orbitz.consul:consul-client 1.5.3 to the maintained fork org.kiwiproject:consul-client 0.9.0 to clear CVE-2021-0341 (okhttp 3.14.9). - Pin to 0.9.0: the newest fork release still built for JDK 11 bytecode (1.0.0+ is Java 17, which SkyWalking still targets via maven.compiler.release=11). - BOM: bump okhttp 3.14.9 -> 4.12.0 (clears the CVE, Java-8/11 safe); pin jackson-datatype-jdk8/guava to the managed jackson 2.18.6 so the client cannot drag in an off-version. - Source change is a package rename (com.orbitz.consul -> org.kiwiproject.consul); plugins use only stable Consul APIs. - ITs stay on consul:0.9. Regenerated LICENSE and added .licenserc.yaml mappings.
The log4j 1.x example config (log4j.properties) was removed when log4j 1.x test fixtures were dropped in #13915, leaving a dead relative link that the docs link-check flagged (Status 400). Drop the log4j1.x fileAppender bullet; the log4j2.x and logback examples remain.
wankai123
approved these changes
Jun 19, 2026
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
2 participants
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.
Fix CVE-2021-0341 carried by the abandoned
com.orbitz.consul:consul-clientMigrate the Consul cluster and configuration plugins from the abandoned
com.orbitz.consul:consul-client1.5.3to the maintained forkorg.kiwiproject:consul-client0.9.0.Why: the old
com.orbitz.consulclient is abandoned and pins okhttp3.14.9, which carries CVE-2021-0341 (improper hostname verification, fixed in okhttp4.9.2).How:
org.kiwiproject:consul-client. It is a drop-in package rename (com.orbitz.consul→org.kiwiproject.consul); the plugins use only stable Consul APIs, so there are no logic changes (existing UTs/ITs cover the behavior).0.9.0specifically: it is the newest fork release still compiled to JDK 11 bytecode (class major 55). Releases1.0.0+are Java-17 bytecode (major 61) and would break SkyWalking's JDK 11 support (maven.compiler.release=11; CI builds on JDK 11).3.14.9→4.12.0in the BOM (clears CVE-2021-0341; Java-8/11 safe). okhttp is pulled only by the Consul plugins — the fabric8 Kubernetes client excludes its okhttp transport — so no other module is affected.jackson-datatype-jdk8/jackson-datatype-guavato the managed jackson2.18.6so the fork cannot drag in an off-version (it declares2.15.2).consul:0.9(unchanged from master). Regenerateddist-material/release-docs/LICENSEand added.licenserc.yamlmappings for the changed dependencies.Verified locally: full
-Pallbuild, unit tests, cluster IT (5/5) and configuration IT (2/2) all pass; checkstyle clean; license headers valid;license-eye dependency resolveproduces a clean LICENSE.CHANGESlog.🤖 Generated with Claude Code