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/08/05 06:48:37 UTC
[camel] branch master updated: Upgrade GRPC and related bundles to
version 1.22.1
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 a0db603 Upgrade GRPC and related bundles to version 1.22.1
a0db603 is described below
commit a0db603cb3c7ebbd76ba6792646ed9a70aa71f3c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 08:48:10 2019 +0200
Upgrade GRPC and related bundles to version 1.22.1
---
parent/pom.xml | 5 +++--
platforms/karaf/features/src/main/resources/features.xml | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 04de7e8..2e50c92 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -235,12 +235,12 @@
<google-mail-guava-version>17.0</google-mail-guava-version>
<google-truth-version>0.30</google-truth-version>
<grizzly-websockets-version>2.3.25</grizzly-websockets-version>
- <grpc-version>1.22.0</grpc-version>
+ <grpc-version>1.22.1</grpc-version>
<grpc-google-auth-library-version>0.13.0</grpc-google-auth-library-version>
<grpc-guava-version>26.0-android</grpc-guava-version>
<grpc-java-jwt-version>3.7.0</grpc-java-jwt-version>
<grpc-netty-tcnative-boringssl-static-version>2.0.25.Final</grpc-netty-tcnative-boringssl-static-version>
- <grpc-bundle-version>1.21.0_1</grpc-bundle-version>
+ <grpc-bundle-version>1.22.1_1</grpc-bundle-version>
<grpc-errorprone-version>2.3.2</grpc-errorprone-version>
<gson-version>2.8.5</gson-version>
<guice3-version>3.0</guice3-version>
@@ -509,6 +509,7 @@
<pax-tiny-bundle-version>1.3.2</pax-tiny-bundle-version>
<pax-logging-version>1.8.6</pax-logging-version>
<pdfbox-version>2.0.16</pdfbox-version>
+ <perfmark-version>0.17.0</perfmark-version>
<pgjdbc-driver-version>42.2.6</pgjdbc-driver-version>
<pgjdbc-ng-driver-version>0.8.2</pgjdbc-ng-driver-version>
<properties-maven-plugin-version>1.0-alpha-2</properties-maven-plugin-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 85f4af8..c87f8af 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1168,6 +1168,7 @@
<bundle dependency='true'>wrap:mvn:com.google.errorprone/error_prone_annotations/${grpc-errorprone-version}</bundle>
<!-- Third party dependencies -->
<bundle dependency='true'>mvn:org.javassist/javassist/${javassist-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:io.perfmark/perfmark-api/${perfmark-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.auth0/java-jwt/${grpc-java-jwt-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-credentials/${grpc-google-auth-library-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${grpc-google-auth-library-version}</bundle>