Ship ONLY httpclient5 5.6.1

[donoghuc]

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:

• Adopt latest patch release for http client elasticsearch-java#1227
• Upgrade httpclient5 to 5.6.1 and httpcore5 to 5.4 elasticsearch#148345

Thanks for contributing to Logstash! If you haven't already signed our CLA, here's a handy link: https://www.elastic.co/contributor-agreement/

[mergify]

This pull request does not have a backport label. Could you fix it @donoghuc? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

• backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
• If no backport is necessary, please add the backport-skip label

[mashhurs]

LGTM!

[github-actions]

@Mergifyio backport 9.3 9.4

[mergify]

backport 9.3 9.4

✅ Backports have been created

Details

• #457 [9.3] (backport #455) Ship ONLY httpclient5 5.6.1 has been created for branch 9.3 but encountered conflicts

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

• #458 [9.4] (backport #455) Ship ONLY httpclient5 5.6.1 has been created for branch 9.4

[elasticmachine]

💚 Build Succeeded

• Buildkite Build
• Commit: cf2bc5e

History

• 💚 Build #799 succeeded 3ce9d6d
• 💔 Build #798 failed 4c08dc8