This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 3.15.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1316c70ad6bc7a3d40b1265aa54a9d80c126b893 Author: James Netherton <[email protected]> AuthorDate: Fri Sep 20 08:17:42 2024 +0100 Switch to io.smallrye.certs:smallrye-certificate-generator-junit5 Fixes #6499 --- .github/dependabot.yml | 2 +- .../camel/quarkus/component/http/http/it/HttpTest.java | 4 ++-- .../quarkus/component/http/netty/it/NettyHttpJaasTest.java | 4 ++-- .../quarkus/component/http/netty/it/NettyHttpTest.java | 4 ++-- .../quarkus/component/http/vertx/it/VertxHttpTest.java | 4 ++-- integration-tests-support/certificate-generator/pom.xml | 4 ++-- .../certificate/TestCertificateGenerationExtension.java | 14 +++++++------- .../quarkus/test/support/certificate/TestCertificates.java | 6 +++--- .../rest/client/it/ElasticsearchRestClientTest.java | 4 ++-- .../apache/camel/quarkus/component/ftps/it/FtpsTest.java | 4 ++-- .../apache/camel/quarkus/component/sftp/it/SftpTest.java | 4 ++-- .../apache/camel/quarkus/component/grpc/it/GrpcTest.java | 4 ++-- .../component/hashicorp/vault/it/HashicorpVaultTest.java | 4 ++-- .../apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java | 4 ++-- .../org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java | 4 ++-- .../quarkus/component/lumberjack/it/LumberjackTest.java | 4 ++-- .../org/apache/camel/quarkus/component/mail/MailTest.java | 4 ++-- .../apache/camel/quarkus/component/nats/it/NatsTest.java | 4 ++-- .../camel/quarkus/component/netty/tcp/NettyTcpTest.java | 4 ++-- .../camel/quarkus/component/netty/udp/NettyUdpTest.java | 4 ++-- .../camel/quarkus/component/oaipmh/it/OaipmhTest.java | 4 ++-- .../quarkus/component/paho/mqtt5/it/PahoMqtt5Test.java | 4 ++-- .../apache/camel/quarkus/component/paho/it/PahoTest.java | 4 ++-- .../ProxySslTest.java | 4 ++-- .../quarkus/component/http/server/it/PlatformHttpTest.java | 4 ++-- .../vertx/websocket/it/VertxWebsocketLegacySslTest.java | 4 ++-- .../websocket/it/VertxWebsocketTlsNamedConfigTest.java | 4 ++-- .../vertx/websocket/it/VertxWebsocketTlsTest.java | 4 ++-- pom.xml | 2 +- poms/bom-test/pom.xml | 7 ++++--- 30 files changed, 66 insertions(+), 65 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 877882edbb..85d60a0847 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -38,7 +38,7 @@ updates: # Test dependencies - dependency-name: "org.wiremock:wiremock-standalone" - dependency-name: "com.unboundid:unboundid-ldapsdk" - - dependency-name: "me.escoffier.certs:certificate-generator-junit5" + - dependency-name: "io.smallrye.certs:smallrye-certificate-generator-junit5" - dependency-name: "org.hamcrest:hamcrest" - dependency-name: "org.hamcrest:hamcrest-core" - dependency-name: "org.seleniumhq.selenium:htmlunit-driver" diff --git a/integration-test-groups/http/http/src/test/java/org/apache/camel/quarkus/component/http/http/it/HttpTest.java b/integration-test-groups/http/http/src/test/java/org/apache/camel/quarkus/component/http/http/it/HttpTest.java index 1f523639b9..2f6a58252c 100644 --- a/integration-test-groups/http/http/src/test/java/org/apache/camel/quarkus/component/http/http/it/HttpTest.java +++ b/integration-test-groups/http/http/src/test/java/org/apache/camel/quarkus/component/http/http/it/HttpTest.java @@ -20,8 +20,8 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.component.http.common.AbstractHttpTest; import org.apache.camel.quarkus.component.http.common.HttpTestResource; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; diff --git a/integration-test-groups/http/netty-http/src/test/java/org/apache/camel/quarkus/component/http/netty/it/NettyHttpJaasTest.java b/integration-test-groups/http/netty-http/src/test/java/org/apache/camel/quarkus/component/http/netty/it/NettyHttpJaasTest.java index ede3a7fe8e..dbd6313e3d 100644 --- a/integration-test-groups/http/netty-http/src/test/java/org/apache/camel/quarkus/component/http/netty/it/NettyHttpJaasTest.java +++ b/integration-test-groups/http/netty-http/src/test/java/org/apache/camel/quarkus/component/http/netty/it/NettyHttpJaasTest.java @@ -19,8 +19,8 @@ package org.apache.camel.quarkus.component.http.netty.it; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.component.http.common.HttpTestResource; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/integration-test-groups/http/netty-http/src/test/java/org/apache/camel/quarkus/component/http/netty/it/NettyHttpTest.java b/integration-test-groups/http/netty-http/src/test/java/org/apache/camel/quarkus/component/http/netty/it/NettyHttpTest.java index cb84081484..8c5e1c76a0 100644 --- a/integration-test-groups/http/netty-http/src/test/java/org/apache/camel/quarkus/component/http/netty/it/NettyHttpTest.java +++ b/integration-test-groups/http/netty-http/src/test/java/org/apache/camel/quarkus/component/http/netty/it/NettyHttpTest.java @@ -23,8 +23,8 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.response.Response; import io.restassured.response.ValidatableResponse; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.component.http.common.AbstractHttpTest; import org.apache.camel.quarkus.component.http.common.HttpTestResource; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; diff --git a/integration-test-groups/http/vertx-http/src/test/java/org/apache/camel/quarkus/component/http/vertx/it/VertxHttpTest.java b/integration-test-groups/http/vertx-http/src/test/java/org/apache/camel/quarkus/component/http/vertx/it/VertxHttpTest.java index e840c7960f..48a670079e 100644 --- a/integration-test-groups/http/vertx-http/src/test/java/org/apache/camel/quarkus/component/http/vertx/it/VertxHttpTest.java +++ b/integration-test-groups/http/vertx-http/src/test/java/org/apache/camel/quarkus/component/http/vertx/it/VertxHttpTest.java @@ -19,8 +19,8 @@ package org.apache.camel.quarkus.component.http.vertx.it; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.component.http.common.AbstractHttpTest; import org.apache.camel.quarkus.component.http.common.HttpTestResource; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; diff --git a/integration-tests-support/certificate-generator/pom.xml b/integration-tests-support/certificate-generator/pom.xml index cc0fbea3a9..514015d8c6 100644 --- a/integration-tests-support/certificate-generator/pom.xml +++ b/integration-tests-support/certificate-generator/pom.xml @@ -31,8 +31,8 @@ <dependencies> <dependency> - <groupId>me.escoffier.certs</groupId> - <artifactId>certificate-generator-junit5</artifactId> + <groupId>io.smallrye.certs</groupId> + <artifactId>smallrye-certificate-generator-junit5</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificateGenerationExtension.java b/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificateGenerationExtension.java index d11ad362e3..0e4150c8f8 100644 --- a/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificateGenerationExtension.java +++ b/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificateGenerationExtension.java @@ -23,12 +23,12 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import me.escoffier.certs.AliasRequest; -import me.escoffier.certs.CertificateFiles; -import me.escoffier.certs.CertificateGenerator; -import me.escoffier.certs.CertificateRequest; -import me.escoffier.certs.junit5.Alias; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.AliasRequest; +import io.smallrye.certs.CertificateFiles; +import io.smallrye.certs.CertificateGenerator; +import io.smallrye.certs.CertificateRequest; +import io.smallrye.certs.junit5.Alias; +import io.smallrye.certs.junit5.Certificate; import org.jboss.logging.Logger; import org.junit.jupiter.api.extension.*; import org.junit.platform.commons.util.AnnotationUtils; @@ -36,7 +36,7 @@ import org.testcontainers.DockerClientFactory; /** * Extension is based on - * https://github.com/cescoffier/certificate-generator/blob/main/certificate-generator-junit5/src/main/java/me/escoffier/certs/junit5/CertificateGenerationExtension.java + * https://github.com/smallrye/smallrye-certificate-generator/blob/main/certificate-generator-junit5/src/main/java/io/smallrye/certs/junit5/CertificateGenerationExtension.java * * Unfortunately there is no way of extending the original Extension with functionality of modifying CN and * SubjectAlternativeName diff --git a/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificates.java b/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificates.java index 4c9a9ee4f8..0000e1ee35 100644 --- a/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificates.java +++ b/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/TestCertificates.java @@ -22,14 +22,14 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.junit5.Certificate; import org.junit.jupiter.api.extension.ExtendWith; /** * Based on - * https://github.com/cescoffier/certificate-generator/blob/main/certificate-generator-junit5/src/main/java/me/escoffier/certs/junit5/Certificates.java + * https://github.com/smallrye/smallrye-certificate-generator/blob/main/certificate-generator-junit5/src/main/java/io/smallrye/certs/junit5/Certificates.java * Generates certificates before the tests via 'TestCertificateGenerationExtension' so the new certificates - * are customized to fullfill a remote docker host (if required). + * are customized to fulfill a remote docker host (if required). */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/integration-tests/elasticsearch-rest-client/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/client/it/ElasticsearchRestClientTest.java b/integration-tests/elasticsearch-rest-client/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/client/it/ElasticsearchRestClientTest.java index c9f50157df..2151b98e56 100644 --- a/integration-tests/elasticsearch-rest-client/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/client/it/ElasticsearchRestClientTest.java +++ b/integration-tests/elasticsearch-rest-client/src/test/java/org/apache/camel/quarkus/component/elasticsearch/rest/client/it/ElasticsearchRestClientTest.java @@ -24,8 +24,8 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; diff --git a/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTest.java b/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTest.java index 673aa66eed..18bcf5e438 100644 --- a/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTest.java +++ b/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTest.java @@ -20,8 +20,8 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.CertificatesUtil; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.junit.jupiter.api.Disabled; diff --git a/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/sftp/it/SftpTest.java b/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/sftp/it/SftpTest.java index 875b1325b4..65f0294095 100644 --- a/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/sftp/it/SftpTest.java +++ b/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/sftp/it/SftpTest.java @@ -20,8 +20,8 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.junit.jupiter.api.Test; diff --git a/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java b/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java index 57b06a7d46..ddd6fd6cfe 100644 --- a/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java +++ b/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java @@ -33,8 +33,8 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.path.json.JsonPath; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.component.grpc.auth.jwt.JwtAlgorithm; import org.apache.camel.component.grpc.auth.jwt.JwtCallCredentials; import org.apache.camel.component.grpc.auth.jwt.JwtHelper; diff --git a/integration-tests/hashicorp-vault/src/test/java/org/apache/camel/quarkus/component/hashicorp/vault/it/HashicorpVaultTest.java b/integration-tests/hashicorp-vault/src/test/java/org/apache/camel/quarkus/component/hashicorp/vault/it/HashicorpVaultTest.java index 24988e84b2..a8b336ccb2 100644 --- a/integration-tests/hashicorp-vault/src/test/java/org/apache/camel/quarkus/component/hashicorp/vault/it/HashicorpVaultTest.java +++ b/integration-tests/hashicorp-vault/src/test/java/org/apache/camel/quarkus/component/hashicorp/vault/it/HashicorpVaultTest.java @@ -19,8 +19,8 @@ package org.apache.camel.quarkus.component.hashicorp.vault.it; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.junit.jupiter.api.Test; diff --git a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java index bf65fb9092..b2282010b2 100644 --- a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java +++ b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java @@ -22,8 +22,8 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.path.json.JsonPath; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.junit.jupiter.api.Test; diff --git a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java index 0168f0d3bb..a7eb01489e 100644 --- a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java +++ b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java @@ -23,8 +23,8 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.path.json.JsonPath; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.junit.jupiter.api.Test; diff --git a/integration-tests/lumberjack/src/test/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackTest.java b/integration-tests/lumberjack/src/test/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackTest.java index 54f8985ec8..f50350ac89 100644 --- a/integration-tests/lumberjack/src/test/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackTest.java +++ b/integration-tests/lumberjack/src/test/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackTest.java @@ -22,8 +22,8 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.common.http.TestHTTPEndpoint; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.Test; diff --git a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java index 3f6665b64b..e303e86564 100644 --- a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java +++ b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java @@ -34,9 +34,9 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import jakarta.json.bind.JsonbBuilder; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; import org.apache.camel.ExchangePropertyKey; import org.apache.camel.ServiceStatus; import org.apache.camel.quarkus.test.support.certificate.CertificatesUtil; diff --git a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTest.java b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTest.java index 71e5359170..34e79b159f 100644 --- a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTest.java +++ b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTest.java @@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.Header; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; diff --git a/integration-tests/netty/src/test/java/org/apache/camel/quarkus/component/netty/tcp/NettyTcpTest.java b/integration-tests/netty/src/test/java/org/apache/camel/quarkus/component/netty/tcp/NettyTcpTest.java index 021126fddb..63c008262e 100644 --- a/integration-tests/netty/src/test/java/org/apache/camel/quarkus/component/netty/tcp/NettyTcpTest.java +++ b/integration-tests/netty/src/test/java/org/apache/camel/quarkus/component/netty/tcp/NettyTcpTest.java @@ -21,8 +21,8 @@ import java.io.IOException; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.junit.jupiter.api.Test; diff --git a/integration-tests/netty/src/test/java/org/apache/camel/quarkus/component/netty/udp/NettyUdpTest.java b/integration-tests/netty/src/test/java/org/apache/camel/quarkus/component/netty/udp/NettyUdpTest.java index 07c2551152..e793b506e8 100644 --- a/integration-tests/netty/src/test/java/org/apache/camel/quarkus/component/netty/udp/NettyUdpTest.java +++ b/integration-tests/netty/src/test/java/org/apache/camel/quarkus/component/netty/udp/NettyUdpTest.java @@ -21,8 +21,8 @@ import java.io.IOException; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.junit.jupiter.api.Test; diff --git a/integration-tests/oaipmh/src/test/java/org/apache/camel/quarkus/component/oaipmh/it/OaipmhTest.java b/integration-tests/oaipmh/src/test/java/org/apache/camel/quarkus/component/oaipmh/it/OaipmhTest.java index 40da1ffe67..d38461cbb0 100644 --- a/integration-tests/oaipmh/src/test/java/org/apache/camel/quarkus/component/oaipmh/it/OaipmhTest.java +++ b/integration-tests/oaipmh/src/test/java/org/apache/camel/quarkus/component/oaipmh/it/OaipmhTest.java @@ -20,8 +20,8 @@ import java.util.concurrent.TimeUnit; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.junit.jupiter.api.Test; diff --git a/integration-tests/paho-mqtt5/src/test/java/org/apache/camel/quarkus/component/paho/mqtt5/it/PahoMqtt5Test.java b/integration-tests/paho-mqtt5/src/test/java/org/apache/camel/quarkus/component/paho/mqtt5/it/PahoMqtt5Test.java index dcc9da8bdf..38c0ad385a 100644 --- a/integration-tests/paho-mqtt5/src/test/java/org/apache/camel/quarkus/component/paho/mqtt5/it/PahoMqtt5Test.java +++ b/integration-tests/paho-mqtt5/src/test/java/org/apache/camel/quarkus/component/paho/mqtt5/it/PahoMqtt5Test.java @@ -20,8 +20,8 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/integration-tests/paho/src/test/java/org/apache/camel/quarkus/component/paho/it/PahoTest.java b/integration-tests/paho/src/test/java/org/apache/camel/quarkus/component/paho/it/PahoTest.java index bab923dedc..d3ffd8df9f 100644 --- a/integration-tests/paho/src/test/java/org/apache/camel/quarkus/component/paho/it/PahoTest.java +++ b/integration-tests/paho/src/test/java/org/apache/camel/quarkus/component/paho/it/PahoTest.java @@ -20,8 +20,8 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.component.paho.PahoResource; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.junit.jupiter.api.Test; diff --git a/integration-tests/platform-http-proxy-ssl/src/test/java/org.apache.camel.quarkus.component.platform.http.proxy.ssl.it/ProxySslTest.java b/integration-tests/platform-http-proxy-ssl/src/test/java/org.apache.camel.quarkus.component.platform.http.proxy.ssl.it/ProxySslTest.java index 3faa5e4b7a..8035c27748 100644 --- a/integration-tests/platform-http-proxy-ssl/src/test/java/org.apache.camel.quarkus.component.platform.http.proxy.ssl.it/ProxySslTest.java +++ b/integration-tests/platform-http-proxy-ssl/src/test/java/org.apache.camel.quarkus.component.platform.http.proxy.ssl.it/ProxySslTest.java @@ -20,8 +20,8 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.junit.jupiter.api.Test; diff --git a/integration-tests/platform-http/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpTest.java b/integration-tests/platform-http/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpTest.java index b770825606..055bc16d50 100644 --- a/integration-tests/platform-http/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpTest.java +++ b/integration-tests/platform-http/src/test/java/org/apache/camel/quarkus/component/http/server/it/PlatformHttpTest.java @@ -23,8 +23,8 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.http.Method; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.component.platform.http.PlatformHttpComponent; import org.apache.camel.component.platform.http.vertx.VertxPlatformHttpEngine; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; diff --git a/integration-tests/vertx-websocket/src/test/java/org/apache/camel/quarkus/component/vertx/websocket/it/VertxWebsocketLegacySslTest.java b/integration-tests/vertx-websocket/src/test/java/org/apache/camel/quarkus/component/vertx/websocket/it/VertxWebsocketLegacySslTest.java index 32f33fedc3..769f291fab 100644 --- a/integration-tests/vertx-websocket/src/test/java/org/apache/camel/quarkus/component/vertx/websocket/it/VertxWebsocketLegacySslTest.java +++ b/integration-tests/vertx-websocket/src/test/java/org/apache/camel/quarkus/component/vertx/websocket/it/VertxWebsocketLegacySslTest.java @@ -21,8 +21,8 @@ import java.util.Map; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; @TestCertificates(certificates = { diff --git a/integration-tests/vertx-websocket/src/test/java/org/apache/camel/quarkus/component/vertx/websocket/it/VertxWebsocketTlsNamedConfigTest.java b/integration-tests/vertx-websocket/src/test/java/org/apache/camel/quarkus/component/vertx/websocket/it/VertxWebsocketTlsNamedConfigTest.java index d3e256a52b..9dacc940d6 100644 --- a/integration-tests/vertx-websocket/src/test/java/org/apache/camel/quarkus/component/vertx/websocket/it/VertxWebsocketTlsNamedConfigTest.java +++ b/integration-tests/vertx-websocket/src/test/java/org/apache/camel/quarkus/component/vertx/websocket/it/VertxWebsocketTlsNamedConfigTest.java @@ -21,8 +21,8 @@ import java.util.Map; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; @TestCertificates(certificates = { diff --git a/integration-tests/vertx-websocket/src/test/java/org/apache/camel/quarkus/component/vertx/websocket/it/VertxWebsocketTlsTest.java b/integration-tests/vertx-websocket/src/test/java/org/apache/camel/quarkus/component/vertx/websocket/it/VertxWebsocketTlsTest.java index f066753c47..69dfbad0af 100644 --- a/integration-tests/vertx-websocket/src/test/java/org/apache/camel/quarkus/component/vertx/websocket/it/VertxWebsocketTlsTest.java +++ b/integration-tests/vertx-websocket/src/test/java/org/apache/camel/quarkus/component/vertx/websocket/it/VertxWebsocketTlsTest.java @@ -21,8 +21,8 @@ import java.util.Map; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; -import me.escoffier.certs.Format; -import me.escoffier.certs.junit5.Certificate; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; @TestCertificates(certificates = { diff --git a/pom.xml b/pom.xml index dc33ed9af8..865cfba2ab 100644 --- a/pom.xml +++ b/pom.xml @@ -172,7 +172,7 @@ <zstd-jni.version>1.5.6-3</zstd-jni.version><!-- @sync org.apache.kafka:kafka-clients:${kafka.version} dep:com.github.luben:zstd-jni --> <!-- Test dependency versions (keep sorted alphabetically) --> - <certificate.generator.version>0.7.1</certificate.generator.version> + <smallrye-certificate-generator-junit5.version>0.8.1</smallrye-certificate-generator-junit5.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.certs:smallrye-certificate-generator --> <consul-client.version>${consul-client-version}</consul-client.version> <ftpserver.version>${ftpserver-version}</ftpserver.version> <hamcrest.version>3.0</hamcrest.version><!-- Awaitility and Wiremock --> diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml index b87098fb64..6fe4286272 100644 --- a/poms/bom-test/pom.xml +++ b/poms/bom-test/pom.xml @@ -80,10 +80,11 @@ <artifactId>quarkus-micrometer-registry-jmx</artifactId> <version>${quarkiverse-micrometer.version}</version> </dependency> + <!-- TODO: Remove for Quarkus 3.16.0 https://github.com/quarkusio/quarkus/pull/43393 --> <dependency> - <groupId>me.escoffier.certs</groupId> - <artifactId>certificate-generator-junit5</artifactId> - <version>${certificate.generator.version}</version> + <groupId>io.smallrye.certs</groupId> + <artifactId>smallrye-certificate-generator-junit5</artifactId> + <version>${smallrye-certificate-generator-junit5.version}</version> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId>
