Skip to content

Commit 37deada

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #349 from OpenLiberty/staging
Merge staging to prod: Fix daily build failure
2 parents ca56807 + 98d10f0 commit 37deada

File tree

4 files changed

+92
-102
lines changed

4 files changed

+92
-102
lines changed

‎finish/inventory/src/test/java/it/io/openliberty/guides/inventory/InventoryServiceIT.java‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2020, 2024 IBM Corporation and others.
3+
* Copyright (c) 2020, 2025 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
@@ -11,47 +11,44 @@
1111
// end::copyright[]
1212
package it.io.openliberty.guides.inventory;
1313

14-
import java.util.List;
15-
import java.time.Duration;
16-
1714
import static org.junit.jupiter.api.Assertions.assertEquals;
1815

1916
import java.math.BigDecimal;
2017
import java.net.Socket;
2118
import java.nio.file.Paths;
19+
import java.time.Duration;
20+
import java.util.List;
2221
import java.util.Properties;
2322

24-
import jakarta.ws.rs.core.GenericType;
25-
import jakarta.ws.rs.core.Response;
26-
import jakarta.ws.rs.core.UriBuilder;
27-
import jakarta.ws.rs.client.ClientBuilder;
28-
29-
import org.slf4j.Logger;
30-
import org.slf4j.LoggerFactory;
31-
import org.junit.jupiter.api.Test;
32-
import org.junit.jupiter.api.AfterAll;
33-
import org.junit.jupiter.api.AfterEach;
34-
import org.junit.jupiter.api.BeforeAll;
35-
import org.junit.jupiter.api.BeforeEach;
36-
import org.junit.jupiter.api.Assertions;
37-
import org.testcontainers.containers.Network;
38-
import org.testcontainers.utility.DockerImageName;
39-
import org.apache.kafka.clients.producer.ProducerRecord;
40-
import org.apache.kafka.clients.producer.ProducerConfig;
4123
import org.apache.kafka.clients.producer.KafkaProducer;
42-
import org.testcontainers.containers.KafkaContainer;
43-
import org.testcontainers.containers.GenericContainer;
44-
import org.testcontainers.junit.jupiter.Testcontainers;
45-
import org.testcontainers.images.builder.ImageFromDockerfile;
24+
import org.apache.kafka.clients.producer.ProducerConfig;
25+
import org.apache.kafka.clients.producer.ProducerRecord;
4626
import org.apache.kafka.common.serialization.StringSerializer;
4727
import org.jboss.resteasy.client.jaxrs.ResteasyClient;
4828
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
4929
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
50-
import org.testcontainers.containers.wait.strategy.Wait;
30+
import org.junit.jupiter.api.AfterAll;
31+
import org.junit.jupiter.api.AfterEach;
32+
import org.junit.jupiter.api.Assertions;
33+
import org.junit.jupiter.api.BeforeAll;
34+
import org.junit.jupiter.api.BeforeEach;
35+
import org.junit.jupiter.api.Test;
36+
import org.slf4j.Logger;
37+
import org.slf4j.LoggerFactory;
38+
import org.testcontainers.containers.GenericContainer;
39+
import org.testcontainers.containers.Network;
5140
import org.testcontainers.containers.output.Slf4jLogConsumer;
41+
import org.testcontainers.containers.wait.strategy.Wait;
42+
import org.testcontainers.images.builder.ImageFromDockerfile;
43+
import org.testcontainers.junit.jupiter.Testcontainers;
44+
import org.testcontainers.kafka.ConfluentKafkaContainer;
5245

5346
import io.openliberty.guides.models.SystemLoad;
5447
import io.openliberty.guides.models.SystemLoad.SystemLoadSerializer;
48+
import jakarta.ws.rs.client.ClientBuilder;
49+
import jakarta.ws.rs.core.GenericType;
50+
import jakarta.ws.rs.core.Response;
51+
import jakarta.ws.rs.core.UriBuilder;
5552

5653

5754
@Testcontainers
@@ -69,9 +66,9 @@ public class InventoryServiceIT {
6966
new ImageFromDockerfile("inventory:1.0-SNAPSHOT")
7067
.withDockerfile(Paths.get("./Dockerfile"));
7168

72-
private static KafkaContainer kafkaContainer =
73-
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"))
74-
.withListener(() -> "kafka:19092")
69+
private static ConfluentKafkaContainer kafkaContainer =
70+
new ConfluentKafkaContainer("confluentinc/cp-kafka:latest")
71+
.withListener("kafka:19092")
7572
.withNetwork(network);
7673

7774
private static GenericContainer<?> inventoryContainer =

‎finish/system/src/test/java/it/io/openliberty/guides/system/SystemServiceIT.java‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2020, 2024 IBM Corporation and others.
3+
* Copyright (c) 2020, 2025 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
@@ -11,35 +11,33 @@
1111
// end::copyright[]
1212
package it.io.openliberty.guides.system;
1313

14+
import static org.junit.jupiter.api.Assertions.assertNotNull;
15+
16+
import java.net.Socket;
17+
import java.nio.file.Paths;
1418
import java.time.Duration;
1519
import java.util.Collections;
1620
import java.util.Properties;
17-
import java.net.Socket;
18-
import java.nio.file.Paths;
1921

20-
import org.slf4j.Logger;
21-
import org.slf4j.LoggerFactory;
22-
import org.junit.jupiter.api.Test;
22+
import org.apache.kafka.clients.consumer.ConsumerConfig;
23+
import org.apache.kafka.clients.consumer.ConsumerRecord;
24+
import org.apache.kafka.clients.consumer.ConsumerRecords;
25+
import org.apache.kafka.clients.consumer.KafkaConsumer;
26+
import org.apache.kafka.common.serialization.StringDeserializer;
2327
import org.junit.jupiter.api.AfterAll;
2428
import org.junit.jupiter.api.AfterEach;
2529
import org.junit.jupiter.api.BeforeAll;
2630
import org.junit.jupiter.api.BeforeEach;
27-
import org.testcontainers.junit.jupiter.Testcontainers;
28-
import static org.junit.jupiter.api.Assertions.assertNotNull;
29-
30-
import org.testcontainers.containers.KafkaContainer;
31+
import org.junit.jupiter.api.Test;
32+
import org.slf4j.Logger;
33+
import org.slf4j.LoggerFactory;
34+
import org.testcontainers.containers.GenericContainer;
3135
import org.testcontainers.containers.Network;
36+
import org.testcontainers.containers.output.Slf4jLogConsumer;
3237
import org.testcontainers.containers.wait.strategy.Wait;
3338
import org.testcontainers.images.builder.ImageFromDockerfile;
34-
import org.testcontainers.containers.GenericContainer;
35-
import org.testcontainers.containers.output.Slf4jLogConsumer;
36-
import org.testcontainers.utility.DockerImageName;
37-
38-
import org.apache.kafka.clients.consumer.ConsumerConfig;
39-
import org.apache.kafka.clients.consumer.ConsumerRecord;
40-
import org.apache.kafka.clients.consumer.ConsumerRecords;
41-
import org.apache.kafka.clients.consumer.KafkaConsumer;
42-
import org.apache.kafka.common.serialization.StringDeserializer;
39+
import org.testcontainers.junit.jupiter.Testcontainers;
40+
import org.testcontainers.kafka.ConfluentKafkaContainer;
4341

4442
import io.openliberty.guides.models.SystemLoad;
4543
import io.openliberty.guides.models.SystemLoad.SystemLoadDeserializer;
@@ -57,9 +55,9 @@ public class SystemServiceIT {
5755
new ImageFromDockerfile("system:1.0-SNAPSHOT")
5856
.withDockerfile(Paths.get("./Dockerfile"));
5957

60-
private static KafkaContainer kafkaContainer =
61-
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"))
62-
.withListener(() -> "kafka:19092")
58+
private static ConfluentKafkaContainer kafkaContainer =
59+
new ConfluentKafkaContainer("confluentinc/cp-kafka:latest")
60+
.withListener("kafka:19092")
6361
.withNetwork(network);
6462

6563
private static GenericContainer<?> systemContainer =

‎start/inventory/src/test/java/it/io/openliberty/guides/inventory/InventoryServiceIT.java‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2020, 2024 IBM Corporation and others.
3+
* Copyright (c) 2020, 2025 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
@@ -11,47 +11,44 @@
1111
// end::copyright[]
1212
package it.io.openliberty.guides.inventory;
1313

14-
import java.util.List;
15-
import java.time.Duration;
16-
1714
import static org.junit.jupiter.api.Assertions.assertEquals;
1815

1916
import java.math.BigDecimal;
2017
import java.net.Socket;
2118
import java.nio.file.Paths;
19+
import java.time.Duration;
20+
import java.util.List;
2221
import java.util.Properties;
2322

24-
import jakarta.ws.rs.core.GenericType;
25-
import jakarta.ws.rs.core.Response;
26-
import jakarta.ws.rs.core.UriBuilder;
27-
import jakarta.ws.rs.client.ClientBuilder;
28-
29-
import org.slf4j.Logger;
30-
import org.slf4j.LoggerFactory;
31-
import org.junit.jupiter.api.Test;
32-
import org.junit.jupiter.api.AfterAll;
33-
import org.junit.jupiter.api.AfterEach;
34-
import org.junit.jupiter.api.BeforeAll;
35-
import org.junit.jupiter.api.BeforeEach;
36-
import org.junit.jupiter.api.Assertions;
37-
import org.testcontainers.containers.Network;
38-
import org.testcontainers.utility.DockerImageName;
39-
import org.apache.kafka.clients.producer.ProducerRecord;
40-
import org.apache.kafka.clients.producer.ProducerConfig;
4123
import org.apache.kafka.clients.producer.KafkaProducer;
42-
import org.testcontainers.containers.KafkaContainer;
43-
import org.testcontainers.containers.GenericContainer;
44-
import org.testcontainers.junit.jupiter.Testcontainers;
45-
import org.testcontainers.images.builder.ImageFromDockerfile;
24+
import org.apache.kafka.clients.producer.ProducerConfig;
25+
import org.apache.kafka.clients.producer.ProducerRecord;
4626
import org.apache.kafka.common.serialization.StringSerializer;
4727
import org.jboss.resteasy.client.jaxrs.ResteasyClient;
4828
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
4929
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
50-
import org.testcontainers.containers.wait.strategy.Wait;
30+
import org.junit.jupiter.api.AfterAll;
31+
import org.junit.jupiter.api.AfterEach;
32+
import org.junit.jupiter.api.Assertions;
33+
import org.junit.jupiter.api.BeforeAll;
34+
import org.junit.jupiter.api.BeforeEach;
35+
import org.junit.jupiter.api.Test;
36+
import org.slf4j.Logger;
37+
import org.slf4j.LoggerFactory;
38+
import org.testcontainers.containers.GenericContainer;
39+
import org.testcontainers.containers.Network;
5140
import org.testcontainers.containers.output.Slf4jLogConsumer;
41+
import org.testcontainers.containers.wait.strategy.Wait;
42+
import org.testcontainers.images.builder.ImageFromDockerfile;
43+
import org.testcontainers.junit.jupiter.Testcontainers;
44+
import org.testcontainers.kafka.ConfluentKafkaContainer;
5245

5346
import io.openliberty.guides.models.SystemLoad;
5447
import io.openliberty.guides.models.SystemLoad.SystemLoadSerializer;
48+
import jakarta.ws.rs.client.ClientBuilder;
49+
import jakarta.ws.rs.core.GenericType;
50+
import jakarta.ws.rs.core.Response;
51+
import jakarta.ws.rs.core.UriBuilder;
5552

5653

5754
@Testcontainers
@@ -69,9 +66,9 @@ public class InventoryServiceIT {
6966
new ImageFromDockerfile("inventory:1.0-SNAPSHOT")
7067
.withDockerfile(Paths.get("./Dockerfile"));
7168

72-
private static KafkaContainer kafkaContainer =
73-
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"))
74-
.withListener(() -> "kafka:19092")
69+
private static ConfluentKafkaContainer kafkaContainer =
70+
new ConfluentKafkaContainer("confluentinc/cp-kafka:latest")
71+
.withListener("kafka:19092")
7572
.withNetwork(network);
7673

7774
private static GenericContainer<?> inventoryContainer =

‎start/system/src/test/java/it/io/openliberty/guides/system/SystemServiceIT.java‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2020, 2024 IBM Corporation and others.
3+
* Copyright (c) 2020, 2025 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
@@ -11,35 +11,33 @@
1111
// end::copyright[]
1212
package it.io.openliberty.guides.system;
1313

14+
import static org.junit.jupiter.api.Assertions.assertNotNull;
15+
16+
import java.net.Socket;
17+
import java.nio.file.Paths;
1418
import java.time.Duration;
1519
import java.util.Collections;
1620
import java.util.Properties;
17-
import java.net.Socket;
18-
import java.nio.file.Paths;
1921

20-
import org.slf4j.Logger;
21-
import org.slf4j.LoggerFactory;
22-
import org.junit.jupiter.api.Test;
22+
import org.apache.kafka.clients.consumer.ConsumerConfig;
23+
import org.apache.kafka.clients.consumer.ConsumerRecord;
24+
import org.apache.kafka.clients.consumer.ConsumerRecords;
25+
import org.apache.kafka.clients.consumer.KafkaConsumer;
26+
import org.apache.kafka.common.serialization.StringDeserializer;
2327
import org.junit.jupiter.api.AfterAll;
2428
import org.junit.jupiter.api.AfterEach;
2529
import org.junit.jupiter.api.BeforeAll;
2630
import org.junit.jupiter.api.BeforeEach;
27-
import org.testcontainers.junit.jupiter.Testcontainers;
28-
import static org.junit.jupiter.api.Assertions.assertNotNull;
29-
30-
import org.testcontainers.containers.KafkaContainer;
31+
import org.junit.jupiter.api.Test;
32+
import org.slf4j.Logger;
33+
import org.slf4j.LoggerFactory;
34+
import org.testcontainers.containers.GenericContainer;
3135
import org.testcontainers.containers.Network;
36+
import org.testcontainers.containers.output.Slf4jLogConsumer;
3237
import org.testcontainers.containers.wait.strategy.Wait;
3338
import org.testcontainers.images.builder.ImageFromDockerfile;
34-
import org.testcontainers.containers.GenericContainer;
35-
import org.testcontainers.containers.output.Slf4jLogConsumer;
36-
import org.testcontainers.utility.DockerImageName;
37-
38-
import org.apache.kafka.clients.consumer.ConsumerConfig;
39-
import org.apache.kafka.clients.consumer.ConsumerRecord;
40-
import org.apache.kafka.clients.consumer.ConsumerRecords;
41-
import org.apache.kafka.clients.consumer.KafkaConsumer;
42-
import org.apache.kafka.common.serialization.StringDeserializer;
39+
import org.testcontainers.junit.jupiter.Testcontainers;
40+
import org.testcontainers.kafka.ConfluentKafkaContainer;
4341

4442
import io.openliberty.guides.models.SystemLoad;
4543
import io.openliberty.guides.models.SystemLoad.SystemLoadDeserializer;
@@ -57,9 +55,9 @@ public class SystemServiceIT {
5755
new ImageFromDockerfile("system:1.0-SNAPSHOT")
5856
.withDockerfile(Paths.get("./Dockerfile"));
5957

60-
private static KafkaContainer kafkaContainer =
61-
new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"))
62-
.withListener(() -> "kafka:19092")
58+
private static ConfluentKafkaContainer kafkaContainer =
59+
new ConfluentKafkaContainer("confluentinc/cp-kafka:latest")
60+
.withListener("kafka:19092")
6361
.withNetwork(network);
6462

6563
private static GenericContainer<?> systemContainer =

0 commit comments

Comments
 (0)