(camel-karaf) branch main updated: Ref #428: Repair camel-azure-storage-blob integration test (#447)

[nfilotto]

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 8ea23370 Ref #428: Repair camel-azure-storage-blob integration test 
(#447)
8ea23370 is described below

commit 8ea233707f74f903643bbdbf5da4873153b56ff7
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Fri Jul 19 16:26:28 2024 +0200

    Ref #428: Repair camel-azure-storage-blob integration test (#447)
---
 features/src/main/feature/camel-features.xml                          | 4 ++--
 .../java/org/apache/karaf/camel/itest/CamelAzureStorageBlobITest.java | 2 +-
 tests/features/pom.xml                                                | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/features/src/main/feature/camel-features.xml 
b/features/src/main/feature/camel-features.xml
index e7e2746d..00143462 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -194,8 +194,9 @@
     </feature>
     <feature name="azure" version="${azure-core-version}" start-level="50">
         <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}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.azure/azure-core/${azure-core-version}$${spi-consumer}&amp;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'>mvn:io.projectreactor/reactor-core/${auto-detect-version}</bundle>
@@ -637,7 +638,6 @@
         <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'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-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-changefeed/${azure-storage-blob-changefeed-version}</bundle>
         
<bundle>wrap:mvn:com.azure/azure-core-http-netty/${auto-detect-version}</bundle>
diff --git 
a/tests/features/camel-azure-storage-blob/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageBlobITest.java
 
b/tests/features/camel-azure-storage-blob/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageBlobITest.java
index ba30ec62..8d0eb16f 100644
--- 
a/tests/features/camel-azure-storage-blob/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageBlobITest.java
+++ 
b/tests/features/camel-azure-storage-blob/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageBlobITest.java
@@ -52,7 +52,7 @@ public class CamelAzureStorageBlobITest extends 
AbstractCamelSingleFeatureResult
 
         public static GenericContainerResource<AzuriteContainer> 
createAzureStorageBlobContainer() {
 
-            AzuriteContainer azuriteContainer = new 
AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.29.0");
+            AzuriteContainer azuriteContainer = new 
AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.31.0");
 
             return new GenericContainerResource<>(azuriteContainer, resource 
-> {
                 resource.setProperty("azure.host", azuriteContainer.getHost());
diff --git a/tests/features/pom.xml b/tests/features/pom.xml
index 83a40c79..b38f5da0 100644
--- a/tests/features/pom.xml
+++ b/tests/features/pom.xml
@@ -50,8 +50,7 @@
         <module>camel-aws2-sns</module>
         <module>camel-aws2-sqs</module>
         <module>camel-aws2-sts</module>
-        <!-- TODO: Fix the integration test and re-add it -->
-        <!--module>camel-azure-storage-blob</module-->
+        <module>camel-azure-storage-blob</module>
         <module>camel-barcode</module>
         <module>camel-base64</module>
         <module>camel-bean-validator</module>