Skip to content

Commit 361646c

Browse files
CIRCSTORE-656 Upgrade dependencies for Kafka 4.2 compatibility
1 parent e84b649 commit 361646c

2 files changed

Lines changed: 22 additions & 3 deletions

File tree

pom.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2929
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3030
<ramlfiles_path>${basedir}/ramls</ramlfiles_path>
31-
<vertx-version>5.0.5</vertx-version>
31+
<vertx-version>5.0.12</vertx-version>
3232
<raml-module-builder-version>36.0.0</raml-module-builder-version>
3333
<spring.version>6.2.3</spring.version>
3434
<junit5.version>5.10.2</junit5.version>
@@ -84,7 +84,12 @@
8484
<dependency>
8585
<groupId>org.folio</groupId>
8686
<artifactId>folio-kafka-wrapper</artifactId>
87-
<version>4.0.0</version>
87+
<version>4.1.0-SNAPSHOT</version>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.apache.kafka</groupId>
91+
<artifactId>kafka-clients</artifactId>
92+
<version>4.2.0</version>
8893
</dependency>
8994
<dependency>
9095
<groupId>junit</groupId>

src/test/java/org/folio/rest/api/StorageTestSuite.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.junit.platform.suite.api.SelectClasses;
4141
import org.junit.platform.suite.api.Suite;
4242
import org.testcontainers.kafka.KafkaContainer;
43+
import org.testcontainers.containers.GenericContainer;
4344
import org.testcontainers.utility.DockerImageName;
4445

4546
import com.github.tomakehurst.wiremock.WireMockServer;
@@ -98,9 +99,15 @@ public class StorageTestSuite {
9899
private static MockServer mockServer;
99100
private static final WireMockServer wireMockServer = new WireMockServer(PROXY_PORT);
100101

101-
private static final KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("apache/kafka-native:3.8.0"))
102+
private static final KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("apache/kafka-native:4.2.0"))
102103
.withStartupAttempts(3);
103104

105+
@SuppressWarnings("resource")
106+
private static final GenericContainer<?> sidecarContainer = new GenericContainer<>(
107+
DockerImageName.parse("folioci/folio-module-sidecar:latest"))
108+
.withExposedPorts(8081)
109+
.withNetworkAliases("folio-module-sidecar");
110+
104111
/**
105112
* Return a URL for the path and the parameters.
106113
*
@@ -152,6 +159,7 @@ public static void before() throws InterruptedException,
152159
PostgresClient.setPostgresTester(new PostgresTesterContainer());
153160

154161
kafkaContainer.start();
162+
sidecarContainer.start();
155163
var host = kafkaContainer.getHost();
156164
var port = String.valueOf(kafkaContainer.getFirstMappedPort());
157165
log.info("Starting Kafka host={} port={}", host, port);
@@ -202,6 +210,12 @@ public static void after()
202210
log.warn("after:: kafkaContainer.stop() failed (ignored): {}", e.getMessage());
203211
}
204212

213+
try {
214+
sidecarContainer.stop();
215+
} catch (Throwable e) {
216+
log.warn("after:: sidecarContainer.stop() failed (ignored): {}", e.getMessage());
217+
}
218+
205219
try {
206220
mockServer.close();
207221
} catch (Throwable e) {

0 commit comments

Comments
 (0)