Skip to content

Commit ad96c08

Browse files
committed
Fix apache httpclient to version 4.5.13
Managing and fixing the http client to a specific version works around resolving the dependency to different versions in plugins. This would cause unexpected problems as described in aws/aws-sdk-java-v2#1795
1 parent 918a6a9 commit ad96c08

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

graylog-project-parent/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,11 @@
564564
<artifactId>unboundid-ldapsdk</artifactId>
565565
<version>${unboundid-ldap.version}</version>
566566
</dependency>
567+
<dependency>
568+
<groupId>org.apache.httpcomponents</groupId>
569+
<artifactId>httpclient</artifactId>
570+
<version>${apache-httpclient.version}</version>
571+
</dependency>
567572

568573
<!-- Test dependencies -->
569574
<dependency>

graylog2-server/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,10 @@
673673
<version>1.5.0</version>
674674
<scope>test</scope>
675675
</dependency>
676+
<dependency>
677+
<groupId>org.apache.httpcomponents</groupId>
678+
<artifactId>httpclient</artifactId>
679+
</dependency>
676680
</dependencies>
677681

678682
<build>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
<amqp-client.version>5.8.0</amqp-client.version>
9191
<antlr.version>4.8-1</antlr.version>
9292
<apache-directory-version>1.0.3</apache-directory-version>
93+
<apache-httpclient.version>4.5.13</apache-httpclient.version>
9394
<auto-value.version>1.7.4</auto-value.version>
9495
<auto-value-javabean.version>2.5.2</auto-value-javabean.version>
9596
<bouncycastle.version>1.64</bouncycastle.version>

0 commit comments

Comments
 (0)