Skip to content

Commit e9cd857

Browse files
SiaaG-devgkwan-ibmGeeTransitdependabot[bot]
authored
Update to use maven wrapper (#290)
* update to use maven wrapper Signed-off-by: Siaa Gor <[email protected]> * update to use maven wrapper new Signed-off-by: Siaa Gor <[email protected]> * update to use maven wrapper slight edit Signed-off-by: Siaa Gor <[email protected]> * fixed Unresolved directive in README.adoc Signed-off-by: Siaa Gor <[email protected]> * fixed tabs section for syntax Signed-off-by: Siaa Gor <[email protected]> * added mvnw to the last section Signed-off-by: Siaa Gor <[email protected]> * added mvnw to the last section Signed-off-by: Siaa Gor <[email protected]> * attempt to fix display on lgdev Signed-off-by: Siaa Gor <[email protected]> * attempt to fix display on lgdev Signed-off-by: Siaa Gor <[email protected]> * most updated version Signed-off-by: Siaa Gor <[email protected]> * Fix incorrect multiline Windows command * Updated test.yml * Update README.adoc * Bump org.junit.jupiter:junit-jupiter from 5.12.2 to 5.13.0 in /start Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.12.2 to 5.13.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit-framework@r5.12.2...r5.13.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-version: 5.13.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump org.junit.jupiter:junit-jupiter from 5.12.2 to 5.13.0 in /finish Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.12.2 to 5.13.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit-framework@r5.12.2...r5.13.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-version: 5.13.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: Siaa Gor <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Gilbert Kwan <[email protected]> Co-authored-by: Siaa Gor <[email protected]> Co-authored-by: George Zhang <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 9676495 commit e9cd857

File tree

13 files changed

+1137
-9
lines changed

13 files changed

+1137
-9
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
env:
2828
VALIDATE_ALL_CODEBASE: false
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
FILTER_REGEX_EXCLUDE: mvnw*
3031
LINTER_RULES_PATH: ./tools/pr-checker/linters/
3132
DEFAULT_BRANCH: prod
3233
- name: Summary
@@ -52,7 +53,7 @@ jobs:
5253
java-version: 11
5354
- run: unset _JAVA_OPTIONS
5455
- name: Run tests
55-
run: sudo ../scripts/testApp.sh
56+
run: sudo -E ../scripts/testApp.sh
5657
- name: Post tests
5758
if: always()
5859
run: docker images

README.adoc

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,34 @@ endif::[]
155155

156156

157157
Build and run the container by running the `devc` goal from the `start` directory:
158+
include::{common-includes}/os-tabs.adoc[]
158159

160+
[.tab_content.windows_section]
161+
--
159162
[role='command']
160163
```
161-
mvn liberty:devc
164+
mvnw.cmd liberty:devc
162165
```
166+
--
167+
168+
[.tab_content.mac_section]
169+
--
170+
[role='command']
171+
```
172+
./mvnw liberty:devc
173+
```
174+
--
175+
176+
[.tab_content.linux_section]
177+
--
178+
[role='command']
179+
```
180+
./mvnw liberty:devc
181+
```
182+
--
163183

164184
After you see the following message, your Liberty instance is ready in dev mode:
185+
165186
[role="no_copy"]
166187
----
167188
**************************************************************
@@ -303,7 +324,7 @@ Another useful feature of dev mode with a container is the ability to pass addit
303324
----
304325
<groupId>io.openliberty.tools</groupId>
305326
<artifactId>liberty-maven-plugin</artifactId>
306-
<version>3.11.2</version>
327+
<version>3.11.3</version>
307328
<configuration>
308329
<dockerRunOpts>-e ENV_VAR=exampleValue</dockerRunOpts>
309330
</configuration>
@@ -312,13 +333,37 @@ Another useful feature of dev mode with a container is the ability to pass addit
312333
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.
313334

314335
Additionally, both of these options can be passed from the command line when running the `devc` goal by adding `-D` as such:
336+
include::{common-includes}/os-tabs.adoc[]
315337

338+
[.tab_content.windows_section]
339+
--
316340
[role="no_copy"]
317-
----
318-
mvn liberty:devc \
341+
```
342+
mvnw.cmd liberty:devc ^
343+
-DdockerRunOpts="-e ENV_VAR=exampleValue" ^
344+
-Ddockerfile=".\path\to\file"
345+
```
346+
--
347+
348+
[.tab_content.mac_section]
349+
--
350+
[role="no_copy"]
351+
```
352+
./mvnw liberty:devc \
319353
-DdockerRunOpts="-e ENV_VAR=exampleValue" \
320354
-Ddockerfile="./path/to/file"
321-
----
355+
```
356+
--
357+
358+
[.tab_content.linux_section]
359+
--
360+
[role="no_copy"]
361+
```
362+
./mvnw liberty:devc \
363+
-DdockerRunOpts="-e ENV_VAR=exampleValue" \
364+
-Ddockerfile="./path/to/file"
365+
```
366+
--
322367

323368
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^].
324369

61.6 KB
Binary file not shown.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
2+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

0 commit comments

Comments
 (0)