Skip to content

Commit 9b37173

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #202 from OpenLiberty/staging
Merge staging to prod - Version update mp41 (#200)
2 parents d988320 + 9db3466 commit 9b37173

File tree

17 files changed

+40
-40
lines changed

17 files changed

+40
-40
lines changed

‎README.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ command to have {kube} make all those updates for you. Of course, this is just a
6868
Deploying an application to Kubernetes means deploying an application to a Kubernetes cluster.
6969

7070
A typical {kube} cluster is a collection of physical or virtual machines called nodes that run
71-
containerized applications. A cluster is made up of one master node that manages the cluster, and
71+
containerized applications. A cluster is made up of one parent node that manages the cluster, and
7272
many worker nodes that run the actual application instances inside {kube} objects called pods.
7373

7474
A pod is a basic building block in a {kube} cluster. It represents a single running process that
@@ -117,7 +117,7 @@ include::{common-includes}/kube-prereq.adoc[]
117117
[role='command']
118118
include::{common-includes}/gitclone.adoc[]
119119

120-
// no "try what you'll build" section in this guide since it would be too long due to all setup the user will have to do.
120+
// no "try what you'll build" section in this guide because it would be too long due to all setup the user will have to do.
121121

122122
// =================================================================================================
123123
// Staring and preparing your cluster for deployment
@@ -157,7 +157,7 @@ cd start
157157
mvn clean package
158158
```
159159

160-
include::{common-includes}/ol-full-docker-pull.adoc[]
160+
include::{common-includes}/ol-icr-full-docker-pull.adoc[]
161161

162162
Next, run the `docker build` commands to build container images for your application:
163163
[role='command']
@@ -502,7 +502,7 @@ kubectl scale deployment/system-deployment --replicas=1
502502

503503
When you're building your application, you might want to quickly test a change.
504504
To run a quick test, you can rebuild your Docker images then delete and re-create your {kube} resources.
505-
Note that there is only one `system` pod after you redeploy since you're deleting all of the existing pods.
505+
Note that there is only one `system` pod after you redeploy because you're deleting all of the existing pods.
506506

507507
// Static guide instruction
508508
ifndef::cloud-hosted[]

‎finish/inventory/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openliberty/open-liberty:full-java11-openj9-ubi
1+
FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
22

33
COPY --chown=1001:0 src/main/liberty/config /config/
44
COPY --chown=1001:0 target/inventory.war /config/apps

‎finish/inventory/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>org.eclipse.microprofile</groupId>
4444
<artifactId>microprofile</artifactId>
45-
<version>4.0.1</version>
45+
<version>4.1</version>
4646
<type>pom</type>
4747
<scope>provided</scope>
4848
</dependency>
@@ -56,19 +56,19 @@
5656
<dependency>
5757
<groupId>org.junit.jupiter</groupId>
5858
<artifactId>junit-jupiter</artifactId>
59-
<version>5.7.1</version>
59+
<version>5.8.1</version>
6060
<scope>test</scope>
6161
</dependency>
6262
<dependency>
6363
<groupId>org.apache.cxf</groupId>
6464
<artifactId>cxf-rt-rs-client</artifactId>
65-
<version>3.4.3</version>
65+
<version>3.4.5</version>
6666
<scope>test</scope>
6767
</dependency>
6868
<dependency>
6969
<groupId>org.apache.cxf</groupId>
7070
<artifactId>cxf-rt-rs-extension-providers</artifactId>
71-
<version>3.4.3</version>
71+
<version>3.4.5</version>
7272
<scope>test</scope>
7373
</dependency>
7474
<dependency>
@@ -85,12 +85,12 @@
8585
<plugin>
8686
<groupId>org.apache.maven.plugins</groupId>
8787
<artifactId>maven-war-plugin</artifactId>
88-
<version>3.3.1</version>
88+
<version>3.3.2</version>
8989
</plugin>
9090
<plugin>
9191
<groupId>io.openliberty.tools</groupId>
9292
<artifactId>liberty-maven-plugin</artifactId>
93-
<version>3.3.4</version>
93+
<version>3.5.1</version>
9494
</plugin>
9595
<!-- Plugin to run unit tests -->
9696
<plugin>

‎finish/inventory/src/main/webapp/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2>Eclipse MicroProfile</h2>
3030
<p>
3131
For more information about the features used in this application, see the Open Liberty documentation:
3232
<ul>
33-
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.0</a></li>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.1</a></li>
3434
<li><a href="https://openliberty.io/docs/ref/feature/#jaxrs-2.1.html" target="_blank" rel="noopener noreferrer">Java RESTful Services 2.1</a></li>
3535
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-2.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 2.0</a></li>
3636
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-2.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 2.0</a></li>

‎finish/system/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openliberty/open-liberty:full-java11-openj9-ubi
1+
FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
22

33
COPY --chown=1001:0 src/main/liberty/config /config/
44
COPY --chown=1001:0 target/system.war /config/apps

‎finish/system/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,27 @@
3434
<dependency>
3535
<groupId>org.eclipse.microprofile</groupId>
3636
<artifactId>microprofile</artifactId>
37-
<version>4.0.1</version>
37+
<version>4.1</version>
3838
<type>pom</type>
3939
<scope>provided</scope>
4040
</dependency>
4141
<!-- For tests -->
4242
<dependency>
4343
<groupId>org.junit.jupiter</groupId>
4444
<artifactId>junit-jupiter</artifactId>
45-
<version>5.7.1</version>
45+
<version>5.8.1</version>
4646
<scope>test</scope>
4747
</dependency>
4848
<dependency>
4949
<groupId>org.apache.cxf</groupId>
5050
<artifactId>cxf-rt-rs-extension-providers</artifactId>
51-
<version>3.4.3</version>
51+
<version>3.4.5</version>
5252
<scope>test</scope>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.apache.cxf</groupId>
5656
<artifactId>cxf-rt-rs-client</artifactId>
57-
<version>3.4.3</version>
57+
<version>3.4.5</version>
5858
<scope>test</scope>
5959
</dependency>
6060
</dependencies>
@@ -65,13 +65,13 @@
6565
<plugin>
6666
<groupId>org.apache.maven.plugins</groupId>
6767
<artifactId>maven-war-plugin</artifactId>
68-
<version>3.3.1</version>
68+
<version>3.3.2</version>
6969
</plugin>
7070
<!-- Enable Liberty Maven plugin -->
7171
<plugin>
7272
<groupId>io.openliberty.tools</groupId>
7373
<artifactId>liberty-maven-plugin</artifactId>
74-
<version>3.3.4</version>
74+
<version>3.5.1</version>
7575
</plugin>
7676
<!-- Plugin to run unit tests -->
7777
<plugin>

‎finish/system/src/main/webapp/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2>Eclipse MicroProfile</h2>
3030
<p>
3131
For more information about the features used in this application, see the Open Liberty documentation:
3232
<ul>
33-
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.0</a></li>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.1</a></li>
3434
<li><a href="https://openliberty.io/docs/ref/feature/#jaxrs-2.1.html" target="_blank" rel="noopener noreferrer">Java RESTful Services 2.1</a></li>
3535
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-2.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 2.0</a></li>
3636
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-1.1.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Processing 1.1</a></li>

‎scripts/dailyBuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#a<configuration><install
1616
cat system/pom.xml
1717
cat inventory/pom.xml
1818

19-
sed -i "s;FROM openliberty/open-liberty:full-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" system/Dockerfile inventory/Dockerfile
19+
sed -i "s;FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" system/Dockerfile inventory/Dockerfile
2020
cat system/Dockerfile
2121
cat inventory/Dockerfile
2222

‎scripts/dockerImageTest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ echo "Testing latest OpenLiberty Docker image"
1313
sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#a<configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER</runtimeUrl></install></configuration>" system/pom.xml inventory/pom.xml
1414
cat system/pom.xml inventory/pom.xml
1515

16-
sed -i "s;FROM openliberty/open-liberty:full-java11-openj9-ubi;FROM openliberty/daily:latest;g" system/Dockerfile inventory/Dockerfile
16+
sed -i "s;FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi;FROM openliberty/daily:latest;g" system/Dockerfile inventory/Dockerfile
1717
cat system/Dockerfile inventory/Dockerfile
1818

1919
docker pull "openliberty/daily:latest"

‎scripts/testApp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mvn -Dhttp.keepAlive=false \
88
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
99
-q clean package
1010

11-
docker pull openliberty/open-liberty:full-java11-openj9-ubi
11+
docker pull icr.io/appcafe/open-liberty:full-java11-openj9-ubi
1212

1313
docker build -t system:1.0-SNAPSHOT system/.
1414
docker build -t inventory:1.0-SNAPSHOT inventory/.

‎scripts/testAppSN.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -euxo pipefail
33

44
mvn -q package
55

6-
docker pull openliberty/open-liberty:full-java11-openj9-ubi
6+
docker pull icr.io/appcafe/open-liberty:full-java11-openj9-ubi
77

88
docker build -t system:1.0-SNAPSHOT system/.
99
docker build -t inventory:1.0-SNAPSHOT inventory/.

‎start/inventory/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openliberty/open-liberty:full-java11-openj9-ubi
1+
FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
22

33
COPY --chown=1001:0 src/main/liberty/config /config/
44
COPY --chown=1001:0 target/inventory.war /config/apps

‎start/inventory/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>org.eclipse.microprofile</groupId>
3939
<artifactId>microprofile</artifactId>
40-
<version>4.0.1</version>
40+
<version>4.1</version>
4141
<type>pom</type>
4242
<scope>provided</scope>
4343
</dependency>
@@ -51,19 +51,19 @@
5151
<dependency>
5252
<groupId>org.junit.jupiter</groupId>
5353
<artifactId>junit-jupiter</artifactId>
54-
<version>5.7.1</version>
54+
<version>5.8.1</version>
5555
<scope>test</scope>
5656
</dependency>
5757
<dependency>
5858
<groupId>org.apache.cxf</groupId>
5959
<artifactId>cxf-rt-rs-client</artifactId>
60-
<version>3.4.3</version>
60+
<version>3.4.5</version>
6161
<scope>test</scope>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.apache.cxf</groupId>
6565
<artifactId>cxf-rt-rs-extension-providers</artifactId>
66-
<version>3.4.3</version>
66+
<version>3.4.5</version>
6767
<scope>test</scope>
6868
</dependency>
6969
<dependency>
@@ -80,12 +80,12 @@
8080
<plugin>
8181
<groupId>org.apache.maven.plugins</groupId>
8282
<artifactId>maven-war-plugin</artifactId>
83-
<version>3.3.1</version>
83+
<version>3.3.2</version>
8484
</plugin>
8585
<plugin>
8686
<groupId>io.openliberty.tools</groupId>
8787
<artifactId>liberty-maven-plugin</artifactId>
88-
<version>3.3.4</version>
88+
<version>3.5.1</version>
8989
</plugin>
9090
<!-- Plugin to run unit tests -->
9191
<plugin>

‎start/inventory/src/main/webapp/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2>Eclipse MicroProfile</h2>
3030
<p>
3131
For more information about the features used in this application, see the Open Liberty documentation:
3232
<ul>
33-
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.0</a></li>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.1</a></li>
3434
<li><a href="https://openliberty.io/docs/ref/feature/#jaxrs-2.1.html" target="_blank" rel="noopener noreferrer">Java RESTful Services 2.1</a></li>
3535
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-2.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 2.0</a></li>
3636
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-2.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 2.0</a></li>

‎start/system/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openliberty/open-liberty:full-java11-openj9-ubi
1+
FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
22

33
COPY --chown=1001:0 src/main/liberty/config /config/
44
COPY --chown=1001:0 target/system.war /config/apps

‎start/system/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,27 @@
3434
<dependency>
3535
<groupId>org.eclipse.microprofile</groupId>
3636
<artifactId>microprofile</artifactId>
37-
<version>4.0.1</version>
37+
<version>4.1</version>
3838
<type>pom</type>
3939
<scope>provided</scope>
4040
</dependency>
4141
<!-- For tests -->
4242
<dependency>
4343
<groupId>org.junit.jupiter</groupId>
4444
<artifactId>junit-jupiter</artifactId>
45-
<version>5.7.1</version>
45+
<version>5.8.1</version>
4646
<scope>test</scope>
4747
</dependency>
4848
<dependency>
4949
<groupId>org.apache.cxf</groupId>
5050
<artifactId>cxf-rt-rs-extension-providers</artifactId>
51-
<version>3.4.3</version>
51+
<version>3.4.5</version>
5252
<scope>test</scope>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.apache.cxf</groupId>
5656
<artifactId>cxf-rt-rs-client</artifactId>
57-
<version>3.4.3</version>
57+
<version>3.4.5</version>
5858
<scope>test</scope>
5959
</dependency>
6060
</dependencies>
@@ -65,13 +65,13 @@
6565
<plugin>
6666
<groupId>org.apache.maven.plugins</groupId>
6767
<artifactId>maven-war-plugin</artifactId>
68-
<version>3.3.1</version>
68+
<version>3.3.2</version>
6969
</plugin>
7070
<!-- Enable Liberty Maven plugin -->
7171
<plugin>
7272
<groupId>io.openliberty.tools</groupId>
7373
<artifactId>liberty-maven-plugin</artifactId>
74-
<version>3.3.4</version>
74+
<version>3.5.1</version>
7575
</plugin>
7676
<!-- Plugin to run unit tests -->
7777
<plugin>

‎start/system/src/main/webapp/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2>Eclipse MicroProfile</h2>
3030
<p>
3131
For more information about the features used in this application, see the Open Liberty documentation:
3232
<ul>
33-
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.0</a></li>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-4.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 4.1</a></li>
3434
<li><a href="https://openliberty.io/docs/ref/feature/#jaxrs-2.1.html" target="_blank" rel="noopener noreferrer">Java RESTful Services 2.1</a></li>
3535
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-2.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 2.0</a></li>
3636
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-1.1.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Processing 1.1</a></li>

0 commit comments

Comments
 (0)