This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 b9c0b96a Ref #455: Repair camel-azure-storage-blob dependencies (#460)
b9c0b96a is described below
commit b9c0b96a215c4e37a8528bef8085cff6217d3fb2
Author: Stefan Tataru <stefan.tatar...@gmail.com>
AuthorDate: Wed Jul 24 17:53:03 2024 +0200
Ref #455: Repair camel-azure-storage-blob dependencies (#460)
---
features/src/main/feature/camel-features.xml | 31 ++++++++++++++++------------
pom.xml | 1 +
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 3b82d3b5..34febd20 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -193,16 +193,28 @@
<bundle
dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
</feature>
<feature name="azure" version="${azure-core-version}" start-level="50">
+ <feature version='[${azure-core-version},2)'>azure-msal4j</feature>
<feature version='${camel-osgi-jackson2-version}'>jackson</feature>
<bundle
dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle>
<bundle
dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson2-version}</bundle>
<bundle
dependency='true'>wrap:mvn:com.azure/azure-core/${azure-core-version}$${spi-consumer}&Import-Package=*;resolution:=optional,com.fasterxml.jackson.dataformat.xml.deser;resolution:=optional,com.fasterxml.jackson.dataformat.xml.ser;resolution:=optional</bundle>
- <bundle
dependency='true'>wrap:mvn:com.azure/azure-identity/${azure-identity-version}</bundle>
- <bundle
dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.azure/azure-identity/${azure-identity-version}$Import-Package=com.sun.jna,*;resolution:=optional</bundle>
<bundle
dependency='true'>mvn:io.projectreactor/reactor-core/${auto-detect-version}</bundle>
+ <bundle
dependency='true'>mvn:net.java.dev.jna/jna/${auto-detect-version}</bundle>
+ <bundle
dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
<bundle
dependency='true'>wrap:mvn:com.azure/azure-xml/${auto-detect-version}</bundle>
<bundle
dependency='true'>wrap:mvn:com.azure/azure-json/${auto-detect-version}</bundle>
</feature>
+ <feature name="azure-msal4j" version="${azure-core-version}"
start-level="50">
+ <bundle
dependency='true'>mvn:com.nimbusds/content-type/${auto-detect-version}</bundle>
+ <bundle
dependency='true'>mvn:com.nimbusds/lang-tag/${auto-detect-version}</bundle>
+ <bundle
dependency='true'>mvn:com.nimbusds/nimbus-jose-jwt/${nimbus-jose-jwt}</bundle>
+ <bundle
dependency='true'>mvn:com.nimbusds/oauth2-oidc-sdk/${auto-detect-version}</bundle>
+ <bundle
dependency='true'>mvn:net.minidev/accessors-smart/${json-smart-version}</bundle>
+ <bundle
dependency='true'>mvn:net.minidev/json-smart/${json-smart-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.github.stephenc.jcip/jcip-annotations/${auto-detect-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.microsoft.azure/msal4j/${msal4j-version}$overwrite=merge&Import-Package=com.sun.net.httpserver;resolution:=optional,*</bundle>
+ </feature>
<feature name="azure-storage" version="${azure-core-version}"
start-level="50">
<feature version='[${azure-core-version},2)'>azure</feature>
<bundle
dependency='true'>wrap:mvn:com.azure/azure-storage-common/${azure-storage-common-version}</bundle>
@@ -605,7 +617,7 @@
<feature name='camel-azure-eventhubs' version='${project.version}'
start-level='50'>
<feature version='${camel-osgi-version-range}'>camel-core</feature>
<feature version='[${azure-core-version},2)'>azure-eventhubs</feature>
- <bundle
dependency='true'>wrap:mvn:com.azure/azure-storage-blob/${auto-detect-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.azure/azure-storage-blob/${azure-storage-blob-version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-azure-eventhubs/${project.version}</bundle>
</feature>
<feature name='camel-azure-files' version='${project.version}'
start-level='50'>
@@ -619,7 +631,7 @@
<feature version='${camel-osgi-jackson2-version}'>jackson</feature>
<feature version='[${azure-core-version},2)'>azure-eventhubs</feature>
<bundle
dependency='true'>wrap:mvn:com.azure/azure-security-keyvault-secrets/${auto-detect-version}</bundle>
- <bundle
dependency='true'>wrap:mvn:com.azure/azure-storage-blob/${auto-detect-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.azure/azure-storage-blob/${azure-storage-blob-version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-azure-key-vault/${project.version}</bundle>
</feature>
<feature name='camel-azure-schema-registry' version='${project.version}'
start-level='50'>
@@ -638,7 +650,7 @@
<feature version='${camel-osgi-version-range}'>camel-core</feature>
<feature version='[${azure-core-version},2)'>azure-storage</feature>
<feature version='[4.1,5)'>netty</feature>
- <bundle
dependency='true'>wrap:mvn:com.azure/azure-storage-blob/${auto-detect-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:com.azure/azure-storage-blob/${azure-storage-blob-version}</bundle>
<bundle
dependency='true'>wrap:mvn:com.azure/azure-storage-blob-changefeed/${azure-storage-blob-changefeed-version}</bundle>
<bundle>wrap:mvn:com.azure/azure-core-http-netty/${auto-detect-version}</bundle>
<bundle
dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
@@ -1919,16 +1931,9 @@
<bundle>mvn:org.apache.camel.karaf/camel-mail/${project.version}</bundle>
</feature>
<feature name='camel-mail-microsoft-oauth' version='${project.version}'
start-level='50'>
+ <feature version='[${azure-core-version},2)'>azure-msal4j</feature>
<feature version='${camel-osgi-version-range}'>camel-mail</feature>
<feature version='${camel-osgi-jackson2-version}'>jackson</feature>
- <bundle
dependency='true'>wrap:mvn:com.microsoft.azure/msal4j/${msal4j-version}$overwrite=merge&Import-Package=com.sun.net.httpserver;resolution:=optional,*</bundle>
- <bundle
dependency='true'>mvn:com.nimbusds/content-type/${auto-detect-version}</bundle>
- <bundle
dependency='true'>mvn:com.nimbusds/nimbus-jose-jwt/${nimbus-jose-jwt}</bundle>
- <bundle
dependency='true'>wrap:mvn:com.github.stephenc.jcip/jcip-annotations/${auto-detect-version}</bundle>
- <bundle
dependency='true'>mvn:com.nimbusds/oauth2-oidc-sdk/${auto-detect-version}</bundle>
- <bundle
dependency='true'>mvn:com.nimbusds/lang-tag/${auto-detect-version}</bundle>
- <bundle
dependency='true'>mvn:net.minidev/json-smart/${json-smart-version}</bundle>
- <bundle
dependency='true'>mvn:net.minidev/accessors-smart/${json-smart-version}</bundle>
<bundle
dependency='true'>mvn:org.ow2.asm/asm/${auto-detect-version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-mail-microsoft-oauth/${project.version}</bundle>
</feature>
diff --git a/pom.xml b/pom.xml
index 0b5571cd..02a6e30c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -538,6 +538,7 @@
</azure-messaging-eventhubs-checkpointstore-blob-version>
<azure-messaging-eventhubs-version>5.18.5</azure-messaging-eventhubs-version>
<azure-storage-common-version>12.25.1</azure-storage-common-version>
+ <azure-storage-blob-version>12.26.1</azure-storage-blob-version>
<geronimo-atinject-version>1.2</geronimo-atinject-version>
<guava32-version>32.1.3-jre</guava32-version>
<harmcrest-version>1.3_1</harmcrest-version>
