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 cd7942cf0053f480334b05c1df46449961fa6d52 Author: Dmitry Volodin <dmvo...@gmail.com> AuthorDate: Wed Jun 26 15:18:54 2019 +0300 CAMEL-13209: Upgrade to gRPC 1.21.0 and fix SpringBoot test --- parent/pom.xml | 4 ++-- .../org/apache/camel/itest/springboot/util/ArquillianPackager.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1ba5236..864f7ce 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -258,12 +258,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.20.0</grpc-version> + <grpc-version>1.21.0</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.22.Final</grpc-netty-tcnative-boringssl-static-version> - <grpc-bundle-version>1.20.0_1</grpc-bundle-version> + <grpc-bundle-version>1.21.0_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> diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java index 1104859..fd43610 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java @@ -309,6 +309,7 @@ public final class ArquillianPackager { ignore.add("io.netty:netty:jar"); // an old version ignore.add("io.netty:netty-tcnative-boringssl-static"); ignore.add("io.swagger:swagger-parser"); + ignore.add("io.opencensus:opencensus-"); ignore.add("io.opentracing.contrib:opentracing-"); ignore.add("org.apache.commons"); ignore.add("org.apache.curator");