You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/12/05 09:58:28 UTC
(camel) branch main updated: Regen and upgrade to localstack 3.0.2 (#12315)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 05b5783767e Regen and upgrade to localstack 3.0.2 (#12315)
05b5783767e is described below
commit 05b5783767ef0fcd22c9996e0ae4b868f76caaaa
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Dec 5 10:58:19 2023 +0100
Regen and upgrade to localstack 3.0.2 (#12315)
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../component/aws/config/AWSConfigProducer.java | 3 +-
.../test/infra/aws2/services/AWSContainer.java | 12 ++---
.../aws2/services/AWSLocalContainerService.java | 6 +--
.../src/test/resources/container.properties | 4 +-
.../ElasticSearchLocalContainerService.java | 17 +++----
.../etcd3/services/Etcd3LocalContainerService.java | 6 +--
.../fhir/services/FhirLocalContainerService.java | 4 +-
.../HashicorpVaultLocalContainerService.java | 54 +++++++++++-----------
.../services/InfinispanLocalContainerService.java | 4 +-
.../services/ContainerLocalAuthKafkaService.java | 2 +-
.../minio/services/MinioLocalContainerService.java | 4 +-
.../services/OpenSearchLocalContainerService.java | 7 +--
.../services/PostgresLocalContainerService.java | 3 +-
.../services/PulsarLocalContainerService.java | 4 +-
.../infra/rocketmq/services/RocketMQContainer.java | 6 +--
.../infra/xmpp/services/XmppServerContainer.java | 8 ++--
16 files changed, 74 insertions(+), 70 deletions(-)
diff --git a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigProducer.java b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigProducer.java
index 317be5b3bf6..66f72d11682 100644
--- a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigProducer.java
+++ b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigProducer.java
@@ -275,7 +275,8 @@ public class AWSConfigProducer extends DefaultProducer {
DeleteConformancePackRequest request = (DeleteConformancePackRequest) payload;
result = configClient.deleteConformancePack(request);
} catch (AwsServiceException ase) {
- LOG.trace("Remove Conformance Pack rule command returned the error code {}", ase.awsErrorDetails().errorCode());
+ LOG.trace("Remove Conformance Pack rule command returned the error code {}",
+ ase.awsErrorDetails().errorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
index 54f267e14ff..c278c02abd9 100644
--- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
+++ b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
@@ -17,6 +17,11 @@
package org.apache.camel.test.infra.aws2.services;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
import org.apache.camel.test.infra.aws.common.AWSProperties;
import org.apache.camel.test.infra.aws2.common.TestAWSCredentialsProvider;
import org.apache.camel.test.infra.common.LocalPropertyResolver;
@@ -26,18 +31,13 @@ import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
/*
The reason we are not using LocalStack containers here is because they bundle AWS SDK v1. They would
be added to the classpath during the test and, potentially, cause errors or cause the code to not
behave as in runtime.
*/
public class AWSContainer extends GenericContainer<AWSContainer> {
-
+
private static final Logger LOG = LoggerFactory.getLogger(AWSLocalContainerService.class);
private static final int SERVICE_PORT = 4566;
diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerService.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerService.java
index 9828430c088..cc38e0752d6 100644
--- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerService.java
+++ b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSLocalContainerService.java
@@ -17,6 +17,9 @@
package org.apache.camel.test.infra.aws2.services;
+import java.net.URI;
+import java.util.Properties;
+
import org.apache.camel.test.infra.aws.common.AWSConfigs;
import org.apache.camel.test.infra.aws.common.AWSProperties;
import org.apache.camel.test.infra.aws.common.services.AWSService;
@@ -27,9 +30,6 @@ import org.slf4j.LoggerFactory;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
import software.amazon.awssdk.regions.Region;
-import java.net.URI;
-import java.util.Properties;
-
public abstract class AWSLocalContainerService implements AWSService, ContainerService<AWSContainer> {
private static final Logger LOG = LoggerFactory.getLogger(AWSLocalContainerService.class);
private final AWSContainer container;
diff --git a/test-infra/camel-test-infra-aws-v2/src/test/resources/container.properties b/test-infra/camel-test-infra-aws-v2/src/test/resources/container.properties
index 09fb2345113..a71fe28cc25 100644
--- a/test-infra/camel-test-infra-aws-v2/src/test/resources/container.properties
+++ b/test-infra/camel-test-infra-aws-v2/src/test/resources/container.properties
@@ -14,5 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-## tested against 2.1.2, 2.2.0 & 2.3.1
-aws.container=localstack/localstack:2.3.2
\ No newline at end of file
+
+aws.container=localstack/localstack:3.0.2
diff --git a/test-infra/camel-test-infra-elasticsearch/src/test/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchLocalContainerService.java b/test-infra/camel-test-infra-elasticsearch/src/test/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchLocalContainerService.java
index 0f33c7f437b..5520a34a977 100644
--- a/test-infra/camel-test-infra-elasticsearch/src/test/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchLocalContainerService.java
+++ b/test-infra/camel-test-infra-elasticsearch/src/test/java/org/apache/camel/test/infra/elasticsearch/services/ElasticSearchLocalContainerService.java
@@ -17,6 +17,15 @@
package org.apache.camel.test.infra.elasticsearch.services;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.Objects;
+import java.util.Optional;
+
+import javax.net.ssl.SSLContext;
+
import org.apache.camel.test.infra.common.LocalPropertyResolver;
import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
import org.apache.camel.test.infra.common.services.ContainerService;
@@ -26,14 +35,6 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
-import javax.net.ssl.SSLContext;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.Duration;
-import java.util.Objects;
-import java.util.Optional;
-
public class ElasticSearchLocalContainerService implements ElasticSearchService, ContainerService<ElasticsearchContainer> {
private static final Logger LOG = LoggerFactory.getLogger(ElasticSearchLocalContainerService.class);
private static final int ELASTIC_SEARCH_PORT = 9200;
diff --git a/test-infra/camel-test-infra-etcd3/src/test/java/org/apache/camel/test/infra/etcd3/services/Etcd3LocalContainerService.java b/test-infra/camel-test-infra-etcd3/src/test/java/org/apache/camel/test/infra/etcd3/services/Etcd3LocalContainerService.java
index 353b8f2c0c4..d0bd59de346 100644
--- a/test-infra/camel-test-infra-etcd3/src/test/java/org/apache/camel/test/infra/etcd3/services/Etcd3LocalContainerService.java
+++ b/test-infra/camel-test-infra-etcd3/src/test/java/org/apache/camel/test/infra/etcd3/services/Etcd3LocalContainerService.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.test.infra.etcd3.services;
+import java.util.List;
+import java.util.UUID;
+
import io.etcd.jetcd.launcher.EtcdContainer;
import org.apache.camel.test.infra.common.LocalPropertyResolver;
import org.apache.camel.test.infra.common.services.ContainerService;
@@ -24,9 +27,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.wait.strategy.Wait;
-import java.util.List;
-import java.util.UUID;
-
public class Etcd3LocalContainerService implements Etcd3Service, ContainerService<EtcdContainer> {
public static final String CONTAINER_NAME = "etcd";
public static final int ETCD_CLIENT_PORT = 2379;
diff --git a/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java b/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java
index 746f17671f7..c2b0405d46a 100644
--- a/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java
+++ b/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.test.infra.fhir.services;
+import java.time.Duration;
+
import org.apache.camel.test.infra.common.LocalPropertyResolver;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.fhir.common.FhirProperties;
@@ -24,8 +26,6 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait;
-import java.time.Duration;
-
public class FhirLocalContainerService implements FhirService, ContainerService<GenericContainer> {
// needs https://github.com/hapifhir/hapi-fhir-jpaserver-starter/commit/54120f374eea5084634830d34c99a9137b22a310
public static final String CONTAINER_NAME = "fhir";
diff --git a/test-infra/camel-test-infra-hashicorp-vault/src/test/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultLocalContainerService.java b/test-infra/camel-test-infra-hashicorp-vault/src/test/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultLocalContainerService.java
index 02227b6351e..fa8d772be43 100644
--- a/test-infra/camel-test-infra-hashicorp-vault/src/test/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultLocalContainerService.java
+++ b/test-infra/camel-test-infra-hashicorp-vault/src/test/java/org/apache/camel/test/infra/hashicorp/vault/services/HashicorpVaultLocalContainerService.java
@@ -1,32 +1,32 @@
- /*
- * 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.
- */
+/*
+* 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.camel.test.infra.hashicorp.vault.services;
- import org.apache.camel.test.infra.common.LocalPropertyResolver;
- import org.apache.camel.test.infra.common.services.ContainerService;
- import org.apache.camel.test.infra.hashicorp.vault.common.HashicorpVaultProperties;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
- import org.testcontainers.containers.GenericContainer;
- import org.testcontainers.containers.output.OutputFrame;
- import org.testcontainers.containers.output.Slf4jLogConsumer;
- import org.testcontainers.containers.wait.strategy.Wait;
-
- import java.util.function.Consumer;
+import java.util.function.Consumer;
+
+import org.apache.camel.test.infra.common.LocalPropertyResolver;
+import org.apache.camel.test.infra.common.services.ContainerService;
+import org.apache.camel.test.infra.hashicorp.vault.common.HashicorpVaultProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.strategy.Wait;
public class HashicorpVaultLocalContainerService implements HashicorpVaultService, ContainerService<GenericContainer<?>> {
public static final String CONTAINER_NAME = "hashicorp-vault";
diff --git a/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java b/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java
index 031ddf96fd4..242186a6a96 100644
--- a/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java
+++ b/test-infra/camel-test-infra-infinispan/src/test/java/org/apache/camel/test/infra/infinispan/services/InfinispanLocalContainerService.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.test.infra.infinispan.services;
+import java.util.function.Consumer;
+
import org.apache.camel.test.infra.common.LocalPropertyResolver;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.infinispan.common.InfinispanProperties;
@@ -27,8 +29,6 @@ import org.testcontainers.containers.output.OutputFrame;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
-import java.util.function.Consumer;
-
public class InfinispanLocalContainerService implements InfinispanService, ContainerService<GenericContainer<?>> {
public static final String CONTAINER_NAME = "infinispan";
private static final String DEFAULT_USERNAME = "admin";
diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
index fdf96f388dd..951d6c8cfa5 100644
--- a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
+++ b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
@@ -33,7 +33,7 @@ public class ContainerLocalAuthKafkaService implements KafkaService, ContainerSe
public TransientAuthenticatedKafkaContainer(String jaasConfigFile) {
super(DockerImageName.parse(System.getProperty(
KafkaProperties.KAFKA_CONTAINER,
- ContainerLocalKafkaService.KAFKA3_IMAGE_NAME))
+ ContainerLocalKafkaService.KAFKA3_IMAGE_NAME))
.asCompatibleSubstituteFor(ContainerLocalKafkaService.KAFKA3_IMAGE_NAME));
withEmbeddedZookeeper();
diff --git a/test-infra/camel-test-infra-minio/src/test/java/org/apache/camel/test/infra/minio/services/MinioLocalContainerService.java b/test-infra/camel-test-infra-minio/src/test/java/org/apache/camel/test/infra/minio/services/MinioLocalContainerService.java
index 62e94279983..47a4080e9d8 100644
--- a/test-infra/camel-test-infra-minio/src/test/java/org/apache/camel/test/infra/minio/services/MinioLocalContainerService.java
+++ b/test-infra/camel-test-infra-minio/src/test/java/org/apache/camel/test/infra/minio/services/MinioLocalContainerService.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.test.infra.minio.services;
+import java.time.Duration;
+
import org.apache.camel.test.infra.common.LocalPropertyResolver;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.minio.common.MinioProperties;
@@ -24,8 +26,6 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
-import java.time.Duration;
-
public class MinioLocalContainerService implements MinioService, ContainerService<GenericContainer> {
public static final String CONTAINER_NAME = "minio";
private static final String ACCESS_KEY;
diff --git a/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/services/OpenSearchLocalContainerService.java b/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/services/OpenSearchLocalContainerService.java
index 2d2570e54f6..f572c629355 100644
--- a/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/services/OpenSearchLocalContainerService.java
+++ b/test-infra/camel-test-infra-opensearch/src/test/java/org/apache/camel/test/infra/opensearch/services/OpenSearchLocalContainerService.java
@@ -17,6 +17,8 @@
package org.apache.camel.test.infra.opensearch.services;
+import java.time.Duration;
+
import org.apache.camel.test.infra.common.LocalPropertyResolver;
import org.apache.camel.test.infra.common.services.ContainerEnvironmentUtil;
import org.apache.camel.test.infra.common.services.ContainerService;
@@ -27,8 +29,6 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
-import java.time.Duration;
-
public class OpenSearchLocalContainerService implements OpenSearchService, ContainerService<OpensearchContainer> {
private static final Logger LOG = LoggerFactory.getLogger(OpenSearchLocalContainerService.class);
private static final int OPEN_SEARCH_PORT = 9200;
@@ -37,7 +37,8 @@ public class OpenSearchLocalContainerService implements OpenSearchService, Conta
private final OpensearchContainer container;
public OpenSearchLocalContainerService() {
- this(LocalPropertyResolver.getProperty(OpenSearchLocalContainerService.class, OpenSearchProperties.OPEN_SEARCH_CONTAINER));
+ this(LocalPropertyResolver.getProperty(OpenSearchLocalContainerService.class,
+ OpenSearchProperties.OPEN_SEARCH_CONTAINER));
}
public OpenSearchLocalContainerService(String imageName) {
diff --git a/test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerService.java b/test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerService.java
index 81beea3a11f..66cbbc63e5b 100644
--- a/test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerService.java
+++ b/test-infra/camel-test-infra-postgres/src/test/java/org/apache/camel/test/infra/postgres/services/PostgresLocalContainerService.java
@@ -24,7 +24,8 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.containers.PostgreSQLContainer;
public class PostgresLocalContainerService implements PostgresService, ContainerService<PostgreSQLContainer> {
- public static final String DEFAULT_POSTGRES_CONTAINER = LocalPropertyResolver.getProperty(PostgresLocalContainerService.class, PostgresProperties.POSTGRES_CONTAINER);
+ public static final String DEFAULT_POSTGRES_CONTAINER
+ = LocalPropertyResolver.getProperty(PostgresLocalContainerService.class, PostgresProperties.POSTGRES_CONTAINER);
private static final Logger LOG = LoggerFactory.getLogger(PostgresLocalContainerService.class);
private final PostgreSQLContainer container;
diff --git a/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerService.java b/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerService.java
index f6ef858a7e3..3a02c693502 100644
--- a/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerService.java
+++ b/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerService.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.test.infra.pulsar.services;
+import java.time.Duration;
+
import org.apache.camel.test.infra.common.LocalPropertyResolver;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.pulsar.common.PulsarProperties;
@@ -24,8 +26,6 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.containers.PulsarContainer;
import org.testcontainers.utility.DockerImageName;
-import java.time.Duration;
-
public class PulsarLocalContainerService implements PulsarService, ContainerService<PulsarContainer> {
private static final Logger LOG = LoggerFactory.getLogger(PulsarLocalContainerService.class);
diff --git a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainer.java b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainer.java
index 4434fae0f05..d0e63eb409b 100644
--- a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainer.java
+++ b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainer.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.test.infra.rocketmq.services;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
import org.apache.camel.test.infra.common.LocalPropertyResolver;
import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.rocketmq.common.RocketMQProperties;
@@ -25,9 +28,6 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.Network;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
public class RocketMQContainer implements RocketMQService, ContainerService<RocketMQNameserverContainer> {
private static final Logger LOG = LoggerFactory.getLogger(RocketMQContainer.class);
public static final String ROCKETMQ_VERSION = LocalPropertyResolver.getProperty(
diff --git a/test-infra/camel-test-infra-xmpp/src/test/java/org/apache/camel/test/infra/xmpp/services/XmppServerContainer.java b/test-infra/camel-test-infra-xmpp/src/test/java/org/apache/camel/test/infra/xmpp/services/XmppServerContainer.java
index d1d100fd1ae..3fe142cbc9a 100644
--- a/test-infra/camel-test-infra-xmpp/src/test/java/org/apache/camel/test/infra/xmpp/services/XmppServerContainer.java
+++ b/test-infra/camel-test-infra-xmpp/src/test/java/org/apache/camel/test/infra/xmpp/services/XmppServerContainer.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.test.infra.xmpp.services;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
import org.apache.camel.test.infra.common.LocalPropertyResolver;
import org.apache.camel.test.infra.xmpp.common.XmppProperties;
import org.slf4j.Logger;
@@ -24,10 +28,6 @@ import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
public class XmppServerContainer extends GenericContainer {
private static final Logger LOGGER = LoggerFactory.getLogger(XmppServerContainer.class);