This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 0e69d7f9 Add missing bundles for camel-google-pubsub feature (#292)
0e69d7f9 is described below
commit 0e69d7f95d9edc627a93a7890bdc64e224f3920d
Author: lopushen <[email protected]>
AuthorDate: Wed May 22 10:37:09 2024 +0300
Add missing bundles for camel-google-pubsub feature (#292)
Co-authored-by: Yevhenii Lopushen <[email protected]>
---
features/src/main/feature/camel-features.xml | 39 +++++++++++++++++++++++-----
pom.xml | 3 +++
2 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index ecf517dc..854af5e6 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -1007,20 +1007,45 @@
<bundle
dependency='true'>wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}</bundle>
<bundle
dependency='true'>wrap:mvn:com.google.apis/google-api-services-gmail/${google-api-services-mail-version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-google-mail/${project.version}</bundle>
- </feature>
+ </feature>
<feature name='camel-google-pubsub' version='${project.version}'
start-level='50'>
<feature version='${camel.osgi.version.range}'>camel-core</feature>
<feature version="[32,33)">guava</feature>
- <bundle
dependency='true'>wrap:mvn:com.google.cloud/google-cloud-pubsub/1.126.2</bundle>
- <bundle
dependency='true'>wrap:mvn:com.google.api/api-common/2.24.0</bundle>
+ <feature version='[4.1,5)'>netty</feature>
+ <feature prerequisite="true">spifly</feature>
+ <bundle
dependency='true'>wrap:mvn:com.google.cloud/google-cloud-pubsub/1.127.1</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.google.api/api-common/2.28.0</bundle>
<bundle
dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
- <bundle dependency='true'>wrap:mvn:com.google.api/gax/2.41.0</bundle>
- <bundle
dependency='true'>wrap:mvn:com.google.api/gax-grpc/2.41.0</bundle>
- <bundle
dependency='true'>wrap:mvn:com.google.api.grpc/proto-google-cloud-pubsub-v1/1.108.2</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.api/gax/2.45.0</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.google.api/gax-grpc/2.45.0</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.google.api.grpc/proto-google-cloud-pubsub-v1/1.109.1</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.google.auth/google-auth-library-credentials/${grpc-google-auth-library-version}</bundle>
- <bundle dependency='true'>wrap:mvn:io.grpc/grpc-api/1.61.0</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.grpc/grpc-api/${grpc-version}$${spi-consumer}</bundle>
<bundle dependency='true'>mvn:org.threeten/threetenbp/1.6.8</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=merge&Import-Package=com.google.common*;version="[32,33)",*;resolution:=optional</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.google.http-client/google-http-client-gson/${google-cloud-http-client-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.opencensus/opencensus-api/0.31.1</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.opencensus/opencensus-contrib-http-util/0.31.1</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.grpc/grpc-protobuf/${grpc-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.grpc/grpc-protobuf-lite/${grpc-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.google.api.grpc/proto-google-iam-v1/1.31.0</bundle>
+ <bundle
dependency='true'>mvn:io.netty/netty-transport-native-epoll/${netty-version}</bundle>
+ <bundle
dependency='true'>mvn:io.netty/netty-transport-classes-epoll/${netty-version}</bundle>
+ <bundle
dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
+ <bundle
dependency='true'>mvn:io.netty/netty-codec-http2/${netty-version}</bundle>
+ <bundle
dependency='true'>mvn:io.netty/netty-handler-proxy/${netty-version}</bundle>
+ <bundle
dependency='true'>mvn:io.netty/netty-codec-socks/${netty-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.google.api.grpc/proto-google-common-protos/2.36.0$Export-Package=com.google.longrunning*;version=2.36.0,*</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.perfmark/perfmark-api/0.27.0</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.grpc/grpc-stub/${grpc-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.grpc/grpc-netty/${grpc-version}$${spi-provider}</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.grpc/grpc-core/${grpc-version}$${spi-provider}</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.grpc/grpc-grpclb/${grpc-version}$${spi-provider}</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.grpc/grpc-googleapis/${grpc-version}$${spi-provider}</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.grpc/grpc-xds/${grpc-version}$${spi-provider}</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.grpc/grpc-services/${grpc-version}$${spi-provider}</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.grpc/grpc-util/${grpc-version}$${spi-provider}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-google-pubsub/${project.version}</bundle>
</feature>
<feature name='camel-google-secret-manager' version='${project.version}'
start-level='50'>
diff --git a/pom.xml b/pom.xml
index d715dc53..8c8c42b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -565,6 +565,9 @@
<mongo-java-driver-version>4.11.1</mongo-java-driver-version>
<velocity-version>2.3</velocity-version>
<bouncycastle-version>1.77</bouncycastle-version>
+
+ <spi-provider>SPI-Provider=*</spi-provider>
+ <spi-consumer>SPI-Consumer=*</spi-consumer>
</properties>
<dependencyManagement>
