Merge pull request #276 from OpenLiberty/staging

Merge staging to prod - Update to use maven wrapper

Author: gkwan-ibm

.github/workflows/test.yml

@@ -32,6 +32,7 @@ jobs:
           VALIDATE_HTML: 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"
@@ -56,7 +57,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: |

README.adoc

@@ -65,26 +65,51 @@ The `finish` directory in the root of this guide contains the finished applicati
 ifndef::cloud-hosted[]
 To try out the application, navigate to the `finish` directory and run the following Maven goal to build the application and deploy it to Open Liberty:
 
+include::{common-includes}/os-tabs.adoc[]
+
+[.tab_content.windows_section]
+--
+[role='command']
+```
+cd finish
+mvnw.cmd process-resources
+mvnw.cmd liberty:run
+```
+--
+
+[.tab_content.mac_section]
+--
+[role='command']
+```
+cd finish
+./mvnw process-resources
+./mvnw liberty:run
+```
+--
+
+[.tab_content.linux_section]
+--
 [role='command']
 ```
 cd finish
-mvn process-resources
-mvn liberty:run
+./mvnw process-resources
+./mvnw liberty:run
 ```
+--
 endif::[]
 
 ifdef::cloud-hosted[]
 In this IBM cloud environment, you need to update the URL to access the ***artists.json***. Run the following commands to go to the ***finish*** directory and update the files where the URL has been specified:
 ```bash
 cd finish
-mvn process-resources
+./mvnw process-resources
 sed -i 's=http://localhost:9080/artists='"https://${USERNAME}-9080.$(echo $TOOL_DOMAIN | sed 's/\.labs\./.proxy./g')/artists"'=' /home/project/guide-rest-client-reactjs/finish/src/main/webapp/_next/static/chunks/app/page-*.js
 sed -i 's=http://localhost:9080/artists='"https://${USERNAME}-9080.$(echo $TOOL_DOMAIN | sed 's/\.labs\./.proxy./g')/artists"'=' /home/project/guide-rest-client-reactjs/finish/src/main/frontend/src/app/ArtistTable.jsx
 ```
 
 To try out the application, run the following Maven goal to build the application and deploy it to Open Liberty:
 ```bash
-mvn liberty:run
+./mvnw liberty:run
 ```
 endif::[]
 
@@ -110,7 +135,7 @@ endif::[]
 image::react-table.png[React Paginated Table,align="center"]
 
 [role='command']
-include::{common-includes}/twyb-end.adoc[]
+include::{common-includes}/twyb-end-mvnw.adoc[]
 
 // =================================================================================================
 // Starting the service
@@ -129,7 +154,7 @@ cd /home/project/guide-rest-client-reactjs/start
 endif::[]
 
 [role='command']
-include::{common-includes}/devmode-lmp33-start.adoc[]
+include::{common-includes}/devmode-mvnw-start.adoc[]
 
 ifndef::cloud-hosted[]
 After you start the service, you can find your artist JSON at the http://localhost:9080/artists[http://localhost:9080/artists^] URL.
@@ -287,16 +312,38 @@ In a new command-line session, build the front end by running the following comm
 
 // Static guide instruction
 ifndef::cloud-hosted[]
+
+include::{common-includes}/os-tabs.adoc[]
+
+[.tab_content.windows_section]
+--
 [role='command']
-----
-mvn process-resources
-----
+```
+mvnw.cmd process-resources
+```
+--
+
+[.tab_content.mac_section]
+--
+[role='command']
+```
+./mvnw process-resources
+```
+--
+
+[.tab_content.linux_section]
+--
+[role='command']
+```
+./mvnw process-resources
+```
+--
 endif::[]
 // Cloud hosted guide instruction
 ifdef::cloud-hosted[]
 ```bash
 cd /home/project/guide-rest-client-reactjs/start
-mvn process-resources
+./mvnw process-resources
 ```
 endif::[]
 
@@ -342,16 +389,38 @@ include::finish/pom.xml[]
 To run the default test, you can add the [hotspot=node-tests file=1]`testing` configuration to the `frontend-maven-plugin`. Rerun the Maven `process-resources` goal to rebuild the front end and run the tests.
 
 ifndef::cloud-hosted[]
+
+include::{common-includes}/os-tabs.adoc[]
+
+[.tab_content.windows_section]
+--
 [role='command']
-----
-mvn process-resources
-----
+```
+mvnw.cmd process-resources
+```
+--
+
+[.tab_content.mac_section]
+--
+[role='command']
+```
+./mvnw process-resources
+```
+--
+
+[.tab_content.linux_section]
+--
+[role='command']
+```
+./mvnw process-resources
+```
+--
 endif::[]
 // Cloud hosted guide instruction
 ifdef::cloud-hosted[]
 ```bash
 cd /home/project/guide-rest-client-reactjs/start
-mvn process-resources
+./mvnw process-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