This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch camel-karaf-4.8.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/camel-karaf-4.8.x by this push:
new 92ee9ce3a Ref #627 fixes azure component dependencies (#628)
92ee9ce3a is described below
commit 92ee9ce3a6119c40f0727e2901734f0d89b7396c
Author: François de Parscau <[email protected]>
AuthorDate: Mon Jun 16 12:31:36 2025 +0200
Ref #627 fixes azure component dependencies (#628)
---
features/src/main/feature/camel-features.xml | 15 +++
pom.xml | 14 +--
.../pom.xml | 27 +++---
.../test/CamelAzureEventhubsRouteSupplier.java | 102 +++++++++++++++++++++
.../camel/itest/CamelAzureEventhubsITest.java} | 47 +++++-----
.../resources/container-license-acceptance.txt | 1 +
tests/features/camel-azure-storage-blob/pom.xml | 6 ++
.../camel/itest/CamelAzureStorageBlobITest.java | 14 +--
tests/features/camel-azure-storage-queue/pom.xml | 6 ++
.../camel/itest/CamelAzureStorageQueueITest.java | 15 +--
tests/features/pom.xml | 1 +
11 files changed, 179 insertions(+), 69 deletions(-)
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index eb797d536..8900a8701 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -222,6 +222,7 @@
</feature>
<feature name="azure-eventhubs" version="${azure-core-version}"
start-level="50">
<feature version='[${azure-core-version},2)'>azure-storage</feature>
+ <bundle
dependency='true'>mvn:org.apache.qpid/proton-j/${qpid-proton-j-version}</bundle>
<bundle
dependency='true'>wrap:mvn:com.azure/azure-core-amqp/${auto-detect-version}</bundle>
<bundle
dependency='true'>wrap:mvn:com.azure/azure-messaging-eventhubs/${azure-messaging-eventhubs-version}</bundle>
<bundle
dependency='true'>wrap:mvn:com.azure/azure-messaging-eventhubs-checkpointstore-blob/${azure-messaging-eventhubs-checkpointstore-blob-version}</bundle>
@@ -623,6 +624,19 @@
<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>
+ <feature version='[4.1,5)'>netty</feature>
+
<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>
+ <bundle
dependency='true'>mvn:io.netty/netty-codec-http2/${netty-version}</bundle>
+ <bundle
dependency='true'>mvn:io.netty/netty-transport-native-unix-common/${netty-version}</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-handler-proxy/${netty-version}</bundle>
+ <bundle
dependency='true'>mvn:io.netty/netty-codec-socks/${netty-version}</bundle>
+ <bundle
dependency='true'>mvn:io.netty/netty-resolver-dns/${netty-version}</bundle>
+ <bundle
dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle>
+ <bundle
dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${auto-detect-version}</bundle>
+ <bundle
dependency='true'>mvn:io.projectreactor.netty/reactor-netty-http/${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>
@@ -648,6 +662,7 @@
<feature name='camel-azure-servicebus' version='${project.version}'
start-level='50'>
<feature version='${camel-osgi-version-range}'>camel-core</feature>
<feature version='[${azure-core-version},2)'>azure</feature>
+ <bundle
dependency='true'>mvn:org.apache.qpid/proton-j/${qpid-proton-j-version}</bundle>
<bundle
dependency='true'>wrap:mvn:com.azure/azure-core-amqp/${auto-detect-version}</bundle>
<bundle
dependency='true'>wrap:mvn:com.azure/azure-messaging-servicebus/${auto-detect-version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-azure-servicebus/${project.version}</bundle>
diff --git a/pom.xml b/pom.xml
index b985e0083..12b0571fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -476,7 +476,7 @@
<stax-api-version>1.0.1</stax-api-version>
<stringtemplate-version>4.3.4</stringtemplate-version>
<tahu-version>1.0.10</tahu-version>
- <testcontainers-version>1.20.1</testcontainers-version>
+ <testcontainers-version>1.21.1</testcontainers-version>
<thymeleaf-version>3.1.2.RELEASE</thymeleaf-version>
<tika-version>2.9.2</tika-version>
<twilio-version>10.4.2</twilio-version>
@@ -545,12 +545,12 @@
<angus-activation-version>2.0.2</angus-activation-version>
<aries-util-version>1.1.3</aries-util-version>
<aries-version>1.10.3</aries-version>
- <azure-core-version>1.49.1</azure-core-version>
- <azure-identity-version>1.13.0</azure-identity-version>
-
<azure-messaging-eventhubs-checkpointstore-blob-version>1.19.5</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>
+ <azure-core-version>1.51.0</azure-core-version>
+ <azure-identity-version>1.13.2</azure-identity-version>
+
<azure-messaging-eventhubs-checkpointstore-blob-version>1.19.7</azure-messaging-eventhubs-checkpointstore-blob-version>
+
<azure-messaging-eventhubs-version>5.18.7</azure-messaging-eventhubs-version>
+ <azure-storage-common-version>12.26.1</azure-storage-common-version>
+ <azure-storage-blob-version>12.27.1</azure-storage-blob-version>
<consul-kotlin-version>1.8.21</consul-kotlin-version>
<consul-okhttp3-version>4.12.0</consul-okhttp3-version>
<consul-okio-version>3.6.0</consul-okio-version>
diff --git a/tests/features/camel-azure-storage-queue/pom.xml
b/tests/features/camel-azure-eventhubs/pom.xml
similarity index 69%
copy from tests/features/camel-azure-storage-queue/pom.xml
copy to tests/features/camel-azure-eventhubs/pom.xml
index 473a6ba9e..beacf2f65 100644
--- a/tests/features/camel-azure-storage-queue/pom.xml
+++ b/tests/features/camel-azure-eventhubs/pom.xml
@@ -17,7 +17,9 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.karaf</groupId>
@@ -25,13 +27,13 @@
<version>4.8.7-SNAPSHOT</version>
</parent>
- <artifactId>camel-azure-storage-queue-test</artifactId>
- <name>Apache Camel :: Karaf :: Tests :: Features :: Azure Storage
Queue</name>
+ <artifactId>camel-azure-eventhubs-test</artifactId>
+ <name>Apache Camel :: Karaf :: Tests :: Features :: AzureEventhubs</name>
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-azure-storage-queue</artifactId>
+ <artifactId>camel-azure-eventhubs</artifactId>
<version>${camel-version}</version>
</dependency>
<dependency>
@@ -40,14 +42,11 @@
<version>${testcontainers-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>azure</artifactId>
+ <version>${testcontainers-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>../../../src/main/resources</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
-</project>
+</project>
\ No newline at end of file
diff --git
a/tests/features/camel-azure-eventhubs/src/main/java/org/apache/karaf/camel/test/CamelAzureEventhubsRouteSupplier.java
b/tests/features/camel-azure-eventhubs/src/main/java/org/apache/karaf/camel/test/CamelAzureEventhubsRouteSupplier.java
new file mode 100644
index 000000000..b2e040864
--- /dev/null
+++
b/tests/features/camel-azure-eventhubs/src/main/java/org/apache/karaf/camel/test/CamelAzureEventhubsRouteSupplier.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.method;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Function;
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.azure.eventhubs.EventHubsComponent;
+import org.apache.camel.component.azure.eventhubs.EventHubsConfiguration;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.apache.karaf.camel.itests.CamelRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+import com.azure.messaging.eventhubs.checkpointstore.blob.BlobCheckpointStore;
+import com.azure.storage.blob.BlobContainerAsyncClient;
+import com.azure.storage.blob.BlobContainerClientBuilder;
+import com.azure.storage.common.StorageSharedKeyCredential;
+
+@Component(
+ name = "karaf-camel-azureeventhubs-test",
+ immediate = true,
+ service = CamelRouteSupplier.class
+)
+public class CamelAzureEventhubsRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+ private static final String TEST_ACCOUNT =
System.getProperty("azure.accountName");
+ private static final String TEST_ACCOUNT_KEY =
System.getProperty("azure.accountKey");
+ public static final String TEST_CONTAINER = "mycontainer";
+ private final AtomicBoolean isReceived = new AtomicBoolean();
+ private String connectionString;
+
+ @Override
+ public void configure(CamelContext camelContext) {
+ connectionString = System.getProperty("azure.connectionString");
+ final StorageSharedKeyCredential credential =
+ new StorageSharedKeyCredential(TEST_ACCOUNT, TEST_ACCOUNT_KEY);
+
+ final String host = System.getProperty("azure.host");
+ final String port = System.getProperty("azure.port");
+ final String endpoint = "http://"; + host + ":" + port + "/" +
TEST_ACCOUNT;
+
+ BlobContainerAsyncClient blobClient = new BlobContainerClientBuilder()
+ .endpoint(endpoint)
+ .containerName(TEST_CONTAINER)
+ .credential(credential)
+ .buildAsyncClient();
+ blobClient.createIfNotExists().block();
+
+ EventHubsConfiguration config = new EventHubsConfiguration();
+ config.setCheckpointStore(new BlobCheckpointStore(blobClient));
+ config.setBlobAccountName(TEST_ACCOUNT);
+ config.setBlobContainerName(TEST_CONTAINER);
+ config.setBlobStorageSharedKeyCredential(credential);
+ config.setBlobAccessKey(TEST_ACCOUNT_KEY);
+ config.setConnectionString(connectionString);
+
+ EventHubsComponent component = new EventHubsComponent();
+ component.setConfiguration(config);
+ camelContext.addComponent("azure-eventhubs", component);
+ }
+
+
+ @Override
+ protected Function<RouteBuilder, RouteDefinition> consumerRoute() {
+ return builder->
builder.fromF("azure-eventhubs:?connectionString=%sEntityPath=eh1",
connectionString)
+ .log("Received message from Event Hub: ${body}")
+ .process(ex -> isReceived.set(true));
+ }
+
+ @Override
+ protected void configureProducer(RouteBuilder builder, RouteDefinition
producerRoute) {
+ producerRoute.log("sending a message: ${body}")
+ //loop to send until the consumer is started
+ .loopDoWhile(method(this, "shouldContinueSending"))
+ .delay(500)
+ .toF("azure-eventhubs:?connectionString=%sEntityPath=eh1",
connectionString)
+ .log("message sent")
+ .end();
+ }
+
+ public boolean shouldContinueSending() {
+ return !isReceived.get();
+ }
+}
+
diff --git
a/tests/features/camel-azure-storage-queue/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageQueueITest.java
b/tests/features/camel-azure-eventhubs/src/test/java/org/apache/karaf/camel/itest/CamelAzureEventhubsITest.java
similarity index 54%
copy from
tests/features/camel-azure-storage-queue/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageQueueITest.java
copy to
tests/features/camel-azure-eventhubs/src/test/java/org/apache/karaf/camel/itest/CamelAzureEventhubsITest.java
index d8b970226..89491af80 100644
---
a/tests/features/camel-azure-storage-queue/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageQueueITest.java
+++
b/tests/features/camel-azure-eventhubs/src/test/java/org/apache/karaf/camel/itest/CamelAzureEventhubsITest.java
@@ -13,7 +13,6 @@
*/
package org.apache.karaf.camel.itest;
-import org.apache.camel.component.mock.MockEndpoint;
import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteITest;
import org.apache.karaf.camel.itests.CamelKarafTestHint;
import org.apache.karaf.camel.itests.GenericContainerResource;
@@ -22,22 +21,17 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.azure.EventHubsEmulatorContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.azure.AzuriteContainer;
import org.testcontainers.containers.wait.strategy.Wait;
-import static
org.apache.karaf.camel.test.CamelAzureStorageQueueRouteSupplier.TEST_QUEUE_CONTENT;
-
-@CamelKarafTestHint(externalResourceProvider =
CamelAzureStorageQueueITest.ExternalResourceProviders.class)
+@CamelKarafTestHint(externalResourceProvider =
CamelAzureEventhubsITest.ExternalResourceProviders.class)
@RunWith(PaxExamWithExternalResource.class)
@ExamReactorStrategy(PerClass.class)
-public class CamelAzureStorageQueueITest extends
AbstractCamelSingleFeatureResultMockBasedRouteITest {
-
- private static final int AZURITE_ORIGINAL_PORT = 10001;
+public class CamelAzureEventhubsITest extends
AbstractCamelSingleFeatureResultMockBasedRouteITest {
- @Override
- public void configureMock(MockEndpoint mock) {
- mock.expectedBodiesReceived(TEST_QUEUE_CONTENT);
- }
+ public static final int EVENTHUBS_EMULATOR_PORT = 5672;
@Test
public void testResultMock() throws Exception {
@@ -48,12 +42,18 @@ public class CamelAzureStorageQueueITest extends
AbstractCamelSingleFeatureResul
private static final String DEFAULT_ACCOUNT_NAME = "devstoreaccount1";
private static final String DEFAULT_ACCOUNT_KEY
=
"Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
+ private static final int AZURITE_ORIGINAL_PORT = 10000;
- public static GenericContainerResource<AzuriteContainer>
createAzureStorageQueueContainer() {
+ private static final Network network = Network.newNetwork();
+ private static final AzuriteContainer azuriteContainer =
+ new
AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+ .withNetwork(network)
+ .withNetworkAliases("azurite")
+ .waitingFor(Wait.forListeningPort());
- AzuriteContainer azuriteContainer = new
AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.31.0");
+ public static GenericContainerResource<AzuriteContainer>
createAzureStorageContainer() {
- return new GenericContainerResource<>(azuriteContainer, resource
-> {
+ return new
GenericContainerResource<AzuriteContainer>(azuriteContainer, resource -> {
resource.setProperty("azure.host", azuriteContainer.getHost());
resource.setProperty("azure.port",
Integer.toString(azuriteContainer.getMappedPort(AZURITE_ORIGINAL_PORT)));
@@ -61,16 +61,17 @@ public class CamelAzureStorageQueueITest extends
AbstractCamelSingleFeatureResul
resource.setProperty("azure.accountKey", DEFAULT_ACCOUNT_KEY);
});
}
- }
- public static class AzuriteContainer extends
GenericContainer<AzuriteContainer> {
+ public static GenericContainerResource<EventHubsEmulatorContainer>
createAzureEventHubsContainer() {
+ EventHubsEmulatorContainer eventHubContainer =
+ new
EventHubsEmulatorContainer("mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1")
+
.withNetwork(network).withNetworkAliases("eventhubs-emulator").withAzuriteContainer(azuriteContainer)
+ .withExposedPorts(EVENTHUBS_EMULATOR_PORT)
+ .withEnv("ACCEPT_EULA", "Y");
- public AzuriteContainer(final String containerName) {
- super(containerName);
-
- withExposedPorts(AZURITE_ORIGINAL_PORT)
- .waitingFor(Wait.forListeningPort());
+ return new GenericContainerResource<>(eventHubContainer, resource
-> {
+ resource.setProperty("azure.connectionString",
eventHubContainer.getConnectionString());
+ });
}
-
}
}
\ No newline at end of file
diff --git
a/tests/features/camel-azure-eventhubs/src/test/resources/container-license-acceptance.txt
b/tests/features/camel-azure-eventhubs/src/test/resources/container-license-acceptance.txt
new file mode 100644
index 000000000..42ad8f0b6
--- /dev/null
+++
b/tests/features/camel-azure-eventhubs/src/test/resources/container-license-acceptance.txt
@@ -0,0 +1 @@
+mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1
\ No newline at end of file
diff --git a/tests/features/camel-azure-storage-blob/pom.xml
b/tests/features/camel-azure-storage-blob/pom.xml
index 39eb52314..008173c5b 100644
--- a/tests/features/camel-azure-storage-blob/pom.xml
+++ b/tests/features/camel-azure-storage-blob/pom.xml
@@ -40,6 +40,12 @@
<version>${testcontainers-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>azure</artifactId>
+ <version>${testcontainers-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
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 8d0eb16fa..3f6649b5c 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
@@ -25,8 +25,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.azure.AzuriteContainer;
@CamelKarafTestHint(externalResourceProvider =
CamelAzureStorageBlobITest.ExternalResourceProviders.class)
@RunWith(PaxExamWithExternalResource.class)
@@ -52,7 +51,7 @@ public class CamelAzureStorageBlobITest extends
AbstractCamelSingleFeatureResult
public static GenericContainerResource<AzuriteContainer>
createAzureStorageBlobContainer() {
- AzuriteContainer azuriteContainer = new
AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.31.0");
+ AzuriteContainer azuriteContainer = new
AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0");
return new GenericContainerResource<>(azuriteContainer, resource
-> {
resource.setProperty("azure.host", azuriteContainer.getHost());
@@ -64,14 +63,5 @@ public class CamelAzureStorageBlobITest extends
AbstractCamelSingleFeatureResult
}
}
- public static class AzuriteContainer extends
GenericContainer<AzuriteContainer> {
- public AzuriteContainer(final String containerName) {
- super(containerName);
-
- withExposedPorts(AZURITE_ORIGINAL_PORT)
- .waitingFor(Wait.forListeningPort());
- }
-
- }
}
\ No newline at end of file
diff --git a/tests/features/camel-azure-storage-queue/pom.xml
b/tests/features/camel-azure-storage-queue/pom.xml
index 473a6ba9e..39f907847 100644
--- a/tests/features/camel-azure-storage-queue/pom.xml
+++ b/tests/features/camel-azure-storage-queue/pom.xml
@@ -40,6 +40,12 @@
<version>${testcontainers-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>azure</artifactId>
+ <version>${testcontainers-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git
a/tests/features/camel-azure-storage-queue/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageQueueITest.java
b/tests/features/camel-azure-storage-queue/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageQueueITest.java
index d8b970226..9d82e4315 100644
---
a/tests/features/camel-azure-storage-queue/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageQueueITest.java
+++
b/tests/features/camel-azure-storage-queue/src/test/java/org/apache/karaf/camel/itest/CamelAzureStorageQueueITest.java
@@ -22,8 +22,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.azure.AzuriteContainer;
import static
org.apache.karaf.camel.test.CamelAzureStorageQueueRouteSupplier.TEST_QUEUE_CONTENT;
@@ -51,7 +50,7 @@ public class CamelAzureStorageQueueITest extends
AbstractCamelSingleFeatureResul
public static GenericContainerResource<AzuriteContainer>
createAzureStorageQueueContainer() {
- AzuriteContainer azuriteContainer = new
AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.31.0");
+ AzuriteContainer azuriteContainer = new
AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0");
return new GenericContainerResource<>(azuriteContainer, resource
-> {
resource.setProperty("azure.host", azuriteContainer.getHost());
@@ -63,14 +62,4 @@ public class CamelAzureStorageQueueITest extends
AbstractCamelSingleFeatureResul
}
}
- public static class AzuriteContainer extends
GenericContainer<AzuriteContainer> {
-
- public AzuriteContainer(final String containerName) {
- super(containerName);
-
- withExposedPorts(AZURITE_ORIGINAL_PORT)
- .waitingFor(Wait.forListeningPort());
- }
-
- }
}
\ No newline at end of file
diff --git a/tests/features/pom.xml b/tests/features/pom.xml
index e07d508c9..92119ef69 100644
--- a/tests/features/pom.xml
+++ b/tests/features/pom.xml
@@ -55,6 +55,7 @@
<module>camel-aws2-sns</module>
<module>camel-aws2-sqs</module>
<module>camel-aws2-sts</module>
+ <module>camel-azure-eventhubs</module>
<module>camel-azure-storage-blob</module>
<module>camel-azure-storage-queue</module>
<module>camel-barcode</module>
