This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 6b830903d1ae chore: upgrade okhttp3 in camel-salesforce-component
(#23073)
6b830903d1ae is described below
commit 6b830903d1ae71716590dc9c0ffcecbb3ed3ed4f
Author: Torsten Mielke <[email protected]>
AuthorDate: Thu May 7 19:27:42 2026 +0200
chore: upgrade okhttp3 in camel-salesforce-component (#23073)
* chore: upgrade okhttp to version 5.x
Upgrading dependency com.squareup.okhttp3:okhttp to latest 5.3.2 version
(already defined in parent/pom.xml) as currently used version
3.14.9 is 6 years old!
This updates camel-jetty and camel-olingo2 to use
com.squareup.okhttp3:okhttp-jvm:5.3.2.
Component camel-huaweicloud-obs references okhttp3 as compile time
dependency but it is
not used there at all. So okhttp3 got removed as a dependency there.
All unit tests of these components pass, with the exception of
JettySessionSupportTest
in camel-jetty. However this test fails for me on main branch as well and
does not
use okhttp classes in any way.
The only component left to use com.squareup.okhttp3:okhttp:3.14.9 is
camel-salesforce.
A quick attempt to upgrade to version 5.3.2 here as well failed and breaks
many unit
tests. So this component will require a separate investigation.
Made with help from AI tools.
* chore: upgrade okhttp3 in camel-salesforce-component
Upgrading dependency com.squareup.okhttp3:okhttp to latest 5.3.2 version
(already defined in parent/pom.xml)
as currently used version 3.14.9 is 6 years old!
This updates camel-salesforce/camel-salesforce-component to use
com.squareup.okhttp3:okhttp-jvm:5.3.2 and
com.squareup.okhttp3:mockwebserver3:5.2.
An update to unit test RawPayloadTest was needed for the tests to pass.
With this upgrade, no other Camel component or module depends on property
${squareup-okhttp-version}
as defined in parent/pom.xml. So removing this property entirely, relying
only on ${squareup-okhttp5-version}.
All of Camel rebuilt successfully with the property removed from
parent/pom.xml.
Made with help from AI tools.
---------
Co-authored-by: Torsten Mielke <[email protected]>
---
.../camel-salesforce-component/pom.xml | 9 +++--
.../camel/component/salesforce/RawPayloadTest.java | 39 ++++++++++++++--------
parent/pom.xml | 1 -
3 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml
b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 9fffca89b7cd..2de4c574c01b 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -208,15 +208,14 @@
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
- <artifactId>mockwebserver</artifactId>
- <version>${squareup-okhttp-version}</version>
+ <artifactId>mockwebserver3</artifactId>
+ <version>${squareup-okhttp5-version}</version>
<scope>test</scope>
</dependency>
- <!-- forcing okhttp v3.x related to
https://issues.apache.org/jira/browse/CAMEL-16336 -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>${squareup-okhttp-version}</version>
+ <artifactId>okhttp-jvm</artifactId>
+ <version>${squareup-okhttp5-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java
index 61a769f3cf10..7569f7e7b8e8 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RawPayloadTest.java
@@ -23,11 +23,11 @@ import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import mockwebserver3.Dispatcher;
+import mockwebserver3.MockResponse;
+import mockwebserver3.MockWebServer;
+import mockwebserver3.RecordedRequest;
import okhttp3.HttpUrl;
-import okhttp3.mockwebserver.Dispatcher;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit6.params.Parameter;
import org.apache.camel.test.junit6.params.Parameterized;
@@ -53,6 +53,7 @@ public class RawPayloadTest extends
AbstractSalesforceTestBase {
public static String endpointUri;
private static final String OAUTH2_TOKEN_PATH = "/services/oauth2/token";
+ private static final String OAUTH2_REVOKE_PATH = "/services/oauth2/revoke";
private static final String XML_RESPONSE = "<response/>";
private static final String JSON_RESPONSE = "{ \"response\" : \"mock\" }";
@@ -88,7 +89,7 @@ public class RawPayloadTest extends
AbstractSalesforceTestBase {
public static void shutDownServer() throws IOException {
// shutdown mock server
if (server != null) {
- server.shutdown();
+ server.close();
}
}
@@ -101,16 +102,28 @@ public class RawPayloadTest extends
AbstractSalesforceTestBase {
server.setDispatcher(new Dispatcher() {
@Override
public MockResponse dispatch(RecordedRequest recordedRequest)
throws InterruptedException {
- if (recordedRequest.getPath().equals(OAUTH2_TOKEN_PATH)) {
- return new MockResponse().setResponseCode(200)
- .setBody(
+ if
(recordedRequest.getUrl().encodedPath().equals(OAUTH2_TOKEN_PATH)) {
+ return new MockResponse.Builder()
+ .code(200)
+ .body(
"{ \"access_token\": \"mock_token\",
\"id\":
\"https://login.salesforce.com/id/00D4100000xxxxxxxx/0054100000xxxxxxxx\";,
\"instance_url\": \""
- + loginUrl + "\"}");
+ + loginUrl + "\"}")
+ .build();
+ } else if
(recordedRequest.getUrl().encodedPath().equals(OAUTH2_REVOKE_PATH)) {
+ // Handle logout/revoke request
+ return new MockResponse.Builder()
+ .code(200)
+ .body("")
+ .build();
} else {
- return new MockResponse().setResponseCode(200)
- .setHeader(HttpHeader.CONTENT_TYPE.toString(),
-
recordedRequest.getHeader(HttpHeader.CONTENT_TYPE.toString()))
- .setBody("XML".equals(format) ? XML_RESPONSE :
JSON_RESPONSE);
+ String contentType =
recordedRequest.getHeaders().get(HttpHeader.CONTENT_TYPE.toString());
+ MockResponse.Builder builder = new MockResponse.Builder()
+ .code(200)
+ .body("XML".equals(format) ? XML_RESPONSE :
JSON_RESPONSE);
+ if (contentType != null) {
+ builder.addHeader(HttpHeader.CONTENT_TYPE.toString(),
contentType);
+ }
+ return builder.build();
}
}
});
diff --git a/parent/pom.xml b/parent/pom.xml
index 2d2b0c95392e..c2028d92fe87 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -488,7 +488,6 @@
<spring-security-version>7.0.5</spring-security-version>
<spring-ws-version>5.0.1</spring-ws-version>
<sql-maven-plugin-version>3.0.0</sql-maven-plugin-version>
- <squareup-okhttp-version>3.14.9</squareup-okhttp-version>
<squareup-okhttp5-version>5.3.2</squareup-okhttp5-version>
<squareup-okio-version>1.17.5</squareup-okio-version>
<sshd-version>2.17.1</sshd-version>
