Skip to content

Adopt latest patch release for http client#1227

Merged
l-trotta merged 2 commits into
elastic:mainfrom
donoghuc:bump-rest-client
May 4, 2026
Merged

Adopt latest patch release for http client#1227
l-trotta merged 2 commits into
elastic:mainfrom
donoghuc:bump-rest-client

Conversation

@donoghuc

@donoghuc donoghuc commented May 1, 2026

Copy link
Copy Markdown
Member

This commit updates the org.apache.httpcomponents.client5 dep to get the latest bug fixes.

Release notes: https://github.com/apache/httpcomponents-client/blob/rel/v5.6.1/RELEASE_NOTES.txt

This commit updates the `org.apache.httpcomponents.client5` dep to get the latest
bug fixes.

Release notes: https://github.com/apache/httpcomponents-client/blob/rel/v5.6.1/RELEASE_NOTES.txt
@donoghuc

donoghuc commented May 1, 2026

Copy link
Copy Markdown
Member Author

Not sure what the corresponding release notes or docs would be required for this. Let me know and I can work on those. Thanks :)

@l-trotta

l-trotta commented May 4, 2026

Copy link
Copy Markdown
Contributor

@donoghuc thanks! no need for docs :)

@l-trotta
l-trotta merged commit 7bb956c into elastic:main May 4, 2026
8 checks passed
l-trotta added a commit that referenced this pull request May 4, 2026
This commit updates the `org.apache.httpcomponents.client5` dep to get the latest
bug fixes.

Release notes: https://github.com/apache/httpcomponents-client/blob/rel/v5.6.1/RELEASE_NOTES.txt

Co-authored-by: Cas Donoghue <cas.donoghue@gmail.com>
l-trotta added a commit that referenced this pull request May 4, 2026
This commit updates the `org.apache.httpcomponents.client5` dep to get the latest
bug fixes.

Release notes: https://github.com/apache/httpcomponents-client/blob/rel/v5.6.1/RELEASE_NOTES.txt

Co-authored-by: Cas Donoghue <cas.donoghue@gmail.com>
donoghuc added a commit to donoghuc/logstash-filter-elastic_integration that referenced this pull request May 7, 2026
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
donoghuc added a commit to donoghuc/logstash-filter-elastic_integration that referenced this pull request May 11, 2026
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
donoghuc added a commit to elastic/logstash-filter-elastic_integration that referenced this pull request May 11, 2026
* 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
donoghuc added a commit to elastic/logstash-filter-elastic_integration that referenced this pull request May 11, 2026
* Ship ONLY httpclient5 5.6.1 (#455)

* 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

* release prep

---------

Co-authored-by: Cas Donoghue <cas.donoghue@gmail.com>
donoghuc added a commit to elastic/logstash-filter-elastic_integration that referenced this pull request May 11, 2026
* Ship ONLY httpclient5 5.6.1 (#455)

* 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)

* release prep

---------

Co-authored-by: Cas Donoghue <cas.donoghue@gmail.com>
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.

2 participants