Skip to content

Commit ed7e13f

Browse files
dev-koangkwan-ibmdependabot[bot]
authored
Update maven wrapper (#366)
* Update to use maven wrapper Signed-off-by: Dev Agarwal <devagarwal0508@gmail.com> * using maven wrapper in testAppSN.sh now Signed-off-by: Dev Agarwal <devagarwal0508@gmail.com> * changed the copyright year Signed-off-by: Dev Agarwal <devagarwal0508@gmail.com> * changed tags case in README Signed-off-by: Dev Agarwal <devagarwal0508@gmail.com> * 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:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * 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:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: Dev Agarwal <devagarwal0508@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Gilbert Kwan <gkwan@ca.ibm.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent c23eaa7 commit ed7e13f

File tree

16 files changed

+1168
-19
lines changed

16 files changed

+1168
-19
lines changed

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 0 deletions
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

‎README.adoc‎

Lines changed: 75 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// INSTRUCTION: Please remove all comments that start INSTRUCTION prior to commit. Most comments should be removed, although not the copyright.
22
// INSTRUCTION: The copyright statement must appear at the top of the file
33
//
4-
// Copyright (c) 2018, 2023 IBM Corporation and others.
4+
// Copyright (c) 2018, 2025 IBM Corporation and others.
55
// Licensed under Creative Commons Attribution-NoDerivatives
66
// 4.0 International (CC BY-ND 4.0)
77
// https://creativecommons.org/licenses/by-nd/4.0/
@@ -14,7 +14,7 @@
1414
:page-duration: 25 minutes
1515
:page-releasedate: 2018-10-05
1616
:page-description: Explore how to deploy microservices to Kubernetes and manage your cluster.
17-
:page-tags: ['Kubernetes', 'Docker']
17+
:page-tags: ['kubernetes', 'docker']
1818
:page-permalink: /guides/{projectid}
1919
:page-related-guides: ['docker', 'istio-intro']
2020
:common-includes: https://raw.githubusercontent.com/OpenLiberty/guides-common/prod
@@ -110,11 +110,35 @@ The first step of deploying to {kube} is to build your microservices and contain
110110
The starting Java project, which you can find in the `start` directory, is a multi-module Maven project that's made up of the `system` and `inventory` microservices. Each microservice resides in its own directory, `start/system` and `start/inventory`. Each of these directories also contains a Dockerfile, which is necessary for building Docker images. If you're unfamiliar with Dockerfiles, check out the https://openliberty.io/guides/containerize.html[Containerizing Microservices^] guide, which covers Dockerfiles in depth.
111111

112112
Navigate to the `start` directory and build the applications by running the following commands:
113+
114+
include::{common-includes}/os-tabs.adoc[]
115+
116+
[.tab_content.windows_section]
117+
--
113118
[role='command']
114119
```
115120
cd start
116-
mvn clean package
121+
mvnw.cmd clean package
117122
```
123+
--
124+
125+
[.tab_content.mac_section]
126+
--
127+
[role='command']
128+
```
129+
cd start
130+
./mvnw clean package
131+
```
132+
--
133+
134+
[.tab_content.linux_section]
135+
--
136+
[role='command']
137+
```
138+
cd start
139+
./mvnw clean package
140+
```
141+
--
118142

119143

120144

@@ -451,16 +475,49 @@ When you're building your application, you might want to quickly test a change.
451475

452476
// Static guide instruction
453477
ifndef::cloud-hosted[]
478+
include::{common-includes}/os-tabs.adoc[]
479+
480+
[.tab_content.windows_section]
481+
--
454482
[role='command']
455483
```
456484
kubectl delete -f kubernetes.yaml
457485

458-
mvn clean package
486+
mvnw.cmd clean package
459487
docker build -t system:1.0-SNAPSHOT system/.
460488
docker build -t inventory:1.0-SNAPSHOT inventory/.
461489

462490
kubectl apply -f kubernetes.yaml
463491
```
492+
--
493+
494+
[.tab_content.mac_section]
495+
--
496+
[role='command']
497+
```
498+
kubectl delete -f kubernetes.yaml
499+
500+
./mvnw clean package
501+
docker build -t system:1.0-SNAPSHOT system/.
502+
docker build -t inventory:1.0-SNAPSHOT inventory/.
503+
504+
kubectl apply -f kubernetes.yaml
505+
```
506+
--
507+
508+
[.tab_content.linux_section]
509+
--
510+
[role='command']
511+
```
512+
kubectl delete -f kubernetes.yaml
513+
514+
./mvnw clean package
515+
docker build -t system:1.0-SNAPSHOT system/.
516+
docker build -t inventory:1.0-SNAPSHOT inventory/.
517+
518+
kubectl apply -f kubernetes.yaml
519+
```
520+
--
464521
endif::[]
465522

466523
// Cloud-hosted guide instruction
@@ -469,7 +526,7 @@ ifdef::cloud-hosted[]
469526
cd /home/project/guide-kubernetes-intro/start
470527
kubectl delete -f kubernetes.yaml
471528

472-
mvn clean package
529+
./mvnw clean package
473530
docker build -t system:1.0-SNAPSHOT system/.
474531
docker build -t inventory:1.0-SNAPSHOT inventory/.
475532
docker tag inventory:1.0-SNAPSHOT us.icr.io/$SN_ICR_NAMESPACE/inventory:1.0-SNAPSHOT
@@ -510,12 +567,21 @@ Navigate back to the `start` directory.
510567
ifndef::cloud-hosted[]
511568
include::{common-includes}/os-tabs.adoc[]
512569

513-
[.tab_content.windows_section.mac_section]
570+
[.tab_content.windows_section]
571+
--
572+
Run the integration tests against a cluster running with a host name of `localhost`:
573+
[role='command']
574+
```
575+
mvnw.cmd failsafe:integration-test
576+
```
577+
--
578+
579+
[.tab_content.mac_section]
514580
--
515581
Run the integration tests against a cluster running with a host name of `localhost`:
516582
[role='command']
517583
```
518-
mvn failsafe:integration-test
584+
./mvnw failsafe:integration-test
519585
```
520586
--
521587

@@ -524,7 +590,7 @@ mvn failsafe:integration-test
524590
Run the integration tests with the IP address for Minikube:
525591
[role='command']
526592
```
527-
mvn failsafe:integration-test -Dsystem.service.root=$(minikube ip):31000 -Dinventory.service.root=$(minikube ip):32000
593+
./mvnw failsafe:integration-test -Dsystem.service.root=$(minikube ip):31000 -Dinventory.service.root=$(minikube ip):32000
528594
```
529595
--
530596
endif::[]
@@ -542,7 +608,7 @@ sed -i 's=localhost:31000='"$SYSTEM_PROXY"'=g' system/pom.xml
542608
Run the integration tests by using the following command:
543609

544610
```bash
545-
mvn failsafe:integration-test
611+
./mvnw failsafe:integration-test
546612
```
547613
endif::[]
548614

‎finish/.mvn/wrapper/maven-wrapper.jar‎

61.6 KB
Binary file not shown.

‎finish/.mvn/wrapper/maven-wrapper.properties‎

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

‎finish/inventory/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>org.junit.jupiter</groupId>
5858
<artifactId>junit-jupiter</artifactId>
59-
<version>5.12.2</version>
59+
<version>5.13.0</version>
6060
<scope>test</scope>
6161
</dependency>
6262
<dependency>

0 commit comments

Comments
 (0)