Skip to content

Commit 0e54837

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 6e58e32 commit 0e54837

File tree

5 files changed

+183
-0
lines changed

5 files changed

+183
-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: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,22 @@
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+
</dependency>
47+
<dependency>
48+
<groupId>org.apache.httpcomponents</groupId>
49+
<artifactId>httpcore</artifactId>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.apache.httpcomponents</groupId>
53+
<artifactId>httpcore-nio</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.apache.httpcomponents</groupId>
57+
<artifactId>httpasyncclient</artifactId>
58+
</dependency>
4359
<dependency>
4460
<groupId>org.jboss.logging</groupId>
4561
<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
@@ -36,6 +36,11 @@
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>
3838
<version.bom.com.fasterxml.jackson>2.20.0</version.bom.com.fasterxml.jackson>
39+
<version.bom.org.apache.httpcomponents.client5>5.5</version.bom.org.apache.httpcomponents.client5>
40+
<version.bom.org.apache.httpcomponents.core5>5.3.5</version.bom.org.apache.httpcomponents.core5>
41+
<version.bom.org.apache.httpcomponents.httpclient>4.5.14</version.bom.org.apache.httpcomponents.httpclient>
42+
<version.bom.org.apache.httpcomponents.httpcore>4.4.16</version.bom.org.apache.httpcomponents.httpcore>
43+
<version.bom.org.apache.httpcomponents.httpasyncclient>4.1.5</version.bom.org.apache.httpcomponents.httpasyncclient>
3944
</properties>
4045

4146
<dependencyManagement>
@@ -634,6 +639,119 @@
634639
<artifactId>v2-migration</artifactId>
635640
<version>${version.bom.software.amazon.awssdk}</version>
636641
</dependency>
642+
643+
<!-- Apache HttpClient 5.x Dependencies -->
644+
<dependency>
645+
<groupId>org.apache.httpcomponents.client5</groupId>
646+
<artifactId>httpclient5-cache</artifactId>
647+
<version>${version.bom.org.apache.httpcomponents.client5}</version>
648+
</dependency>
649+
<dependency>
650+
<groupId>org.apache.httpcomponents.client5</groupId>
651+
<artifactId>httpclient5-fluent</artifactId>
652+
<version>${version.bom.org.apache.httpcomponents.client5}</version>
653+
</dependency>
654+
<dependency>
655+
<groupId>org.apache.httpcomponents.client5</groupId>
656+
<artifactId>httpclient5</artifactId>
657+
<version>${version.bom.org.apache.httpcomponents.client5}</version>
658+
</dependency>
659+
<dependency>
660+
<groupId>org.apache.httpcomponents.core5</groupId>
661+
<artifactId>httpcore5-h2</artifactId>
662+
<version>${version.bom.org.apache.httpcomponents.core5}</version>
663+
</dependency>
664+
<dependency>
665+
<groupId>org.apache.httpcomponents.core5</groupId>
666+
<artifactId>httpcore5-reactive</artifactId>
667+
<version>${version.bom.org.apache.httpcomponents.core5}</version>
668+
</dependency>
669+
<dependency>
670+
<groupId>org.apache.httpcomponents.core5</groupId>
671+
<artifactId>httpcore5</artifactId>
672+
<version>${version.bom.org.apache.httpcomponents.core5}</version>
673+
</dependency>
674+
<!-- Apache HttpClient 4.x Dependencies -->
675+
<dependency>
676+
<groupId>org.apache.httpcomponents</groupId>
677+
<artifactId>fluent-hc</artifactId>
678+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
679+
</dependency>
680+
<dependency>
681+
<groupId>org.apache.httpcomponents</groupId>
682+
<artifactId>httpasyncclient-cache</artifactId>
683+
<version>${version.bom.org.apache.httpcomponents.httpasyncclient}</version>
684+
</dependency>
685+
<dependency>
686+
<groupId>org.apache.httpcomponents</groupId>
687+
<artifactId>httpasyncclient-osgi</artifactId>
688+
<version>${version.bom.org.apache.httpcomponents.httpasyncclient}</version>
689+
</dependency>
690+
<dependency>
691+
<groupId>org.apache.httpcomponents</groupId>
692+
<artifactId>httpasyncclient</artifactId>
693+
<version>${version.bom.org.apache.httpcomponents.httpasyncclient}</version>
694+
</dependency>
695+
<dependency>
696+
<groupId>org.apache.httpcomponents</groupId>
697+
<artifactId>httpclient-cache</artifactId>
698+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
699+
</dependency>
700+
<dependency>
701+
<groupId>org.apache.httpcomponents</groupId>
702+
<artifactId>httpclient-osgi</artifactId>
703+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
704+
</dependency>
705+
<dependency>
706+
<groupId>org.apache.httpcomponents</groupId>
707+
<artifactId>httpclient-win</artifactId>
708+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
709+
</dependency>
710+
<dependency>
711+
<groupId>org.apache.httpcomponents</groupId>
712+
<artifactId>httpclient</artifactId>
713+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
714+
</dependency>
715+
<dependency>
716+
<groupId>org.apache.httpcomponents</groupId>
717+
<artifactId>httpcomponents-asyncclient</artifactId>
718+
<version>${version.bom.org.apache.httpcomponents.httpasyncclient}</version>
719+
</dependency>
720+
<dependency>
721+
<groupId>org.apache.httpcomponents</groupId>
722+
<artifactId>httpcomponents-client</artifactId>
723+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
724+
</dependency>
725+
<dependency>
726+
<groupId>org.apache.httpcomponents</groupId>
727+
<artifactId>httpcomponents-core</artifactId>
728+
<version>${version.bom.org.apache.httpcomponents.httpcore}</version>
729+
</dependency>
730+
<dependency>
731+
<groupId>org.apache.httpcomponents</groupId>
732+
<artifactId>httpcore-ab</artifactId>
733+
<version>${version.bom.org.apache.httpcomponents.httpcore}</version>
734+
</dependency>
735+
<dependency>
736+
<groupId>org.apache.httpcomponents</groupId>
737+
<artifactId>httpcore-nio</artifactId>
738+
<version>${version.bom.org.apache.httpcomponents.httpcore}</version>
739+
</dependency>
740+
<dependency>
741+
<groupId>org.apache.httpcomponents</groupId>
742+
<artifactId>httpcore-osgi</artifactId>
743+
<version>${version.bom.org.apache.httpcomponents.httpcore}</version>
744+
</dependency>
745+
<dependency>
746+
<groupId>org.apache.httpcomponents</groupId>
747+
<artifactId>httpcore</artifactId>
748+
<version>${version.bom.org.apache.httpcomponents.httpcore}</version>
749+
</dependency>
750+
<dependency>
751+
<groupId>org.apache.httpcomponents</groupId>
752+
<artifactId>httpmime</artifactId>
753+
<version>${version.bom.org.apache.httpcomponents.httpclient}</version>
754+
</dependency>
637755
</dependencies>
638756
</dependencyManagement>
639757

@@ -909,6 +1027,26 @@
9091027
<artifactId>avro-codegen-test</artifactId>
9101028
<version>${version.bom.org.apache.avro}</version>
9111029
</dependency>
1030+
<dependency>
1031+
<groupId>org.apache.httpcomponents.core5</groupId>
1032+
<artifactId>httpcore5-parent</artifactId>
1033+
<version>${version.bom.org.apache.httpcomponents.core5}</version>
1034+
</dependency>
1035+
<dependency>
1036+
<groupId>org.apache.httpcomponents.core5</groupId>
1037+
<artifactId>httpcore5-testing</artifactId>
1038+
<version>${version.bom.org.apache.httpcomponents.core5}</version>
1039+
</dependency>
1040+
<dependency>
1041+
<groupId>org.apache.httpcomponents.client5</groupId>
1042+
<artifactId>httpclient5-parent</artifactId>
1043+
<version>${version.bom.org.apache.httpcomponents.client5}</version>
1044+
</dependency>
1045+
<dependency>
1046+
<groupId>org.apache.httpcomponents.client5</groupId>
1047+
<artifactId>httpclient5-testing</artifactId>
1048+
<version>${version.bom.org.apache.httpcomponents.client5}</version>
1049+
</dependency>
9121050
</dependenciesToSkip>
9131051
</dependencyManagementIncludesAllGroupIdArtifactsRule>
9141052
</rules>

‎build/parents/build/pom.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
<version.org.elasticsearch.java.client>9.1.5</version.org.elasticsearch.java.client>
5454
<version.org.opensearch.client>3.2.0</version.org.opensearch.client>
5555
<!-- 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>
5658
<version.org.apache.httpcomponents.httpclient>4.5.14</version.org.apache.httpcomponents.httpclient>
5759
<version.org.apache.httpcomponents.httpcore>4.4.16</version.org.apache.httpcomponents.httpcore>
5860
<version.org.apache.httpcomponents.httpasyncclient>4.1.5</version.org.apache.httpcomponents.httpasyncclient>
@@ -490,6 +492,17 @@
490492
<version>${version.org.elasticsearch.java.client}</version>
491493
</dependency>
492494

495+
<dependency>
496+
<groupId>org.apache.httpcomponents.client5</groupId>
497+
<artifactId>httpclient5</artifactId>
498+
<version>${version.org.apache.httpcomponents.client5}</version>
499+
</dependency>
500+
<dependency>
501+
<groupId>org.apache.httpcomponents.core5</groupId>
502+
<artifactId>httpcore5</artifactId>
503+
<version>${version.org.apache.httpcomponents.core5}</version>
504+
</dependency>
505+
493506
<!-- Lucene backend -->
494507
<dependency>
495508
<groupId>org.apache.lucene</groupId>

0 commit comments

Comments
 (0)