Skip to content

[9.3] (backport #455) Ship ONLY httpclient5 5.6.1 - #457

Merged
donoghuc merged 2 commits into
9.3from
mergify/bp/9.3/pr-455
May 11, 2026
Merged

[9.3] (backport #455) Ship ONLY httpclient5 5.6.1#457
donoghuc merged 2 commits into
9.3from
mergify/bp/9.3/pr-455

Conversation

@mergify

@mergify mergify Bot commented May 11, 2026

Copy link
Copy Markdown

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:

Thanks 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).

* 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
@mergify

mergify Bot commented May 11, 2026

Copy link
Copy Markdown
Author

Cherry-pick of aac830c has failed:

On branch mergify/bp/9.3/pr-455
Your branch is up to date with 'origin/9.3'.

You are currently cherry-picking commit aac830c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   build.gradle

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

@mergify mergify Bot mentioned this pull request May 11, 2026
@donoghuc
donoghuc requested a review from mashhurs May 11, 2026 21:06

@mashhurs mashhurs left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with happy CI

@elasticmachine

Copy link
Copy Markdown

💚 Build Succeeded

cc @donoghuc

@donoghuc
donoghuc merged commit 0a34da7 into 9.3 May 11, 2026
4 checks passed
@donoghuc
donoghuc deleted the mergify/bp/9.3/pr-455 branch May 11, 2026 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants