Merge pull request #260 from OpenLiberty/staging

Merge staging to prod - Update to use maven wrapper

Author: gkwan-ibm

.github/workflows/test.yml

@@ -30,6 +30,7 @@ jobs:
           VALIDATE_TYPESCRIPT_STANDARD: false
           VALIDATE_JAVASCRIPT_STANDARD: false
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          FILTER_REGEX_EXCLUDE: mvnw*
           LINTER_RULES_PATH: ./tools/pr-checker/linters/
           DEFAULT_BRANCH: prod
       - name: Summary
@@ -57,7 +58,7 @@ jobs:
       - run: unset _JAVA_OPTIONS
 
       - name: Run tests
-        run: sudo ../scripts/testApp.sh
+        run: sudo -E ../scripts/testApp.sh
 
       - name: Post tests
         if: always()

README.adoc

@@ -70,7 +70,7 @@ https://openliberty.io/guides/rest-intro.html[Creating a RESTful web service^].
 include::{common-includes}/gitclone.adoc[]
 
 [role='command']
-include::{common-includes}/twyb-intro.adoc[]
+include::{common-includes}/twyb-intro-mvnw.adoc[]
 
 // Static guide instruction
 ifndef::cloud-hosted[]
@@ -98,7 +98,7 @@ dj wrote 0 albums:
 ----
 
 [role='command']
-include::{common-includes}/twyb-end.adoc[]
+include::{common-includes}/twyb-end-mvnw.adoc[]
 
 // =================================================================================================
 // Starting the service
@@ -118,7 +118,7 @@ cd /home/project/guide-rest-client-angular/start
 endif::[]
 
 [role='command']
-include::{common-includes}/devmode-lmp33-start.adoc[]
+include::{common-includes}/devmode-mvnw-start.adoc[]
 
 // Static guide instruction
 ifndef::cloud-hosted[]
@@ -276,16 +276,37 @@ The Open Liberty instance is already started, and the REST service is running. I
 
 // Static guide instruction
 ifndef::cloud-hosted[]
+include::{common-includes}/os-tabs.adoc[]
+
+[.tab_content.windows_section]
+--
+[role='command']
+```
+mvnw.cmd generate-resources
+```
+--
+
+[.tab_content.mac_section]
+--
+[role='command']
+```
+./mvnw generate-resources
+```
+--
+
+[.tab_content.linux_section]
+--
 [role='command']
 ```
-mvn generate-resources
+./mvnw generate-resources
 ```
+--
 endif::[]
 // Cloud hosted guide instruction
 ifdef::cloud-hosted[]
 ```bash
 cd /home/project/guide-rest-client-angular/start
-mvn generate-resources
+./mvnw generate-resources
 ```
 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