You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/11/11 12:23:37 UTC
[camel] branch master updated: [CAMEL-14165] Pubnub does not define
its dependency on okio
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 2fcb6e0 [CAMEL-14165] Pubnub does not define its dependency on okio
2fcb6e0 is described below
commit 2fcb6e0eb208ca7ed8e4a4219dcebeb95c92d8da
Author: Thomas Diesler <td...@redhat.com>
AuthorDate: Mon Nov 11 13:05:26 2019 +0100
[CAMEL-14165] Pubnub does not define its dependency on okio
---
components/camel-pubnub/pom.xml | 7 ++++++-
parent/pom.xml | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml
index 8a9d0cd..0c250d7 100644
--- a/components/camel-pubnub/pom.xml
+++ b/components/camel-pubnub/pom.xml
@@ -50,7 +50,12 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
- <version>${squareup-okhttp-pubnub-version}</version>
+ <version>${squareup-okhttp-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ <version>${squareup-okio-version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 15e3b35..0001023 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -605,7 +605,8 @@
<spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! -->
<spymemcached-version>2.12.0</spymemcached-version>
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
- <squareup-okhttp-pubnub-version>3.12.0</squareup-okhttp-pubnub-version>
+ <squareup-okhttp-version>3.12.0</squareup-okhttp-version>
+ <squareup-okio-version>1.15.0</squareup-okio-version>
<squareup-okhttp-bundle-version>2.7.5_1</squareup-okhttp-bundle-version>
<squareup-okio-bundle-version>1.15.0_1</squareup-okio-bundle-version>
<squareup-retrofit2-bundle-version>2.5.0_2</squareup-retrofit2-bundle-version>