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 2020/03/04 11:34:04 UTC
[camel] branch master updated: CAMEL-14640: Upgrade guava
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
The following commit(s) were added to refs/heads/master by this push:
new a87aa7b CAMEL-14640: Upgrade guava
a87aa7b is described below
commit a87aa7bb1c6dd7869f3ed86379b7be121e6d17f4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 4 12:33:42 2020 +0100
CAMEL-14640: Upgrade guava
---
components/camel-wordpress/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index aa007cf..60f66e8 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -107,6 +107,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <version>${guava-eventbus-version}</version>
</dependency>
</dependencies>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index d099309..ab210c0 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2654,7 +2654,8 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.woodstox/stax2-api/${stax2v4-api-bundle-version}</bundle>
- <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-wordpress/${project.version}</bundle>
</feature>
<feature name='camel-workday' version='${project.version}' start-level='50'>