Merge pull request #369 from OpenLiberty/staging

Merge staging to prod - Update to use maven wrapper

Author: gkwan-ibm

.github/workflows/test.yml

@@ -27,6 +27,7 @@ jobs:
         env:
           VALIDATE_ALL_CODEBASE: false
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          FILTER_REGEX_EXCLUDE: mvnw*
           LINTER_RULES_PATH: ./tools/pr-checker/linters/
           DEFAULT_BRANCH: prod
       - name: Summary

README.adoc

@@ -1,7 +1,7 @@
 // INSTRUCTION: Please remove all comments that start INSTRUCTION prior to commit. Most comments should be removed, although not the copyright.
 // INSTRUCTION: The copyright statement must appear at the top of the file
 //
-// Copyright (c) 2018, 2023 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/
@@ -14,7 +14,7 @@
 :page-duration: 25 minutes
 :page-releasedate: 2018-10-05
 :page-description: Explore how to deploy microservices to Kubernetes and manage your cluster.
-:page-tags: ['Kubernetes', 'Docker']
+:page-tags: ['kubernetes', 'docker']
 :page-permalink: /guides/{projectid}
 :page-related-guides: ['docker', 'istio-intro']
 :common-includes: https://raw.githubusercontent.com/OpenLiberty/guides-common/prod
@@ -110,11 +110,35 @@ The first step of deploying to {kube} is to build your microservices and contain
 The starting Java project, which you can find in the `start` directory, is a multi-module Maven project that's made up of the `system` and `inventory` microservices. Each microservice resides in its own directory, `start/system` and `start/inventory`. Each of these directories also contains a Dockerfile, which is necessary for building Docker images. If you're unfamiliar with Dockerfiles, check out the https://openliberty.io/guides/containerize.html[Containerizing Microservices^] guide, which covers Dockerfiles in depth.
 
 Navigate to the `start` directory and build the applications by running the following commands:
+
+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
+```
+--
 
 
 
@@ -451,16 +475,49 @@ When you're building your application, you might want to quickly test a change.
 
 // Static guide instruction
 ifndef::cloud-hosted[]
+include::{common-includes}/os-tabs.adoc[]
+
+[.tab_content.windows_section]
+--
 [role='command']
 ```
 kubectl delete -f kubernetes.yaml
 
-mvn clean package
+mvnw.cmd clean package
 docker build -t system:1.0-SNAPSHOT system/.
 docker build -t inventory:1.0-SNAPSHOT inventory/.
 
 kubectl apply -f kubernetes.yaml
 ```
+--
+
+[.tab_content.mac_section]
+--
+[role='command']
+```
+kubectl delete -f kubernetes.yaml
+
+./mvnw clean package
+docker build -t system:1.0-SNAPSHOT system/.
+docker build -t inventory:1.0-SNAPSHOT inventory/.
+
+kubectl apply -f kubernetes.yaml
+```
+--
+
+[.tab_content.linux_section]
+--
+[role='command']
+```
+kubectl delete -f kubernetes.yaml
+
+./mvnw clean package
+docker build -t system:1.0-SNAPSHOT system/.
+docker build -t inventory:1.0-SNAPSHOT inventory/.
+
+kubectl apply -f kubernetes.yaml
+```
+--
 endif::[]
 
 // Cloud-hosted guide instruction
@@ -469,7 +526,7 @@ ifdef::cloud-hosted[]
 cd /home/project/guide-kubernetes-intro/start
 kubectl delete -f kubernetes.yaml
 
-mvn clean package
+./mvnw clean package
 docker build -t system:1.0-SNAPSHOT system/.
 docker build -t inventory:1.0-SNAPSHOT inventory/.
 docker tag inventory:1.0-SNAPSHOT us.icr.io/$SN_ICR_NAMESPACE/inventory:1.0-SNAPSHOT
@@ -510,12 +567,21 @@ Navigate back to the `start` directory.
 ifndef::cloud-hosted[]
 include::{common-includes}/os-tabs.adoc[]
 
-[.tab_content.windows_section.mac_section]
+[.tab_content.windows_section]
+--
+Run the integration tests against a cluster running with a host name of `localhost`:
+[role='command']
+```
+mvnw.cmd failsafe:integration-test
+```
+--
+
+[.tab_content.mac_section]
 --
 Run the integration tests against a cluster running with a host name of `localhost`:
 [role='command']
 ```
-mvn failsafe:integration-test
+./mvnw failsafe:integration-test
 ```
 --
 
@@ -524,7 +590,7 @@ mvn failsafe:integration-test
 Run the integration tests with the IP address for Minikube:
 [role='command']
 ```
-mvn failsafe:integration-test -Dsystem.service.root=$(minikube ip):31000 -Dinventory.service.root=$(minikube ip):32000
+./mvnw failsafe:integration-test -Dsystem.service.root=$(minikube ip):31000 -Dinventory.service.root=$(minikube ip):32000
 ```
 --
 endif::[]
@@ -542,7 +608,7 @@ sed -i 's=localhost:31000='"$SYSTEM_PROXY"'=g' system/pom.xml
 Run the integration tests by using the following command:
 
 ```bash
-mvn failsafe:integration-test
+./mvnw failsafe:integration-test
 ```
 endif::[]
 

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

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