Skip to content

Commit 2f73ac0

Browse files
authored
Merge pull request wildfly#19392 from rhusar/WFLY-21182
WFLY-21182 Upgrade org.arquillian.testcontainers:arquillian-testcontainers to 1.0.0.Beta1
2 parents 073e8ef + 085e2eb commit 2f73ac0

File tree

46 files changed

+62
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+62
-62
lines changed

boms/standard-test-expansion/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@
239239
</dependency>
240240

241241
<dependency>
242-
<groupId>org.jboss.arquillian</groupId>
242+
<groupId>org.arquillian.testcontainers</groupId>
243243
<artifactId>arquillian-testcontainers</artifactId>
244-
<version>${version.org.jboss.arquillian.testcontainers}</version>
244+
<version>${version.org.arquillian.testcontainers}</version>
245245
<scope>test</scope>
246246
</dependency>
247247

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
<version.org.javassist>3.29.2-GA</version.org.javassist>
335335
<version.org.jboss.arquillian.core>1.10.0.Final</version.org.jboss.arquillian.core>
336336
<version.org.jboss.arquillian.jakarta>10.0.0.Final</version.org.jboss.arquillian.jakarta>
337-
<version.org.jboss.arquillian.testcontainers>1.0.0.Alpha4</version.org.jboss.arquillian.testcontainers>
337+
<version.org.arquillian.testcontainers>1.0.0.Beta1</version.org.arquillian.testcontainers>
338338
<version.org.jboss.byteman>4.0.26</version.org.jboss.byteman>
339339
<version.org.jboss.logmanager.commons-logging-jboss-logmanager>1.0.3.Final</version.org.jboss.logmanager.commons-logging-jboss-logmanager>
340340
<!-- only needed here until wildfly-arquillian has this version properly synced with arquillian itself -->

testsuite/integration/expansion/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
</dependency>
434434

435435
<dependency>
436-
<groupId>org.jboss.arquillian</groupId>
436+
<groupId>org.arquillian.testcontainers</groupId>
437437
<artifactId>arquillian-testcontainers</artifactId>
438438
<scope>test</scope>
439439
</dependency>

testsuite/integration/expansion/src/test/java/org/wildfly/test/integration/microprofile/faulttolerance/micrometer/FaultToleranceMicrometerIntegrationDisabledTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
*/
55
package org.wildfly.test.integration.microprofile.faulttolerance.micrometer;
66

7+
import org.arquillian.testcontainers.api.TestcontainersRequired;
78
import org.jboss.arquillian.container.test.api.Deployment;
89
import org.jboss.arquillian.junit.Arquillian;
9-
import org.jboss.arquillian.testcontainers.api.TestcontainersRequired;
1010
import org.jboss.as.arquillian.api.ServerSetup;
1111
import org.jboss.as.test.shared.observability.setuptasks.MicrometerSetupTask;
1212
import org.jboss.shrinkwrap.api.Archive;

testsuite/integration/expansion/src/test/java/org/wildfly/test/integration/microprofile/faulttolerance/micrometer/FaultToleranceMicrometerIntegrationTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
*/
55
package org.wildfly.test.integration.microprofile.faulttolerance.micrometer;
66

7+
import org.arquillian.testcontainers.api.TestcontainersRequired;
78
import org.jboss.arquillian.container.test.api.Deployment;
89
import org.jboss.arquillian.junit.Arquillian;
9-
import org.jboss.arquillian.testcontainers.api.TestcontainersRequired;
1010
import org.jboss.as.arquillian.api.ServerSetup;
1111
import org.jboss.as.test.shared.observability.setuptasks.MicrometerSetupTask;
1212
import org.jboss.shrinkwrap.api.Archive;

testsuite/integration/expansion/src/test/java/org/wildfly/test/integration/microprofile/faulttolerance/multideployment/MultipleDeploymentMetricsTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import java.util.concurrent.TimeUnit;
1111
import java.util.concurrent.TimeoutException;
1212

13+
import org.arquillian.testcontainers.api.TestcontainersRequired;
1314
import org.jboss.arquillian.container.test.api.Deployment;
1415
import org.jboss.arquillian.container.test.api.OperateOnDeployment;
1516
import org.jboss.arquillian.container.test.api.RunAsClient;
1617
import org.jboss.arquillian.junit.Arquillian;
1718
import org.jboss.arquillian.test.api.ArquillianResource;
18-
import org.jboss.arquillian.testcontainers.api.TestcontainersRequired;
1919
import org.jboss.as.arquillian.api.ServerSetup;
2020
import org.jboss.as.arquillian.api.ServerSetupTask;
2121
import org.jboss.as.test.integration.common.HttpRequest;

testsuite/integration/expansion/src/test/java/org/wildfly/test/integration/microprofile/faulttolerance/opentelemetry/FaultToleranceOpenTelemetryIntegrationTestCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import java.util.Optional;
1010
import java.util.concurrent.TimeUnit;
1111

12+
import org.arquillian.testcontainers.api.Testcontainer;
13+
import org.arquillian.testcontainers.api.TestcontainersRequired;
1214
import org.jboss.arquillian.container.test.api.Deployment;
1315
import org.jboss.arquillian.container.test.api.RunAsClient;
1416
import org.jboss.arquillian.junit.Arquillian;
1517
import org.jboss.arquillian.test.api.ArquillianResource;
16-
import org.jboss.arquillian.testcontainers.api.TestcontainersRequired;
17-
import org.jboss.arquillian.testcontainers.api.Testcontainer;
1818
import org.jboss.as.arquillian.api.ServerSetup;
1919
import org.jboss.as.test.integration.common.HttpRequest;
2020
import org.jboss.as.test.shared.observability.containers.OpenTelemetryCollectorContainer;

testsuite/integration/expansion/src/test/java/org/wildfly/test/integration/microprofile/reactive/RunArtemisAmqpSetupTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.nio.file.Paths;
1414
import java.util.Map;
1515

16-
import org.jboss.arquillian.testcontainers.api.TestcontainersRequired;
16+
import org.arquillian.testcontainers.api.TestcontainersRequired;
1717
import org.jboss.as.arquillian.api.ServerSetupTask;
1818
import org.jboss.as.arquillian.container.ManagementClient;
1919
import org.jboss.as.controller.PathAddress;

testsuite/integration/expansion/src/test/java/org/wildfly/test/integration/microprofile/reactive/RunKafkaSetupTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.Map;
1313

1414
import io.smallrye.reactive.messaging.kafka.companion.KafkaCompanion;
15-
import org.jboss.arquillian.testcontainers.api.TestcontainersRequired;
15+
import org.arquillian.testcontainers.api.TestcontainersRequired;
1616
import org.jboss.as.arquillian.api.ServerSetupTask;
1717
import org.jboss.as.arquillian.container.ManagementClient;
1818
import org.jboss.as.test.config.ContainerConfig;

testsuite/integration/expansion/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/amqp/AnonymousAmqpTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import java.util.PropertyPermission;
1313
import java.util.concurrent.TimeUnit;
1414

15+
import org.arquillian.testcontainers.api.TestcontainersRequired;
1516
import org.jboss.arquillian.container.test.api.Deployment;
1617
import org.jboss.arquillian.container.test.api.RunAsClient;
1718
import org.jboss.arquillian.junit.Arquillian;
1819
import org.jboss.arquillian.test.api.ArquillianResource;
19-
import org.jboss.arquillian.testcontainers.api.TestcontainersRequired;
2020
import org.jboss.as.arquillian.api.ServerSetup;
2121
import org.jboss.as.test.shared.TimeoutUtil;
2222
import org.jboss.shrinkwrap.api.ShrinkWrap;

0 commit comments

Comments
 (0)