You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2020/05/12 16:13:32 UTC
[camel-quarkus] 03/06: Follow Camel with the kubernetes-client
version
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 780e06efe4e9519dbb001d8121952161daa57f50
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Mon May 11 17:21:06 2020 +0200
Follow Camel with the kubernetes-client version
---
extensions/kubernetes/deployment/pom.xml | 4 ++++
extensions/kubernetes/runtime/pom.xml | 14 ++++++++++++++
pom.xml | 3 +++
poms/bom/pom.xml | 22 +++++++++++++++++-----
4 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/extensions/kubernetes/deployment/pom.xml b/extensions/kubernetes/deployment/pom.xml
index 9cba2a4..32b2eb6 100644
--- a/extensions/kubernetes/deployment/pom.xml
+++ b/extensions/kubernetes/deployment/pom.xml
@@ -52,6 +52,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-commons-logging-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-kubernetes</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/kubernetes/runtime/pom.xml b/extensions/kubernetes/runtime/pom.xml
index 86ddd22..7d2f792 100644
--- a/extensions/kubernetes/runtime/pom.xml
+++ b/extensions/kubernetes/runtime/pom.xml
@@ -50,12 +50,26 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.sundr</groupId><!-- Workaround for https://github.com/fabric8io/kubernetes-client/issues/2195 -->
+ <artifactId>builder-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-commons-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-kubernetes</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index c068dd8..e3c3c44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,9 +63,12 @@
<java.xml.ws.version>2.3.1</java.xml.ws.version>
<javassist.version>3.22.0-CR2</javassist.version><!-- debezium -->
<jetty.version>9.4.18.v20190429</jetty.version>
+ <kubernetes-client.version>4.10.1</kubernetes-client.version>
<kotlin.version>1.3.72</kotlin.version>
<kubernetes-client.version>4.9.0</kubernetes-client.version>
<mongodb.version>4.0.1</mongodb.version>
+ <okhttp.version>3.14.6</okhttp.version><!-- keep in sync with okio -->
+ <okio.version>1.17.2</okio.version><!-- keep in sync with okhttp -->
<quarkus.version>1.4.2.Final</quarkus.version>
<quarkus-qpid-jms.version>0.14.1</quarkus-qpid-jms.version>
<protobuf.version>3.11.1</protobuf.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index b22d7c2..9e5c694 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -47,6 +47,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency><!-- this needs to occur before quarkus-bom to get a higher prio -->
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-client-bom</artifactId>
+ <version>${kubernetes-client.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bom</artifactId>
@@ -2009,6 +2016,16 @@
<version>${consul-client.version}</version>
</dependency>
<dependency>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ <version>${okio.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${okhttp.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>converter-jackson</artifactId>
<version>${retrofit.version}</version>
@@ -2040,11 +2057,6 @@
<version>${debezium.version}</version>
</dependency>
<dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>kubernetes-client</artifactId>
- <version>${kubernetes-client.version}</version>
- </dependency>
- <dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>${java.xml.ws.version}</version>