feat(connect): upgrade to apache httpclient 5.x

- consolidate version.httpclient property
camunda · Nov 13, 2024 · 297d773 · 297d773
1 parent 0136734
commit 297d773
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/clients/java/client/pom.xml b/clients/java/client/pom.xml
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>
       <artifactId>httpclient5</artifactId>
-      <version>${version.httpclient5}</version>
+      <version>${version.httpclient}</version>
     </dependency>
 
     <dependency>

diff --git a/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java b/connect/http-client/src/test/java/org/camunda/connect/httpclient/HttpResponseTest.java
@@ -94,7 +94,7 @@ protected HttpResponse getResponse() {
   @Test
   public void testSuccessfulResponseCode() {
     // given
-    testResponse.statusCode(200);
+    testResponse.code(200);
     // when
     HttpResponse response = getResponse();
     // then
@@ -104,7 +104,7 @@ public void testSuccessfulResponseCode() {
   @Test
   public void testResponseErrorCodeForMalformedRequest() {
     // given
-    testResponse.statusCode(400);
+    testResponse.code(400);
     // when
     HttpResponse response = getResponse();
     // then
@@ -114,7 +114,7 @@ public void testResponseErrorCodeForMalformedRequest() {
   @Test
   public void testResponseErrorCodeForServerError() {
     // given
-    testResponse.statusCode(500);
+    testResponse.code(500);
     // when
     HttpResponse response = getResponse();
     // then
@@ -124,7 +124,7 @@ public void testResponseErrorCodeForServerError() {
   @Test
   public void testServerErrorResponseWithConfigOptionSet() {
     // given
-    testResponse.statusCode(500);
+    testResponse.code(500);
     try {
       // when
       connector.createRequest().configOption("throw-http-error", "TRUE").url("http://camunda.com").get().execute();
@@ -138,7 +138,7 @@ public void testServerErrorResponseWithConfigOptionSet() {
   @Test
   public void testMalformedRequestWithConfigOptionSet() {
     // given
-    testResponse.statusCode(400);
+    testResponse.code(400);
     try {
       // when
       connector.createRequest().configOption("throw-http-error", "TRUE").url("http://camunda.com").get().execute();
@@ -152,7 +152,7 @@ public void testMalformedRequestWithConfigOptionSet() {
   @Test
   public void testSuccessResponseWithConfigOptionSet() {
     // given
-    testResponse.statusCode(200);
+    testResponse.code(200);
     // when
     connector.createRequest().configOption("throw-http-error", "TRUE").url("http://camunda.com").get().execute();
     // then
@@ -163,7 +163,7 @@ public void testSuccessResponseWithConfigOptionSet() {
   @Test
   public void testMalformedRequestWithConfigOptionSetToFalse() {
     // given
-    testResponse.statusCode(400);
+    testResponse.code(400);
     // when
     connector.createRequest().configOption("throw-http-error", "FALSE").url("http://camunda.com").get().execute();
     // then

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -42,8 +42,7 @@
     <version.xml.jaxb-impl>2.3.6</version.xml.jaxb-impl>
     <version.xml.jaxb-impl4>4.0.5</version.xml.jaxb-impl4>
     <version.jakarta.xml.bind-api>4.0.2</version.jakarta.xml.bind-api>
-    <version.httpclient>4.5.14</version.httpclient>
-    <version.httpclient5>5.3</version.httpclient5>
+    <version.httpclient>5.4</version.httpclient>
 
     <version.slf4j>1.7.26</version.slf4j>
     <version.logback>1.2.11</version.logback>

diff --git a/spring-boot-starter/starter-security/pom.xml b/spring-boot-starter/starter-security/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>
       <artifactId>httpclient5</artifactId>
-      <version>${version.httpclient5}</version>
+      <version>${version.httpclient}</version>
       <scope>test</scope>
     </dependency>
     <dependency>