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:30:38 UTC
[camel] 01/01: CAMEL-18344: camel-google-pubsub - Open guava version for OSGI bundle
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-18344/open-guava-version
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3c5ceaf90cbe2e40a21e3ee037b7515a40efd92a
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Thu Aug 11 17:38:13 2022 +0200
CAMEL-18344: camel-google-pubsub - Open guava version for OSGI bundle
---
camel-dependencies/pom.xml | 3 ++-
components/camel-google/camel-google-pubsub/pom.xml | 1 +
parent/pom.xml | 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 9fc50389c24..2ea074a899d 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -228,7 +228,8 @@
<google-cloud-bom-version>25.4.0</google-cloud-bom-version>
<google-cloud-functions-bom-version>1.0.8</google-cloud-functions-bom-version>
<google-cloud-functions-gax-grpc-version>1.62.0</google-cloud-functions-gax-grpc-version>
- <google-cloud-guava-version>30.1-jre</google-cloud-guava-version>
+ <google-cloud-guava-version>${google-cloud-guava-version-prefix}-jre</google-cloud-guava-version>
+ <google-cloud-guava-version-prefix>30.1</google-cloud-guava-version-prefix>
<google-cloud-secretmanager-bom-version>2.1.1</google-cloud-secretmanager-bom-version>
<google-guava-version>20.0</google-guava-version>
<google-maps-services-version>0.10.1</google-maps-services-version>
diff --git a/components/camel-google/camel-google-pubsub/pom.xml b/components/camel-google/camel-google-pubsub/pom.xml
index cfa65f2cdc1..c236fa0a2c7 100644
--- a/components/camel-google/camel-google-pubsub/pom.xml
+++ b/components/camel-google/camel-google-pubsub/pom.xml
@@ -36,6 +36,7 @@
<schemeName>google-pubsub</schemeName>
<componentName>GooglePubSub</componentName>
<componentPackage>org.apache.camel.component.google.pubsub</componentPackage>
+ <camel.osgi.import>com.google.common*;version="${google-cloud-guava-version-prefix}",*</camel.osgi.import>
</properties>
<dependencyManagement>
diff --git a/parent/pom.xml b/parent/pom.xml
index eb72f16109a..a1385427cc3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -211,7 +211,8 @@
<google-cloud-bom-version>25.4.0</google-cloud-bom-version>
<google-cloud-functions-bom-version>1.0.8</google-cloud-functions-bom-version>
<google-cloud-functions-gax-grpc-version>1.62.0</google-cloud-functions-gax-grpc-version>
- <google-cloud-guava-version>30.1-jre</google-cloud-guava-version>
+ <google-cloud-guava-version-prefix>30.1</google-cloud-guava-version-prefix>
+ <google-cloud-guava-version>${google-cloud-guava-version-prefix}-jre</google-cloud-guava-version>
<google-cloud-secretmanager-bom-version>2.1.1</google-cloud-secretmanager-bom-version>
<graaljs-version>22.1.0</graaljs-version>
<graphql-java-version>18.2</graphql-java-version>