You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/07/22 09:16:10 UTC
[camel] branch main updated: Remove duplicate version for okclient (#10782)
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 ae11ccb6967 Remove duplicate version for okclient (#10782)
ae11ccb6967 is described below
commit ae11ccb6967b97019eb4f08b342cad849f9854da
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Jul 22 11:16:05 2023 +0200
Remove duplicate version for okclient (#10782)
---
components/camel-jetty/pom.xml | 2 +-
components/camel-olingo2/camel-olingo2-component/pom.xml | 2 +-
components/camel-salesforce/camel-salesforce-component/pom.xml | 2 +-
parent/pom.xml | 1 -
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index c6b815729b0..2b180d3c756 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -145,7 +145,7 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
- <version>${okclient-version}</version>
+ <version>${squareup-okhttp-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index b80536dae32..5d04779f8a7 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -88,7 +88,7 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
- <version>${okclient-version}</version>
+ <version>${squareup-okhttp-version}</version>
<scope>test</scope>
</dependency>
<!-- forcing okhttp v3.x related to https://issues.apache.org/jira/browse/CAMEL-16336 -->
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 72c8e519bcd..af3905a5e6c 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -230,7 +230,7 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
- <version>${okclient-version}</version>
+ <version>${squareup-okhttp-version}</version>
<scope>test</scope>
</dependency>
<!-- forcing okhttp v3.x related to https://issues.apache.org/jira/browse/CAMEL-16336 -->
diff --git a/parent/pom.xml b/parent/pom.xml
index b4426e8ff76..47fa62d1aff 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -362,7 +362,6 @@
<networknt-json-schema-validator-version>1.0.86</networknt-json-schema-validator-version>
<nimbus-jose-jwt>9.31</nimbus-jose-jwt>
<nitrite-version>3.4.4</nitrite-version>
- <okclient-version>3.14.9</okclient-version>
<olingo2-version>2.0.12</olingo2-version>
<olingo4-version>4.9.0</olingo4-version>
<ognl-version>3.4.0</ognl-version>