Merge pull request #293 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
@@ -52,7 +53,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: docker images

README.adoc

@@ -155,13 +155,34 @@ endif::[]
 
 
 Build and run the container by running the `devc` goal from the `start` directory:
+include::{common-includes}/os-tabs.adoc[]
 
+[.tab_content.windows_section]
+--
 [role='command']
 ```
-mvn liberty:devc
+mvnw.cmd liberty:devc
 ```
+--
+
+[.tab_content.mac_section]
+--
+[role='command']
+```
+./mvnw liberty:devc
+```
+--
+
+[.tab_content.linux_section]
+--
+[role='command']
+```
+./mvnw liberty:devc
+```
+--
 
 After you see the following message, your Liberty instance is ready in dev mode:
+
 [role="no_copy"]
 ----
 **************************************************************
@@ -303,7 +324,7 @@ Another useful feature of dev mode with a container is the ability to pass addit
 ----
 <groupId>io.openliberty.tools</groupId>
 <artifactId>liberty-maven-plugin</artifactId>
-<version>3.11.2</version>
+<version>3.11.3</version>
 <configuration>
     <dockerRunOpts>-e ENV_VAR=exampleValue</dockerRunOpts>
 </configuration>
@@ -312,13 +333,37 @@ Another useful feature of dev mode with a container is the ability to pass addit
 If the Dockerfile isn't located in the directory that the `devc` goal is being run from, you can add the `dockerfile` tag to specify the location. Using this parameter sets the context for building the Docker image to the directory that contains this file.
 
 Additionally, both of these options can be passed from the command line when running the `devc` goal by adding `-D` as such:
+include::{common-includes}/os-tabs.adoc[]
 
+[.tab_content.windows_section]
+--
 [role="no_copy"]
-----
-mvn liberty:devc \
+```
+mvnw.cmd liberty:devc ^
+-DdockerRunOpts="-e ENV_VAR=exampleValue" ^
+-Ddockerfile=".\path\to\file"
+```
+--
+
+[.tab_content.mac_section]
+--
+[role="no_copy"]
+```
+./mvnw liberty:devc \
 -DdockerRunOpts="-e ENV_VAR=exampleValue" \
 -Ddockerfile="./path/to/file"
-----
+```
+--
+
+[.tab_content.linux_section]
+--
+[role="no_copy"]
+```
+./mvnw liberty:devc \
+-DdockerRunOpts="-e ENV_VAR=exampleValue" \
+-Ddockerfile="./path/to/file"
+```
+--
 
 To learn more about dev mode with a container and its different features, check out the http://github.com/OpenLiberty/ci.maven/blob/main/docs/dev.md#devc-container-mode[Documentation^].
 

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