Repository: camel Updated Branches: refs/heads/master 624b8a735 -> 07a14ae4c
Upgrade Protobuf to version 3.0.2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07a14ae4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07a14ae4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07a14ae4 Branch: refs/heads/master Commit: 07a14ae4c6c6d9acb7b0e593789383dd7ba8407c Parents: 624b8a7 Author: Andrea Cosentino <[email protected]> Authored: Fri Sep 9 09:36:36 2016 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Fri Sep 9 09:36:56 2016 +0200 ---------------------------------------------------------------------- parent/pom.xml | 3 ++- platforms/karaf/features/src/main/resources/features.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/07a14ae4/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f488b98..65c7f8a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -235,6 +235,7 @@ <hadoop-version>1.2.1</hadoop-version> <hadoop2-bundle-version>2.7.2_1</hadoop2-bundle-version> <hadoop2-version>2.7.2</hadoop2-version> + <hadoop2-protobuf-version>2.5.0</hadoop2-protobuf-version> <hamcrest-version>2.0.0.0</hamcrest-version> <hapi-version>2.2</hapi-version> <hawtbuf-version>1.11</hawtbuf-version> @@ -473,7 +474,7 @@ <pdfbox-version>1.8.11</pdfbox-version> <pgjdbc-ng-driver-version>0.6</pgjdbc-ng-driver-version> <powermock-version>1.6.1</powermock-version> - <protobuf-version>3.0.0</protobuf-version> + <protobuf-version>3.0.2</protobuf-version> <qpid-bundle-version>0.28_1</qpid-bundle-version> <qpid-version>0.28</qpid-version> <qpid-proton-j-version>0.13.0</qpid-proton-j-version> http://git-wip-us.apache.org/repos/asf/camel/blob/07a14ae4/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 51e1d60..302eb29 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -707,7 +707,7 @@ <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> - <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle> + <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${hadoop2-protobuf-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guice/${guice-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle>
