You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dm...@apache.org on 2019/06/26 19:17:35 UTC
[camel] 12/12: CAMEL-13209: Fix Karaf tests close #2924
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 58330e68dfad063b2354a3e6de69c6945f451edb
Author: Dmitry Volodin <dm...@gmail.com>
AuthorDate: Wed Jun 26 22:13:43 2019 +0300
CAMEL-13209: Fix Karaf tests
close #2924
---
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 5eb6cae..dad458d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -562,6 +562,7 @@
<pgjdbc-ng-driver-version>0.8.2</pgjdbc-ng-driver-version>
<properties-maven-plugin-version>1.0-alpha-2</properties-maven-plugin-version>
<protobuf-version>3.7.1</protobuf-version>
+ <protobuf-guava-version>20.0</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>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index c468e0e..da58a8a 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1167,9 +1167,10 @@
<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:com.auth0/java-jwt/${grpc-java-jwt-version}</bundle>
- <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${grpc-google-auth-library-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>
+ <bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}</bundle>
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
<bundle dependency='true'>mvn:com.google.protobuf.nano/protobuf-javanano/${protobuf-javanano-version}</bundle>
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java-util/${protobuf-version}</bundle>
@@ -2020,7 +2021,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/${google-guava-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${protobuf-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>