Commit 3ce9d6d
committed
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#1483451 parent d9d8aa0 commit 3ce9d6d
1 file changed
Lines changed: 12 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
460 | 460 | | |
461 | 461 | | |
462 | 462 | | |
463 | | - | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
464 | 471 | | |
465 | 472 | | |
466 | 473 | | |
| |||
562 | 569 | | |
563 | 570 | | |
564 | 571 | | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
565 | 576 | | |
566 | 577 | | |
567 | 578 | | |
| |||
0 commit comments