Update to use maven wrapper

.github/workflows/test.yml

@@ -28,6 +28,7 @@ jobs:
           VALIDATE_ALL_CODEBASE: false
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           LINTER_RULES_PATH: ./tools/pr-checker/linters/
+          FILTER_REGEX_EXCLUDE: mvnw*
           VALIDATE_KUBERNETES_KUBEVAL: false
           DEFAULT_BRANCH: prod
       - name: Summary
@@ -53,7 +54,7 @@ jobs:
         java-version: 11
     - run: unset _JAVA_OPTIONS
     - name: Run tests
-      run: sudo ../scripts/testApp.sh
+      run: sudo -E ../scripts/testApp.sh
     - name: Post tests
       if: always()
       run: sudo docker images

README.adoc

@@ -270,11 +270,36 @@ run an OpenShift build to produce runnable container images of the packaged micr
 Ensure that you are in the `start` directory and run the following commands to package the `system` and `inventory`
 microservices:
 
-[role='command']
+include::{common-includes}/os-tabs.adoc[]
+
+[.tab_content.windows_section]
+--
+Open command prompt as an administrator and run the following command.
+
+[role=command]
+```
+mvnw.cmd -pl models clean install
+mvnw.cmd clean package
+```
+--
+
+[.tab_content.mac_section]
+--
+[role=command]
+```
+./mvnw -pl models clean install
+./mvnw clean package
+```
+--
+
+[.tab_content.linux_section]
+--
+[role=command]
 ```
-mvn -pl models clean install
-mvn clean package
+./mvnw -pl models clean install
+./mvnw clean package
 ```
+--
 
 === Building and pushing the images
 

finish/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

finish/inventory/pom.xml

@@ -65,19 +65,19 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>kafka</artifactId>
-            <version>1.21.0</version>
+            <version>1.21.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.12.2</version>
+            <version>5.13.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>1.21.0</version>
+            <version>1.21.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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

@@ -1,6 +1,6 @@
 // tag::copyright[]
 /*******************************************************************************
- * Copyright (c) 2020, 2024 IBM Corporation and others.
+ * Copyright (c) 2020, 2025 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -19,7 +19,6 @@
 import java.time.Duration;
 import java.util.List;
 import java.util.Properties;
-
 // tag::KafkaProducer[]
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerConfig;
@@ -37,16 +36,16 @@
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
 // end::KafkaProducer[]
-import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.kafka.ConfluentKafkaContainer;
 
 import io.openliberty.guides.models.SystemLoad;
 import io.openliberty.guides.models.SystemLoad.SystemLoadSerializer;
+
 import jakarta.ws.rs.client.ClientBuilder;
 import jakarta.ws.rs.core.GenericType;
 import jakarta.ws.rs.core.Response;
@@ -70,19 +69,19 @@ public class InventoryServiceIT {
         new ImageFromDockerfile("inventory:1.0-SNAPSHOT")
             .withDockerfile(Paths.get("./Dockerfile"));
 
-    private static KafkaContainer kafkaContainer =
-        new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"))
-            .withListener(() -> "kafka:19092")
+    private static ConfluentKafkaContainer confluentKafkaContainer =
+        new ConfluentKafkaContainer("confluentinc/cp-kafka:latest")
+            .withListener("kafka:19092")
             .withNetwork(network);
 
     private static GenericContainer<?> inventoryContainer =
-        new GenericContainer(inventoryImage)
+        new GenericContainer<>(inventoryImage)
             .withNetwork(network)
             .withExposedPorts(9085)
             .waitingFor(Wait.forHttp("/health/ready").forPort(9085))
             .withStartupTimeout(Duration.ofMinutes(2))
             .withLogConsumer(new Slf4jLogConsumer(logger))
-            .dependsOn(kafkaContainer);
+            .dependsOn(confluentKafkaContainer);
 
     private static InventoryResourceClient createRestClient(String urlPath) {
         ClientBuilder builder = ResteasyClientBuilder.newBuilder();
@@ -110,7 +109,7 @@ public static void startContainers() {
             urlPath = "http://localhost:9085";
         } else {
             System.out.println("Testing with mvn verify");
-            kafkaContainer.start();
+            confluentKafkaContainer.start();
             inventoryContainer.withEnv(
                 "mp.messaging.connector.liberty-kafka.bootstrap.servers",
                 "kafka:19092");
@@ -135,7 +134,7 @@ public void setUp() {
         } else {
             producerProps.put(
                 ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
-                kafkaContainer.getBootstrapServers());
+                confluentKafkaContainer.getBootstrapServers());
         }
 
         producerProps.put(
@@ -155,7 +154,7 @@ public void setUp() {
     public static void stopContainers() {
         client.resetSystems();
         inventoryContainer.stop();
-        kafkaContainer.stop();
+        confluentKafkaContainer.stop();
         network.close();
     }