This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new 51f1f758b57 CAMEL-18344: camel-google-pubsub - Open guava version for
OSGI bundle (#8167)
51f1f758b57 is described below
commit 51f1f758b576a461b2062350feaf5cbb4d7c27d6
Author: Nicolas Filotto <essob...@users.noreply.github.com>
AuthorDate: Thu Aug 18 09:24:43 2022 +0200
CAMEL-18344: camel-google-pubsub - Open guava version for OSGI bundle
(#8167)
## Motivation
To be able to re-include the feature `camel-google-pubsub` in camel-karaf,
I would need to make the bundle more flexible by opening the version of guava
## Modifications
* Indicates a starting version of google guava to allow more recent
versions that are also compatible
---
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 01f6bca3a9c..a982a667da7 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -226,7 +226,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 136eb5e2a26..6b92feaa58a 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 fe455e63449..54682b0b083 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -210,7 +210,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>
