[camel] 01/02: CAMEL-12564: camel-grpc: Bump to version 1.12.0

[dmvolod]

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

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

commit 5d61513e441c609c9123a83722f26484019212ca
Author: Dmitry Volodin <dmvo...@gmail.com>
AuthorDate: Tue Jun 12 01:34:52 2018 +0300

    CAMEL-12564: camel-grpc: Bump to version 1.12.0
---
 components/camel-grpc/pom.xml                            | 6 ++++++
 parent/pom.xml                                           | 7 ++++---
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 906b3e9..22f03e2 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -70,6 +70,12 @@
       <artifactId>javassist</artifactId>
       <version>${javassist-version}</version>
     </dependency>
+    
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${grpc-guava-version}</version>
+    </dependency>
 
     <dependency>
       <groupId>io.netty</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0363ec4..bc1691f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -269,12 +269,13 @@
     <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.10.1</grpc-version>
+    <grpc-version>1.12.0</grpc-version>
     <grpc-google-auth-library-version>0.9.0</grpc-google-auth-library-version>
+    <grpc-guava-version>20.0</grpc-guava-version>
     <grpc-java-jwt-version>3.2.0</grpc-java-jwt-version>
     
<grpc-netty-tcnative-boringssl-static-version>2.0.7.Final</grpc-netty-tcnative-boringssl-static-version>
-    <grpc-bundle-version>1.10.1_1</grpc-bundle-version>
-    <grpc-errorprone-version>2.1.3</grpc-errorprone-version>
+    <grpc-bundle-version>1.12.0_1</grpc-bundle-version>
+    <grpc-errorprone-version>2.2.0</grpc-errorprone-version>
     <gson-version>2.8.5</gson-version>
     <guice-version>4.0</guice-version>
     <guice3-version>3.0</guice3-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index d88a9e8..e3dc893 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -846,7 +846,7 @@
     <bundle 
dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle>
     <bundle 
dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
     <bundle 
dependency='true'>mvn:io.netty/netty-tcnative-boringssl-static/${grpc-netty-tcnative-boringssl-static-version}</bundle>
-    <bundle 
dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+    <bundle 
dependency='true'>mvn:com.google.guava/guava/${grpc-guava-version}</bundle>
     <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>

-- 
To stop receiving notification emails like this one, please contact
dmvo...@apache.org.