Skip to content

Commit 64009f3

Browse files
marko-bekhtamarko-bekhta
committed
HSEARCH-5464 Explicitly list the apache http client libs we use to implement the clients as dependencies
1 parent cb5ec45 commit 64009f3

File tree

5 files changed

+213
-0
lines changed

5 files changed

+213
-0
lines changed

‎backend/elasticsearch-client/elasticsearch-java-client/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@
3636
<groupId>co.elastic.clients</groupId>
3737
<artifactId>elasticsearch-java</artifactId>
3838
</dependency>
39+
<dependency>
40+
<groupId>org.apache.httpcomponents.client5</groupId>
41+
<artifactId>httpclient5</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.apache.httpcomponents.core5</groupId>
45+
<artifactId>httpcore5</artifactId>
46+
</dependency>
3947
<dependency>
4048
<groupId>org.jboss.logging</groupId>
4149
<artifactId>jboss-logging</artifactId>

‎backend/elasticsearch-client/elasticsearch-rest-client/pom.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,26 @@
4040
<groupId>org.elasticsearch.client</groupId>
4141
<artifactId>elasticsearch-rest-client-sniffer</artifactId>
4242
</dependency>
43+
<dependency>
44+
<groupId>org.apache.httpcomponents</groupId>
45+
<artifactId>httpclient</artifactId>
46+
<version>4.5.14</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.apache.httpcomponents</groupId>
50+
<artifactId>httpcore</artifactId>
51+
<version>4.4.16</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.apache.httpcomponents</groupId>
55+
<artifactId>httpcore-nio</artifactId>
56+
<version>4.4.16</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.apache.httpcomponents</groupId>
60+
<artifactId>httpasyncclient</artifactId>
61+
<version>4.1.5</version>
62+
</dependency>
4363
<dependency>
4464
<groupId>org.jboss.logging</groupId>
4565
<artifactId>jboss-logging</artifactId>

‎backend/elasticsearch-client/opensearch-rest-client/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@
4040
<groupId>org.opensearch.client</groupId>
4141
<artifactId>opensearch-rest-client-sniffer</artifactId>
4242
</dependency>
43+
<dependency>
44+
<groupId>org.apache.httpcomponents.client5</groupId>
45+
<artifactId>httpclient5</artifactId>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.apache.httpcomponents.core5</groupId>
49+
<artifactId>httpcore5</artifactId>
50+
</dependency>
4351
<dependency>
4452
<groupId>org.jboss.logging</groupId>
4553
<artifactId>jboss-logging</artifactId>

‎bom/platform-common/pom.xml‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@
3535
<version.bom.jakarta.transaction>2.0.1</version.bom.jakarta.transaction>
3636
<version.bom.jakarta.xml.bind>4.0.2</version.bom.jakarta.xml.bind>
3737
<version.bom.org.jberet>3.1.0.Final</version.bom.org.jberet>
38+
<version.bom.org.apache.httpcomponents.client5>5.5</version.bom.org.apache.httpcomponents.client5>
39+
<version.bom.org.apache.httpcomponents.core5>5.3.5</version.bom.org.apache.httpcomponents.core5>
40+
<version.bom.org.apache.httpcomponents.httpclient>4.5.14</version.bom.org.apache.httpcomponents.httpclient>
41+
<version.bom.org.apache.httpcomponents.httpcore>4.4.16</version.bom.org.apache.httpcomponents.httpcore>
42+
<version.bom.org.apache.httpcomponents.httpasyncclient>4.1.5</version.bom.org.apache.httpcomponents.httpasyncclient>
3843
</properties>
3944

4045
<dependencyManagement>
@@ -620,6 +625,119 @@
620625
<artifactId>third-party</artifactId>
621626
<version>${version.bom.software.amazon.awssdk}</version>
622627
</dependency>
628+
629+
<!-- Apache HttpClient 5.x Dependencies -->
630+
<dependency>
631+
<groupId>org.apache.httpcomponents.client5</groupId>
632+
<artifactId>httpclient5-cache</artifactId>
633+
<version>${version.bom.org.apache.httpcomponents.client5}</version>
634+
</dependency>
635+
<dependency>
636+
<groupId>org.apache.httpcomponents.client5</groupId>
637+
<artifactId>httpclient5-fluent</artifactId>
638+
<version>${version.bom.org.apache.httpcomponents.client5}</version>
639+
</dependency>
640+
<dependency>
641+
<groupId>org.apache.httpcomponents.client5</groupId>
642+
<artifactId>httpclient5</artifactId>
643+
<version>${version.bom.org.apache.httpcomponents.client5}</version>
644+
</dependency>
645+
<dependency>
646+
<groupId>org.apache.httpcomponents.core5</groupId>
647+
<artifactId>httpcore5-h2</artifactId>
648+
<version>${version.bom.org.apache.httpcomponents.core5}</version>
649+
</dependency>
650+
<dependency>
651+
<groupId>org.apache.httpcomponents.core5</groupId>
652+
<artifactId>httpcore5-reactive</artifactId>
653+
<version>${version.bom.org.apache.httpcomponents.core5}</version>
654+
</dependency>
655+
<dependency>
656+
<groupId>org.apache.httpcomponents.core5</groupId>
657+
<artifactId>httpcore5</artifactId>
658+
<version>${version.bom.org.apache.httpcomponents.core5}</version>
659+
</dependency>
660+
<!-- Apache HttpClient 4.x Dependencies -->
661+
<dependency>
662+
<groupId>org.apache.httpcomponents</groupId>
663+
<artifactId>fluent-hc</artifactId>
664+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
665+
</dependency>
666+
<dependency>
667+
<groupId>org.apache.httpcomponents</groupId>
668+
<artifactId>httpasyncclient-cache</artifactId>
669+
<version>${version.bom.org.apache.httpcomponents.httpasyncclient}</version>
670+
</dependency>
671+
<dependency>
672+
<groupId>org.apache.httpcomponents</groupId>
673+
<artifactId>httpasyncclient-osgi</artifactId>
674+
<version>${version.bom.org.apache.httpcomponents.httpasyncclient}</version>
675+
</dependency>
676+
<dependency>
677+
<groupId>org.apache.httpcomponents</groupId>
678+
<artifactId>httpasyncclient</artifactId>
679+
<version>${version.bom.org.apache.httpcomponents.httpasyncclient}</version>
680+
</dependency>
681+
<dependency>
682+
<groupId>org.apache.httpcomponents</groupId>
683+
<artifactId>httpclient-cache</artifactId>
684+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
685+
</dependency>
686+
<dependency>
687+
<groupId>org.apache.httpcomponents</groupId>
688+
<artifactId>httpclient-osgi</artifactId>
689+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
690+
</dependency>
691+
<dependency>
692+
<groupId>org.apache.httpcomponents</groupId>
693+
<artifactId>httpclient-win</artifactId>
694+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
695+
</dependency>
696+
<dependency>
697+
<groupId>org.apache.httpcomponents</groupId>
698+
<artifactId>httpclient</artifactId>
699+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
700+
</dependency>
701+
<dependency>
702+
<groupId>org.apache.httpcomponents</groupId>
703+
<artifactId>httpcomponents-asyncclient</artifactId>
704+
<version>${version.bom.org.apache.httpcomponents.httpasyncclient}</version>
705+
</dependency>
706+
<dependency>
707+
<groupId>org.apache.httpcomponents</groupId>
708+
<artifactId>httpcomponents-client</artifactId>
709+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
710+
</dependency>
711+
<dependency>
712+
<groupId>org.apache.httpcomponents</groupId>
713+
<artifactId>httpcomponents-core</artifactId>
714+
<version>${version.bom.org.apache.httpcomponents.httpcore}</version>
715+
</dependency>
716+
<dependency>
717+
<groupId>org.apache.httpcomponents</groupId>
718+
<artifactId>httpcore-ab</artifactId>
719+
<version>${version.bom.org.apache.httpcomponents.httpcore}</version>
720+
</dependency>
721+
<dependency>
722+
<groupId>org.apache.httpcomponents</groupId>
723+
<artifactId>httpcore-nio</artifactId>
724+
<version>${version.bom.org.apache.httpcomponents.httpcore}</version>
725+
</dependency>
726+
<dependency>
727+
<groupId>org.apache.httpcomponents</groupId>
728+
<artifactId>httpcore-osgi</artifactId>
729+
<version>${version.bom.org.apache.httpcomponents.httpcore}</version>
730+
</dependency>
731+
<dependency>
732+
<groupId>org.apache.httpcomponents</groupId>
733+
<artifactId>httpcore</artifactId>
734+
<version>${version.bom.org.apache.httpcomponents.httpcore}</version>
735+
</dependency>
736+
<dependency>
737+
<groupId>org.apache.httpcomponents</groupId>
738+
<artifactId>httpmime</artifactId>
739+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
740+
</dependency>
623741
</dependencies>
624742
</dependencyManagement>
625743

@@ -895,6 +1013,26 @@
8951013
<artifactId>avro-codegen-test</artifactId>
8961014
<version>${version.bom.org.apache.avro}</version>
8971015
</dependency>
1016+
<dependency>
1017+
<groupId>org.apache.httpcomponents.core5</groupId>
1018+
<artifactId>httpcore5-parent</artifactId>
1019+
<version>${version.bom.org.apache.httpcomponents.core5}</version>
1020+
</dependency>
1021+
<dependency>
1022+
<groupId>org.apache.httpcomponents.core5</groupId>
1023+
<artifactId>httpcore5-testing</artifactId>
1024+
<version>${version.bom.org.apache.httpcomponents.core5}</version>
1025+
</dependency>
1026+
<dependency>
1027+
<groupId>org.apache.httpcomponents.client5</groupId>
1028+
<artifactId>httpclient5-parent</artifactId>
1029+
<version>${version.bom.org.apache.httpcomponents.client5}</version>
1030+
</dependency>
1031+
<dependency>
1032+
<groupId>org.apache.httpcomponents.client5</groupId>
1033+
<artifactId>httpclient5-testing</artifactId>
1034+
<version>${version.bom.org.apache.httpcomponents.client5}</version>
1035+
</dependency>
8981036
</dependenciesToSkip>
8991037
</dependencyManagementIncludesAllGroupIdArtifactsRule>
9001038
</rules>

‎build/parents/build/pom.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@
5252
<version.org.elasticsearch.client>9.1.3</version.org.elasticsearch.client>
5353
<version.org.elasticsearch.java.client>9.1.3</version.org.elasticsearch.java.client>
5454
<version.org.opensearch.client>3.2.0</version.org.opensearch.client>
55+
<!-- Various HTTP client versions that our own Elasticsearch client implementations depend on -->
56+
<version.org.apache.httpcomponents.client5>5.5</version.org.apache.httpcomponents.client5>
57+
<version.org.apache.httpcomponents.core5>5.3.5</version.org.apache.httpcomponents.core5>
58+
<version.org.apache.httpcomponents.httpclient>4.5.14</version.org.apache.httpcomponents.httpclient>
59+
<version.org.apache.httpcomponents.httpcore>4.4.16</version.org.apache.httpcomponents.httpcore>
60+
<version.org.apache.httpcomponents.httpasyncclient>4.1.5</version.org.apache.httpcomponents.httpasyncclient>
61+
5562
<!-- The main compatible version of Elasticsearch, advertised by default. Used in documentation links. -->
5663
<version.org.elasticsearch.compatible.main>${version.org.elasticsearch.latest}</version.org.elasticsearch.compatible.main>
5764
<documentation.org.elasticsearch.url>https://www.elastic.co/guide/en/elasticsearch/reference/${parsed-version.org.elasticsearch.compatible.main.majorVersion}.${parsed-version.org.elasticsearch.compatible.main.minorVersion}</documentation.org.elasticsearch.url>
@@ -464,6 +471,38 @@
464471
<version>${version.org.elasticsearch.java.client}</version>
465472
</dependency>
466473

474+
<dependency>
475+
<groupId>org.apache.httpcomponents.client5</groupId>
476+
<artifactId>httpclient5</artifactId>
477+
<version>${version.org.apache.httpcomponents.client5}</version>
478+
</dependency>
479+
<dependency>
480+
<groupId>org.apache.httpcomponents.core5</groupId>
481+
<artifactId>httpcore5</artifactId>
482+
<version>${version.org.apache.httpcomponents.core5}</version>
483+
</dependency>
484+
485+
<dependency>
486+
<groupId>org.apache.httpcomponents</groupId>
487+
<artifactId>httpclient</artifactId>
488+
<version>${version.org.apache.httpcomponents.httpclient}</version>
489+
</dependency>
490+
<dependency>
491+
<groupId>org.apache.httpcomponents</groupId>
492+
<artifactId>httpcore</artifactId>
493+
<version>${version.org.apache.httpcomponents.httpcore}</version>
494+
</dependency>
495+
<dependency>
496+
<groupId>org.apache.httpcomponents</groupId>
497+
<artifactId>httpcore-nio</artifactId>
498+
<version>${version.org.apache.httpcomponents.httpcore}</version>
499+
</dependency>
500+
<dependency>
501+
<groupId>org.apache.httpcomponents</groupId>
502+
<artifactId>httpasyncclient</artifactId>
503+
<version>${version.org.apache.httpcomponents.httpasyncclient}</version>
504+
</dependency>
505+
467506
<!-- Lucene backend -->
468507
<dependency>
469508
<groupId>org.apache.lucene</groupId>

0 commit comments

Comments
 (0)