[camel] 03/04: Upgrade Protobuf to version 3.4.0

[acosentino]

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

commit a210ec1da28feab9847ff8b335ed0506b095421f
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Dec 22 12:03:32 2017 +0100

    Upgrade Protobuf to version 3.4.0
---
 parent/pom.xml                                           | 2 +-
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 4cee977..49d97ed 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -560,7 +560,7 @@
     <pdfbox18-version>1.8.13</pdfbox18-version>
     <pdfbox-version>2.0.8</pdfbox-version>
     <pgjdbc-ng-driver-version>0.7.1</pgjdbc-ng-driver-version>
-    <protobuf-version>3.3.0</protobuf-version>
+    <protobuf-version>3.4.0</protobuf-version>
     <protobuf-guava-version>20.0</protobuf-guava-version>
     <protobuf-maven-plugin-version>0.5.0</protobuf-maven-plugin-version>
     <protonpack-version>1.8</protonpack-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 096cf8e..f3328aa 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1750,7 +1750,7 @@
     <bundle 
dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
     <bundle 
dependency='true'>mvn:com.google.protobuf/protobuf-java-util/${protobuf-version}</bundle>
     <bundle 
dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
-    <bundle 
dependency='true'>mvn:com.google.guava/guava/${protobuf-guava-version}</bundle>
+    <bundle 
dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
     <bundle 
dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-protobuf/${project.version}</bundle>
   </feature>

-- 
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <commits@camel.apache.org>.