You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2022/08/12 13:35:12 UTC
[camel-karaf] 02/03: CAMEL-18344 - Fix camel-jira following google-http-client bundle changes
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-18344/add-camel-google-pubsub-and-camel-grpc
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 296a460db3e8d9b3c867bdcc108c728383c803e6
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Thu Aug 11 11:00:21 2022 +0200
CAMEL-18344 - Fix camel-jira following google-http-client bundle changes
---
platforms/karaf/features/src/main/resources/features.xml | 7 +++++--
pom.xml | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 11985201..36cb80f7 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1011,11 +1011,11 @@
<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.google.auth/google-auth-library-credentials/${grpc-google-auth-library-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.threeten/threetenbp/${google-cloud-threetenbp-version}</bundle>
- <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-api/${google-cloud-pubsub-opencensus-api-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-api/${google-http-client-opencensus-api-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.google.code.gson/gson/${gson-version}</bundle>
<bundle dependency='true'>wrap:mvn:io.perfmark/perfmark-api/${google-cloud-pubsub-perfmark-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.google-http-client/${google-http-client-bundle-version}</bundle>
- <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-contrib-http-util/${google-cloud-pubsub-opencensus-api-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-contrib-http-util/${google-http-client-opencensus-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.grpc/${google-cloud-pubsub-grpc-bundle-version}</bundle>
@@ -1236,6 +1236,9 @@
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpasyncclient-osgi/${httpasyncclient-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
<bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.code.gson/gson/${gson-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-api/${google-http-client-opencensus-api-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-contrib-http-util/${google-http-client-opencensus-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.google-http-client/${google-http-client-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guava/${jira-guava-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.atlassian-jira-client/${atlassian-jira-client-bundle-version}</bundle>
diff --git a/pom.xml b/pom.xml
index fcdf9144..5bcb6477 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,13 +185,13 @@
<google-cloud-pubsub-grpc-bundle-version>1.48.0_2-SNAPSHOT</google-cloud-pubsub-grpc-bundle-version>
<google-cloud-pubsub-guava-bundle-version>31.1_1</google-cloud-pubsub-guava-bundle-version>
<google-cloud-pubsub-perfmark-version>0.25.0</google-cloud-pubsub-perfmark-version>
- <google-cloud-pubsub-opencensus-api-version>0.31.1</google-cloud-pubsub-opencensus-api-version>
<google-cloud-iam-version>1.3.4</google-cloud-iam-version>
<google-cloud-threetenbp-version>1.6.0</google-cloud-threetenbp-version>
<google-findbugs-jsr305-version>3.0.2</google-findbugs-jsr305-version>
<google-findbugs-annotations2-version>2.0.3</google-findbugs-annotations2-version>
<google-gax-bundle-version>2.18.1_1-SNAPSHOT</google-gax-bundle-version>
<google-http-client-bundle-version>1.41.8_2-SNAPSHOT</google-http-client-bundle-version>
+ <google-http-client-opencensus-api-version>0.31.1</google-http-client-opencensus-api-version>
<google-proto-iam-version>1.3.4</google-proto-iam-version>
<google-truth-version>0.30</google-truth-version>
<groovy-version>3.0.8</groovy-version>