Skip to content

Commit d32a75f

Browse files
dependabot[bot]iliyan-velichkov
dependabot[bot]
and
iliyan-velichkov
authored
Bump testcontainers.version from 1.21.1 to 2.0.3 (#5546)
* Bump testcontainers.version from 1.21.1 to 2.0.3 Bumps `testcontainers.version` from 1.21.1 to 2.0.3. Updates `org.testcontainers:testcontainers-bom` from 1.21.1 to 2.0.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.21.1...2.0.3) Updates `org.testcontainers:testcontainers` from 1.21.1 to 2.0.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](testcontainers/testcontainers-java@1.21.1...2.0.3) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-version: 2.0.3 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.testcontainers:testcontainers dependency-version: 2.0.3 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * use junit 5 annotations * adapt RabbitMQFacadeTest * adapt RedisFacadeTest * try to fix RabbitMQFacadeTest.java and RedisFacadeTest.java for windows execution * more RabbitMQFacadeTest.java and RedisFacadeTest.java adaptations * ignore test container tests for windows due to windows is not supported in testcontainers v2 WARN org.testcontainers.dockerclient.DockerClientProviderStrategy -- windows is currently not supported --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Iliyan Velichkov <velichkov.iliyan@gmail.com>
1 parent 0406748 commit d32a75f

File tree

4 files changed

+89
-99
lines changed

4 files changed

+89
-99
lines changed

‎components/api/api-rabbitmq/src/test/java/org/eclipse/dirigible/components/api/rabbitmq/RabbitMQFacadeTest.java‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,33 @@
99
*/
1010
package org.eclipse.dirigible.components.api.rabbitmq;
1111

12+
import nl.altindag.log.LogCaptor;
1213
import org.eclipse.dirigible.commons.config.Configuration;
13-
import org.junit.Before;
14-
import org.junit.Test;
15-
import org.junit.jupiter.api.TestInstance;
16-
import org.junit.jupiter.api.extension.ExtendWith;
17-
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
18-
import org.springframework.boot.test.context.SpringBootTest;
19-
import org.springframework.context.annotation.ComponentScan;
20-
import org.springframework.test.context.junit.jupiter.SpringExtension;
14+
import org.junit.jupiter.api.BeforeAll;
15+
import org.junit.jupiter.api.Test;
16+
import org.junit.jupiter.api.condition.DisabledOnOs;
17+
import org.junit.jupiter.api.condition.OS;
2118
import org.testcontainers.containers.RabbitMQContainer;
22-
23-
import nl.altindag.log.LogCaptor;
19+
import org.testcontainers.junit.jupiter.Container;
20+
import org.testcontainers.junit.jupiter.Testcontainers;
2421

2522
import static org.junit.jupiter.api.Assertions.assertEquals;
2623

27-
@ExtendWith(SpringExtension.class)
28-
@SpringBootTest
29-
@AutoConfigureMockMvc
30-
@ComponentScan(basePackages = {"org.eclipse.dirigible.components.*"})
31-
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
24+
@DisabledOnOs(OS.WINDOWS)
25+
@Testcontainers
3226
public class RabbitMQFacadeTest {
3327

34-
LogCaptor logCaptor = LogCaptor.forClass(RabbitMQFacade.class);
3528
private static final String message = "testMessage";
3629
private static final String queue = "test-queue";
3730

31+
@Container
32+
static RabbitMQContainer rabbit = new RabbitMQContainer("rabbitmq:3.8.19-alpine");
3833

39-
@Before
40-
public void setUp() {
41-
RabbitMQContainer rabbit = new RabbitMQContainer("rabbitmq:3.8.19-alpine");
42-
rabbit.start();
34+
LogCaptor logCaptor = LogCaptor.forClass(RabbitMQFacade.class);
4335

44-
String host = rabbit.getHost();
45-
Integer port = rabbit.getFirstMappedPort();
46-
Configuration.set("DIRIGIBLE_RABBITMQ_CLIENT_URI", host + ":" + port);
36+
@BeforeAll
37+
static void setUp() {
38+
Configuration.set("DIRIGIBLE_RABBITMQ_CLIENT_URI", rabbit.getHost() + ":" + rabbit.getFirstMappedPort());
4739
}
4840

4941
@Test

‎components/api/api-redis/pom.xml‎

Lines changed: 60 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,68 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
55

6-
<parent>
7-
<groupId>org.eclipse.dirigible</groupId>
8-
<artifactId>dirigible-components-parent</artifactId>
9-
<version>13.0.0-SNAPSHOT</version>
10-
<relativePath>../../pom.xml</relativePath>
11-
</parent>
6+
<parent>
7+
<groupId>org.eclipse.dirigible</groupId>
8+
<artifactId>dirigible-components-parent</artifactId>
9+
<version>13.0.0-SNAPSHOT</version>
10+
<relativePath>../../pom.xml</relativePath>
11+
</parent>
1212

13-
<name>Components - API - Redis</name>
14-
<artifactId>dirigible-components-api-redis</artifactId>
15-
<packaging>jar</packaging>
13+
<name>Components - API - Redis</name>
14+
<artifactId>dirigible-components-api-redis</artifactId>
15+
<packaging>jar</packaging>
1616

17-
<dependencies>
18-
<!-- JS sources -->
19-
<dependency>
20-
<groupId>org.eclipse.dirigible</groupId>
21-
<artifactId>dirigible-components-api-modules-javascript</artifactId>
22-
</dependency>
17+
<dependencies>
18+
<!-- JS sources -->
19+
<dependency>
20+
<groupId>org.eclipse.dirigible</groupId>
21+
<artifactId>dirigible-components-api-modules-javascript</artifactId>
22+
</dependency>
2323

24-
<!-- Redis dependencies -->
25-
<dependency>
26-
<groupId>redis.clients</groupId>
27-
<artifactId>jedis</artifactId>
28-
<type>jar</type>
29-
<scope>compile</scope>
30-
<exclusions>
31-
<exclusion>
32-
<groupId>org.json</groupId>
33-
<artifactId>json</artifactId>
34-
</exclusion>
35-
</exclusions>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.testcontainers</groupId>
39-
<artifactId>testcontainers</artifactId>
40-
<version>${testcontainers.version}</version>
41-
<scope>test</scope>
42-
</dependency>
43-
<!-- / Redis dependencies -->
44-
</dependencies>
24+
<!-- Redis dependencies -->
25+
<dependency>
26+
<groupId>redis.clients</groupId>
27+
<artifactId>jedis</artifactId>
28+
<type>jar</type>
29+
<scope>compile</scope>
30+
<exclusions>
31+
<exclusion>
32+
<groupId>org.json</groupId>
33+
<artifactId>json</artifactId>
34+
</exclusion>
35+
</exclusions>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.testcontainers</groupId>
39+
<artifactId>testcontainers</artifactId>
40+
<version>${testcontainers.version}</version>
41+
<scope>test</scope>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.testcontainers</groupId>
45+
<artifactId>junit-jupiter</artifactId>
46+
<scope>test</scope>
47+
</dependency>
48+
<!-- / Redis dependencies -->
49+
</dependencies>
4550

46-
<properties>
47-
<license.header.location>../../../licensing-header.txt</license.header.location>
48-
<parent.pom.folder>../../../</parent.pom.folder>
49-
</properties>
51+
<dependencyManagement>
52+
<dependencies>
53+
<dependency>
54+
<groupId>org.testcontainers</groupId>
55+
<artifactId>testcontainers-bom</artifactId>
56+
<version>${testcontainers.version}</version>
57+
<type>pom</type>
58+
<scope>import</scope>
59+
</dependency>
60+
</dependencies>
61+
</dependencyManagement>
62+
63+
<properties>
64+
<license.header.location>../../../licensing-header.txt</license.header.location>
65+
<parent.pom.folder>../../../</parent.pom.folder>
66+
</properties>
5067

5168
</project>

‎components/api/api-redis/src/test/java/org/eclipse/dirigible/components/api/redis/RedisFacadeTest.java‎

Lines changed: 13 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,28 @@
1-
/*
2-
* Copyright (c) 2025 Eclipse Dirigible contributors
3-
*
4-
* All rights reserved. This program and the accompanying materials are made available under the
5-
* terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
6-
* http://www.eclipse.org/legal/epl-v20.html
7-
*
8-
* SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0
9-
*/
101
package org.eclipse.dirigible.components.api.redis;
112

123
import org.eclipse.dirigible.commons.config.Configuration;
13-
import org.junit.Before;
14-
import org.junit.Test;
15-
import org.junit.jupiter.api.TestInstance;
16-
import org.junit.jupiter.api.extension.ExtendWith;
17-
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
18-
import org.springframework.boot.test.context.SpringBootTest;
19-
import org.springframework.context.annotation.ComponentScan;
20-
import org.springframework.security.test.context.support.WithMockUser;
21-
import org.springframework.test.context.junit.jupiter.SpringExtension;
4+
import org.junit.jupiter.api.BeforeAll;
5+
import org.junit.jupiter.api.Test;
6+
import org.junit.jupiter.api.condition.DisabledOnOs;
7+
import org.junit.jupiter.api.condition.OS;
228
import org.testcontainers.containers.GenericContainer;
9+
import org.testcontainers.junit.jupiter.Container;
10+
import org.testcontainers.junit.jupiter.Testcontainers;
2311
import org.testcontainers.utility.DockerImageName;
2412
import redis.clients.jedis.Jedis;
2513

2614
import static org.junit.jupiter.api.Assertions.assertEquals;
2715

28-
@WithMockUser
29-
@ExtendWith(SpringExtension.class)
30-
@SpringBootTest
31-
@AutoConfigureMockMvc
32-
@ComponentScan(basePackages = {"org.eclipse.dirigible.components.*"})
33-
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
16+
@DisabledOnOs(OS.WINDOWS)
17+
@Testcontainers
3418
public class RedisFacadeTest {
3519

36-
@Before
37-
public void setUp() {
38-
GenericContainer redis = new GenericContainer(DockerImageName.parse("redis:5.0.3-alpine")).withExposedPorts(6379);
39-
redis.start();
20+
@Container
21+
static GenericContainer<?> redis = new GenericContainer<>(DockerImageName.parse("redis:5.0.3-alpine")).withExposedPorts(6379);
4022

41-
String host = redis.getHost();
42-
Integer port = redis.getFirstMappedPort();
43-
44-
Configuration.set("DIRIGIBLE_REDIS_CLIENT_URI", host + ":" + port);
23+
@BeforeAll
24+
static void setUp() {
25+
Configuration.set("DIRIGIBLE_REDIS_CLIENT_URI", redis.getHost() + ":" + redis.getFirstMappedPort());
4526
}
4627

4728
@Test

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
<bpmn-visualization.version>0.46.0</bpmn-visualization.version>
229229
<i18next.version>25.3.0</i18next.version>
230230
<!-- Tests -->
231-
<testcontainers.version>1.21.1</testcontainers.version>
231+
<testcontainers.version>2.0.3</testcontainers.version>
232232
<selenide.version>7.13.0</selenide.version>
233233

234234
<antlr4-maven-plugin.version>4.13.2</antlr4-maven-plugin.version>

0 commit comments

Comments
 (0)