From 8003adb5ea0d199d589a0d42ae362ee240fc4210 Mon Sep 17 00:00:00 2001 From: James Netherton Date: Fri, 20 Sep 2024 08:17:42 +0100 Subject: [PATCH] Switch to io.smallrye.certs:smallrye-certificate-generator-junit5 Fixes #6499 --- .github/dependabot.yml | 2 +- .../quarkus/component/http/http/it/HttpTest.java | 4 ++-- .../component/http/netty/it/NettyHttpJaasTest.java | 4 ++-- .../component/http/netty/it/NettyHttpTest.java | 4 ++-- .../component/http/vertx/it/VertxHttpTest.java | 4 ++-- .../certificate-generator/pom.xml | 4 ++-- .../TestCertificateGenerationExtension.java | 14 +++++++------- .../test/support/certificate/TestCertificates.java | 4 ++-- .../client/it/ElasticsearchRestClientTest.java | 4 ++-- .../camel/quarkus/component/ftps/it/FtpsTest.java | 4 ++-- .../camel/quarkus/component/sftp/it/SftpTest.java | 4 ++-- .../camel/quarkus/component/grpc/it/GrpcTest.java | 4 ++-- .../hashicorp/vault/it/HashicorpVaultTest.java | 4 ++-- .../camel/quarkus/kafka/sasl/KafkaSaslSslTest.java | 4 ++-- .../camel/quarkus/kafka/ssl/KafkaSslTest.java | 4 ++-- .../component/lumberjack/it/LumberjackTest.java | 4 ++-- .../camel/quarkus/component/mail/MailTest.java | 4 ++-- .../camel/quarkus/component/nats/it/NatsTest.java | 4 ++-- .../quarkus/component/netty/tcp/NettyTcpTest.java | 4 ++-- .../quarkus/component/netty/udp/NettyUdpTest.java | 4 ++-- .../quarkus/component/oaipmh/it/OaipmhTest.java | 4 ++-- .../component/paho/mqtt5/it/PahoMqtt5Test.java | 4 ++-- .../camel/quarkus/component/paho/it/PahoTest.java | 4 ++-- .../ProxySslTest.java | 4 ++-- .../component/http/server/it/PlatformHttpTest.java | 4 ++-- .../websocket/it/VertxWebsocketLegacySslTest.java | 4 ++-- .../it/VertxWebsocketTlsNamedConfigTest.java | 4 ++-- .../vertx/websocket/it/VertxWebsocketTlsTest.java | 4 ++-- pom.xml | 2 +- poms/bom-test/pom.xml | 6 +++--- 30 files changed, 64 insertions(+), 64 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 877882edbb2c..85d60a084706 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 1f523639b9b0..2f6a58252c30 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.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 ede3a7fe8e66..dbd6313e3d07 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 @@ 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 cb84081484dd..8c5e1c76a095 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.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 e840c7960f5a..48a670079e6b 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 @@ 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 ba3ae2cc716b..9430281bbb11 100644 --- a/integration-tests-support/certificate-generator/pom.xml +++ b/integration-tests-support/certificate-generator/pom.xml @@ -31,8 +31,8 @@ - me.escoffier.certs - certificate-generator-junit5 + io.smallrye.certs + smallrye-certificate-generator-junit5 org.apache.camel.quarkus 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 d11ad362e3ba..dd0184cc62ad 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.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 @@ /** * 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/cescoffier/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 4c9a9ee4f8ed..c2bee1461d76 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,12 +22,12 @@ 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/cescoffier/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). */ 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 c9f50157df53..2151b98e56c7 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.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 673aa66eedf1..18bcf5e438d5 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.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 875b1325b49e..65f029409590 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.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 57b06a7d46c5..ddd6fd6cfe47 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.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 24988e84b225..a8b336ccb20a 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 @@ 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 bf65fb90925e..b2282010b2d8 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.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 0168f0d3bb34..a7eb01489e02 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.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 54f8985ec8fe..f50350ac8923 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.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 3f6665b64b99..e303e8656478 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.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 71e535917044..34e79b159f7e 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 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 021126fddb2c..63c008262ea8 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 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 07c25511526a..e793b506e849 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 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 40da1ffe6765..d38461cbb0e0 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 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 dcc9da8bdf73..38c0ad385a21 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.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 bab923dedcbf..d3ffd8df9fa4 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.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 3faa5e4b7ab2..8035c2774863 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.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 b77082560699..055bc16d50aa 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.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 32f33fedc34c..769f291fab69 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 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 d3e256a52bf6..9dacc940d6b7 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 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 f066753c4767..69dfbad0af28 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 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 669662108f55..0b47833578d1 100644 --- a/pom.xml +++ b/pom.xml @@ -172,7 +172,7 @@ 1.5.6-3 - 0.7.1 + 0.8.1 ${consul-client-version} ${ftpserver-version} 3.0 diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml index 1f65531c464d..9cbf4af89ae8 100644 --- a/poms/bom-test/pom.xml +++ b/poms/bom-test/pom.xml @@ -81,9 +81,9 @@ ${quarkiverse-micrometer.version} - me.escoffier.certs - certificate-generator-junit5 - ${certificate.generator.version} + io.smallrye.certs + smallrye-certificate-generator-junit5 + ${smallrye-certificate-generator-junit5.version} org.apache.camel.quarkus