[9.3] (backport #455) Ship ONLY httpclient5 5.6.1 - #457
Merged
Conversation
* Ship ONLY httpclient5 5.6.1 The shadow jar task merges two dependency sources: a `fileTree` copy of jars from the ES source build (`elasticsearchMinimalCore`) and Maven-resolved dependencies from `elasticsearch-java` (`elasticsearchClient`). Because `elasticsearchMinimalCore` is listed first, its `httpclient5-5.5.jar` from x-pack-core takes precedence over the patched `httpclient5-5.6.1.jar` resolved via Maven from `elasticsearch-java 9.4.0`. Exclude httpclient5, httpcore5, and httpcore5-h2 from the x-pack-core module copy so the Maven-resolved versions are the sole source. This ensures the plugin ships the patched `httpclient5` `5.6.1` regardless of what version the ES server source build bundles. Related: - elastic/elasticsearch-java#1227 - elastic/elasticsearch#148345 * add changelog entry (cherry picked from commit aac830c) # Conflicts: # CHANGELOG.md
Author
|
Cherry-pick of aac830c has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
💚 Build Succeeded
cc @donoghuc |
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.
The shadow jar task merges two dependency sources: a
fileTreecopy of jars from the ES source build (elasticsearchMinimalCore) and Maven-resolved dependencies fromelasticsearch-java(elasticsearchClient). BecauseelasticsearchMinimalCoreis listed first, itshttpclient5-5.5.jarfrom x-pack-core takes precedence over the patchedhttpclient5-5.6.1.jarresolved via Maven fromelasticsearch-java 9.4.0.Exclude httpclient5, httpcore5, and httpcore5-h2 from the x-pack-core module copy so the Maven-resolved versions are the sole source. This ensures the plugin ships the patched
httpclient55.6.1regardless of what version the ES server source build bundles.Related:
httpclient5to5.6.1andhttpcore5to5.4elasticsearch#148345Thanks for contributing to Logstash! If you haven't already signed our CLA, here's a handy link: https://www.elastic.co/contributor-agreement/
This is an automatic backport of pull request #455 done by [Mergify](https://mergify.com).