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 10:55:26 UTC
[camel] branch master updated (dd4557a -> c8a8749)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from dd4557a Fix build
new 4eea22a CAMEL-14640: Upgrade guava eventbus
new c8a8749 Upgrade guava
The 2 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.
Summary of changes:
components/camel-guava-eventbus/pom.xml | 1 +
parent/pom.xml | 7 ++++---
platforms/karaf/features/src/main/resources/features.xml | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
[camel] 01/02: CAMEL-14640: Upgrade guava eventbus
Posted by 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'>
[camel] 02/02: Upgrade guava
Posted by 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 c8a874920323f4b6431436fe9289695919e0f099
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 4 11:55:02 2020 +0100
Upgrade guava
---
parent/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 86f256e..ead5121 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -233,7 +233,7 @@
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<gmetric4j-version>1.0.10</gmetric4j-version>
<google-guava-version>19.0</google-guava-version>
- <google-pubsub-guava-version>28.1-jre</google-pubsub-guava-version>
+ <google-pubsub-guava-version>28.2-jre</google-pubsub-guava-version>
<google-api-client-version>1.22.0</google-api-client-version>
<google-api-common-version>1.8.1</google-api-common-version>
<google-api-services-drive-version>v2-rev297-1.22.0</google-api-services-drive-version>
@@ -258,14 +258,14 @@
<grizzly-websockets-version>2.3.25</grizzly-websockets-version>
<grpc-version>1.27.0</grpc-version>
<grpc-google-auth-library-version>0.19.0</grpc-google-auth-library-version>
- <grpc-guava-version>28.1-jre</grpc-guava-version>
+ <grpc-guava-version>28.2-jre</grpc-guava-version>
<grpc-java-jwt-version>3.7.0</grpc-java-jwt-version>
<grpc-netty-tcnative-boringssl-static-version>2.0.26.Final</grpc-netty-tcnative-boringssl-static-version>
<grpc-bundle-version>1.27.0_1</grpc-bundle-version>
<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>
+ <guava-eventbus-version>28.2-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>
@@ -540,7 +540,7 @@
<pgjdbc-ng-driver-version>0.8.3</pgjdbc-ng-driver-version>
<properties-maven-plugin-version>1.0-alpha-2</properties-maven-plugin-version>
<protobuf-version>3.11.1</protobuf-version>
- <protobuf-guava-version>28.1-jre</protobuf-guava-version>
+ <protobuf-guava-version>28.2-jre</protobuf-guava-version>
<protobuf-javanano-version>3.1.0</protobuf-javanano-version>
<protobuf-maven-plugin-version>0.6.1</protobuf-maven-plugin-version>
<protonpack-version>1.8</protonpack-version>