Skip to content

Commit 41bc63c

Browse files
SiaaG-devgkwan-ibm
andauthored
Update to use maven wrapper (#259)
* updated to use maven wrapper Signed-off-by: Siaa Gor <[email protected]> * changes to fix failing test on staging PR Signed-off-by: Siaa Gor <[email protected]> * changes to fix failing test on staging PR Signed-off-by: Siaa Gor <[email protected]> * Update README.adoc for cloud hosted section * Update test.yml * Delete start/src/main/frontend/package-lock.json * removed some files Signed-off-by: Siaa Gor <[email protected]> * Deleted finish/target/classes/io/openliberty/guides/consumingrest/service directory * deleted additional files -verified with prod branch Signed-off-by: Siaa Gor <[email protected]> * re-copied a folder from prod branch Signed-off-by: Siaa Gor <[email protected]> --------- Signed-off-by: Siaa Gor <[email protected]> Co-authored-by: Gilbert Kwan <[email protected]> Co-authored-by: Siaa Gor <[email protected]>
1 parent 9727eb5 commit 41bc63c

File tree

11 files changed

+1112
-10
lines changed

11 files changed

+1112
-10
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
VALIDATE_TYPESCRIPT_STANDARD: false
3131
VALIDATE_JAVASCRIPT_STANDARD: false
3232
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33+
FILTER_REGEX_EXCLUDE: mvnw*
3334
LINTER_RULES_PATH: ./tools/pr-checker/linters/
3435
DEFAULT_BRANCH: prod
3536
- name: Summary
@@ -57,7 +58,7 @@ jobs:
5758
- run: unset _JAVA_OPTIONS
5859

5960
- name: Run tests
60-
run: sudo ../scripts/testApp.sh
61+
run: sudo -E ../scripts/testApp.sh
6162

6263
- name: Post tests
6364
if: always()

README.adoc

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ https://openliberty.io/guides/rest-intro.html[Creating a RESTful web service^].
7070
include::{common-includes}/gitclone.adoc[]
7171

7272
[role='command']
73-
include::{common-includes}/twyb-intro.adoc[]
73+
include::{common-includes}/twyb-intro-mvnw.adoc[]
7474

7575
// Static guide instruction
7676
ifndef::cloud-hosted[]
@@ -98,7 +98,7 @@ dj wrote 0 albums:
9898
----
9999

100100
[role='command']
101-
include::{common-includes}/twyb-end.adoc[]
101+
include::{common-includes}/twyb-end-mvnw.adoc[]
102102

103103
// =================================================================================================
104104
// Starting the service
@@ -118,7 +118,7 @@ cd /home/project/guide-rest-client-angular/start
118118
endif::[]
119119

120120
[role='command']
121-
include::{common-includes}/devmode-lmp33-start.adoc[]
121+
include::{common-includes}/devmode-mvnw-start.adoc[]
122122

123123
// Static guide instruction
124124
ifndef::cloud-hosted[]
@@ -276,16 +276,37 @@ The Open Liberty instance is already started, and the REST service is running. I
276276

277277
// Static guide instruction
278278
ifndef::cloud-hosted[]
279+
include::{common-includes}/os-tabs.adoc[]
280+
281+
[.tab_content.windows_section]
282+
--
283+
[role='command']
284+
```
285+
mvnw.cmd generate-resources
286+
```
287+
--
288+
289+
[.tab_content.mac_section]
290+
--
291+
[role='command']
292+
```
293+
./mvnw generate-resources
294+
```
295+
--
296+
297+
[.tab_content.linux_section]
298+
--
279299
[role='command']
280300
```
281-
mvn generate-resources
301+
./mvnw generate-resources
282302
```
303+
--
283304
endif::[]
284305
// Cloud hosted guide instruction
285306
ifdef::cloud-hosted[]
286307
```bash
287308
cd /home/project/guide-rest-client-angular/start
288-
mvn generate-resources
309+
./mvnw generate-resources
289310
```
290311
endif::[]
291312

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)