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 08:45:23 UTC
[camel] branch okc created (now f08b6cc17d0)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch okc
in repository https://gitbox.apache.org/repos/asf/camel.git
at f08b6cc17d0 Remove duplicate version for okclient
This branch includes the following new commits:
new f08b6cc17d0 Remove duplicate version for okclient
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 01/01: Remove duplicate version for okclient
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch okc
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f08b6cc17d0c2cdac972785eac3a43787fe2fe24
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Jul 22 10:45:11 2023 +0200
Remove duplicate version for okclient
---
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>