This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8aad62e10b25c2cd70119459fe6929e8e0678ab3 Author: Peter Palaga <[email protected]> AuthorDate: Fri Jun 4 11:36:30 2021 +0200 Upgrade to minio 8.2.1 in Camel 3.10 breaks Quarkiverse Minio and MinioClientProducer in our test #2503 --- .../camel/quarkus/component/minio/it/MinioClientProducer.java | 7 +++---- .../apache/camel/quarkus/component/minio/it/MinioTestResource.java | 3 +-- pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java b/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java index 2975beb..1f7a832 100644 --- a/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java +++ b/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java @@ -16,9 +16,9 @@ */ package org.apache.camel.quarkus.component.minio.it; -import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Named; +import javax.inject.Singleton; import io.minio.MinioClient; import org.eclipse.microprofile.config.ConfigProvider; @@ -26,12 +26,11 @@ import org.eclipse.microprofile.config.ConfigProvider; public class MinioClientProducer { @Produces - @ApplicationScoped + @Singleton @Named("minioClient") public MinioClient produceMinioClient() { return MinioClient.builder() - .endpoint("http://"; + ConfigProvider.getConfig().getValue("minio.server.host", String.class), - ConfigProvider.getConfig().getValue("minio.server.port", Integer.class), false) + .endpoint(ConfigProvider.getConfig().getValue("quarkus.minio.url", String.class)) .credentials(MinioResource.SERVER_ACCESS_KEY, MinioResource.SERVER_SECRET_KEY) .build(); } diff --git a/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java b/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java index 443169a..e53e611 100644 --- a/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java +++ b/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java @@ -49,8 +49,7 @@ public class MinioTestResource implements QuarkusTestResourceLifecycleManager { String host = minioServer.getHost(); return CollectionHelper.mapOf( - "minio.server.host", host, - "minio.server.port", port); + "quarkus.minio.url", String.format("http://%s:%s";, host, port)); } @Override diff --git a/pom.xml b/pom.xml index f5a2ceb..0040b8f 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ <cassandra-quarkus.version>1.0.1</cassandra-quarkus.version><!-- https://repo1.maven.org/maven2/com/datastax/oss/quarkus/cassandra-quarkus-bom/ --> <quarkiverse.freemarker.version>0.2.7</quarkiverse.freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ --> - <quarkiverse-minio.version>0.2.2</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ --> + <quarkiverse-minio.version>0.2.3</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ --> <quarkus.version>2.0.0.CR2</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> <quarkus-google-cloud.version>0.6.0</quarkus-google-cloud.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/googlecloudservices/quarkus-google-cloud-services-bom/ --> <quarkus-hazelcast-client.version>1.2.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ --> @@ -101,7 +101,7 @@ <kudu.version>${kudu-version}</kudu.version> <kotlin.version>1.4.32</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib --> <netty3.version>${netty3-version}</netty3.version><!-- Spark --> - <minio.version>8.1.0</minio.version><!-- Hardcoded as a workaround for https://github.com/apache/camel-quarkus/issues/2503 otherwise should be kept in sync with quarkiverse-minio and camel --> + <minio.version>${minio-version}</minio.version><!-- Keep in sync with quarkiverse-minio and Camel, preferring Camel assuming that it is more likely to be up to date --> <mvel2.version>${mvel-version}</mvel2.version> <nimbus-jose-jwt.version>4.41.1</nimbus-jose-jwt.version><!-- Mess in hdfs transitive deps --> <okhttp.version>${squareup-okhttp-version}</okhttp.version>
