You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2021/03/18 13:54:01 UTC
[camel-quarkus] branch master updated (4502600 -> 6b2abee)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from 4502600 Upgrade SmallRye Reactive Messaging Camel to 2.9.0
new f2f8079 Rely on azure-sdk-bom to manage reactor-core and reactor-netty instead of managing ourselves
new 6b2abee Workaround #2207 in Azure Storage Data Lake test
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../integration-test/pom.xml | 7 +++++
.../datalake/it/AzureStorageDatalakeTest.java | 35 ++++++++++++----------
pom.xml | 2 --
poms/bom/pom.xml | 10 -------
4 files changed, 26 insertions(+), 28 deletions(-)
[camel-quarkus] 02/02: Workaround #2207 in Azure Storage Data Lake
test
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 6b2abeef72b587437744d0b7ee08aeb63b603389
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Mar 5 19:26:13 2021 +0100
Workaround #2207 in Azure Storage Data Lake test
---
.../integration-test/pom.xml | 7 +++++
.../datalake/it/AzureStorageDatalakeTest.java | 35 ++++++++++++----------
2 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/extensions-jvm/azure-storage-datalake/integration-test/pom.xml b/extensions-jvm/azure-storage-datalake/integration-test/pom.xml
index 88d39bb..e0eb088 100644
--- a/extensions-jvm/azure-storage-datalake/integration-test/pom.xml
+++ b/extensions-jvm/azure-storage-datalake/integration-test/pom.xml
@@ -34,6 +34,13 @@
<dependencyManagement>
<dependencies>
+ <dependency><!-- Workaround for https://github.com/apache/camel-quarkus/issues/2207 -->
+ <groupId>com.fasterxml.jackson</groupId>
+ <artifactId>jackson-bom</artifactId>
+ <version>2.11.3</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-bom-test</artifactId>
diff --git a/extensions-jvm/azure-storage-datalake/integration-test/src/test/java/org/apache/camel/quarkus/component/azure/storage/datalake/it/AzureStorageDatalakeTest.java b/extensions-jvm/azure-storage-datalake/integration-test/src/test/java/org/apache/camel/quarkus/component/azure/storage/datalake/it/AzureStorageDatalakeTest.java
index 2f7f4d3..f35fbe1 100644
--- a/extensions-jvm/azure-storage-datalake/integration-test/src/test/java/org/apache/camel/quarkus/component/azure/storage/datalake/it/AzureStorageDatalakeTest.java
+++ b/extensions-jvm/azure-storage-datalake/integration-test/src/test/java/org/apache/camel/quarkus/component/azure/storage/datalake/it/AzureStorageDatalakeTest.java
@@ -22,6 +22,7 @@ import io.restassured.RestAssured;
import org.apache.camel.quarkus.test.support.azure.AzureStorageTestResource;
import org.apache.commons.lang3.RandomStringUtils;
import org.hamcrest.Matchers;
+import org.jboss.logging.Logger;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@@ -32,18 +33,18 @@ import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@QuarkusTestResource(AzureStorageTestResource.class)
class AzureStorageDatalakeTest {
+ private static final Logger LOG = Logger.getLogger(AzureStorageDatalakeTest.class);
+
@Test
public void crud() {
final String filesystem = "cqfs" + RandomStringUtils.randomNumeric(16);
final String filename = "file" + RandomStringUtils.randomNumeric(16);
/* The filesystem does not exist initially */
- // TODO this causes an infinite loop of requests see
- // https://github.com/apache/camel-quarkus/issues/2304
- // RestAssured.get("/azure-storage-datalake/filesystems")
- // .then()
- // .statusCode(200)
- // .body(Matchers.not(Matchers.hasItem(filesystem)));
+ RestAssured.get("/azure-storage-datalake/filesystem/" + filesystem)
+ .then()
+ .statusCode(200)
+ .body("", Matchers.not(Matchers.hasItem(filesystem)));
try {
/* Create the filesystem */
@@ -53,12 +54,10 @@ class AzureStorageDatalakeTest {
.statusCode(201);
/* Now it should exist */
- // TODO this causes an infinite loop of requests see
- // https://github.com/apache/camel-quarkus/issues/2304
- // RestAssured.get("/azure-storage-datalake/filesystem/" + filesystem)
- // .then()
- // .statusCode(200)
- // .body(Matchers.hasItem(filesystem));
+ RestAssured.get("/azure-storage-datalake/filesystem/" + filesystem)
+ .then()
+ .statusCode(200)
+ .body("", Matchers.hasItem(filesystem));
/* No paths yet */
RestAssured.get("/azure-storage-datalake/filesystem/" + filesystem + "/paths")
@@ -99,10 +98,14 @@ class AzureStorageDatalakeTest {
} finally {
/* Clean up */
- RestAssured.given()
- .delete("/azure-storage-datalake/filesystem/" + filesystem + "/path/" + filename)
- .then()
- .statusCode(204);
+ try {
+ RestAssured.given()
+ .delete("/azure-storage-datalake/filesystem/" + filesystem + "/path/" + filename)
+ .then()
+ .statusCode(204);
+ } catch (Exception e) {
+ LOG.warnf(e, "Could not delete file '%s' in file system %s", filename, filesystem);
+ }
RestAssured.given()
.delete("/azure-storage-datalake/filesystem/" + filesystem)
[camel-quarkus] 01/02: Rely on azure-sdk-bom to manage reactor-core
and reactor-netty instead of managing ourselves
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f2f8079653dcde5c53a88e869ad556f41d32c465
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Mar 5 19:25:43 2021 +0100
Rely on azure-sdk-bom to manage reactor-core and reactor-netty instead
of managing ourselves
---
pom.xml | 2 --
poms/bom/pom.xml | 10 ----------
2 files changed, 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index e30a6bf..ecec6c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,8 +106,6 @@
<quarkus-hazelcast-client.version>1.1.1</quarkus-hazelcast-client.version>
<quarkus-qpid-jms.version>0.23.0</quarkus-qpid-jms.version>
<protobuf.version>${protobuf-version}</protobuf.version>
- <reactor-core.version>3.3.13.RELEASE</reactor-core.version>
- <reactor-netty.version>0.9.16.RELEASE</reactor-netty.version><!-- A newer micro than the one in azure-sdk-bom required by camel-quarkus-azure-eventhubs -->
<retrofit.version>2.5.0</retrofit.version>
<scala-2.11.version>2.11.12</scala-2.11.version><!-- Spark -->
<smallrye.reactive.messaging.camel.version>2.9.0</smallrye.reactive.messaging.camel.version> <!-- keep in sync with Quarkus SmallRye Reactive Messaging -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index c2a9df9..81ddd68 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5866,16 +5866,6 @@
<version>${debezium.version}</version>
</dependency>
<dependency>
- <groupId>io.projectreactor</groupId>
- <artifactId>reactor-core</artifactId>
- <version>${reactor-core.version}</version>
- </dependency>
- <dependency>
- <groupId>io.projectreactor.netty</groupId>
- <artifactId>reactor-netty</artifactId>
- <version>${reactor-netty.version}</version>
- </dependency>
- <dependency>
<groupId>io.quarkiverse.freemarker</groupId>
<artifactId>quarkus-freemarker</artifactId>
<version>${quarkiverse.freemarker.version}</version>