[camel] 01/02: CAMEL-14640: Upgrade guava eventbus

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 4eea22a486821fb79d04fc33eb1390cc3306984a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 4 11:49:25 2020 +0100

    CAMEL-14640: Upgrade guava eventbus
---
 components/camel-guava-eventbus/pom.xml                  | 1 +
 parent/pom.xml                                           | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/camel-guava-eventbus/pom.xml b/components/camel-guava-eventbus/pom.xml
index a771be5..de87826 100644
--- a/components/camel-guava-eventbus/pom.xml
+++ b/components/camel-guava-eventbus/pom.xml
@@ -42,6 +42,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <version>${guava-eventbus-version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 57309f4..86f256e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -265,6 +265,7 @@
         <grpc-errorprone-version>2.3.4</grpc-errorprone-version>
         <!-- 2.8.6 is broken in OSGi -->
         <gson-version>2.8.5</gson-version>
+        <guava-eventbus-version>28.1-jre</guava-eventbus-version>
         <guice3-version>3.0</guice3-version>
         <guice-bundle-version>3.0_1</guice-bundle-version>
         <hadoop-bundle-version>1.2.1_1</hadoop-bundle-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 5975dd4..d099309 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1193,7 +1193,8 @@
   </feature>
   <feature name='camel-guava-eventbus' version='${project.version}' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
-    <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+    <bundle dependency='true'>mvn:com.google.guava/guava/${guava-eventbus-version}</bundle>
+    <bundle dependency='true'>mvn:com.google.guava/failureaccess/1.0.1</bundle>
     <bundle>mvn:org.apache.camel/camel-guava-eventbus/${project.version}</bundle>
   </feature>
   <feature name='camel-hazelcast' version='${project.version}' start-level='50'>