Merge pull request #323 from OpenLiberty/staging

Merge staging to prod - Update to use maven wrapper

Author: gkwan-ibm

.github/workflows/test.yml

@@ -29,6 +29,7 @@ jobs:
           VALIDATE_JSCPD: false
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           LINTER_RULES_PATH: ./tools/pr-checker/linters/
+          FILTER_REGEX_EXCLUDE: mvnw*
           DEFAULT_BRANCH: prod
       - name: Summary
         if: "! github.event.pull_request.head.repo.fork"

README.adoc

@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2024 IBM Corporation and others.
+// Copyright (c) 2018, 2025 IBM Corporation and others.
 // Licensed under Creative Commons Attribution-NoDerivatives
 // 4.0 International (CC BY-ND 4.0)
 //   https://creativecommons.org/licenses/by-nd/4.0/
@@ -70,11 +70,34 @@ endif::[]
 
 The two microservices you will deploy are called `system` and `inventory`. The `system` microservice returns the JVM system properties of the running container. The `inventory` microservice adds the properties from the `system` microservice to the inventory. This demonstrates how communication can be established between pods inside a cluster. To build these applications, navigate to the `start` directory and run the following command.
 
+include::{common-includes}/os-tabs.adoc[]
+
+[.tab_content.windows_section]
+--
 [role='command']
 ```
 cd start
-mvn clean package
+mvnw.cmd clean package
 ```
+--
+
+[.tab_content.mac_section]
+--
+[role='command']
+```
+cd start
+./mvnw clean package
+```
+--
+
+[.tab_content.linux_section]
+--
+[role='command']
+```
+cd start
+./mvnw clean package
+```
+--
 
 
 
@@ -352,19 +375,40 @@ Using the [hotspot=valueFrom1 hotspot=valueFrom2 hotspot=valueFrom3 hotspot=valu
 
 // Static guide instruction
 ifndef::cloud-hosted[]
-Rebuild the application using `mvn clean package`.
+Rebuild the application using Maven `clean` and `package` goals.
+include::{common-includes}/os-tabs.adoc[]
+
+[.tab_content.windows_section]
+--
 [role='command']
 ```
-mvn clean package
+mvnw.cmd clean package
 ```
+--
+
+[.tab_content.mac_section]
+--
+[role='command']
+```
+./mvnw clean package
+```
+--
+
+[.tab_content.linux_section]
+--
+[role='command']
+```
+./mvnw clean package
+```
+--
 endif::[]
 
 // Cloud hosted guide instruction
 ifdef::cloud-hosted[]
-Rebuild the application using ***mvn clean package***.
+Rebuild the application using Maven ***clean package***.
 ```bash
 cd /home/project/guide-kubernetes-microprofile-config/start
-mvn clean package
+./mvnw clean package
 ```
 endif::[]
 
@@ -497,12 +541,21 @@ ifndef::cloud-hosted[]
 
 include::{common-includes}/os-tabs.adoc[]
 
-[.tab_content.windows_section.mac_section]
+[.tab_content.windows_section]
+--
+Run the integration tests:
+[role='command']
+```
+mvnw.cmd failsafe:integration-test -Dsystem.context.root=/dev
+```
+--
+
+[.tab_content.mac_section]
 --
 Run the integration tests:
 [role='command']
 ```
-mvn failsafe:integration-test -Dsystem.context.root=/dev
+./mvnw failsafe:integration-test -Dsystem.context.root=/dev
 ```
 --
 
@@ -511,7 +564,7 @@ mvn failsafe:integration-test -Dsystem.context.root=/dev
 Run the integration tests against a cluster running at Minikube's IP address:
 [role='command']
 ```
-mvn failsafe:integration-test -Dsystem.context.root=/dev -Dsystem.service.root=$(minikube ip):31000 -Dinventory.service.root=$(minikube ip):32000
+./mvnw failsafe:integration-test -Dsystem.context.root=/dev -Dsystem.service.root=$(minikube ip):31000 -Dinventory.service.root=$(minikube ip):32000
 
 ```
 --
@@ -535,7 +588,7 @@ sed -i 's=localhost:31000='"localhost:$SYSTEM_NODEPORT"'=g' system/pom.xml
 Run the integration tests by using the following command:
 
 ```bash
-mvn failsafe:integration-test \
+./mvnw failsafe:integration-test \
     -Dsystem.service.root=localhost:$SYSTEM_NODEPORT \
     -Dsystem.context.root=/dev \
     -Dinventory.service.root=localhost:$INVENTORY_NODEPORT

finish/.mvn/wrapper/maven-wrapper.jar

@@ -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/.mvn/wrapper/maven-wrapper.properties

@@ -48,7 +48,7 @@
         <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>