Skip to content

Commit 334b76c

Browse files
gkwan-ibmgkwan-ibm
authored
Update to MP6.1 (#248)
* update versions * Update InventoryReadinessCheck.java * Update InventoryReadinessCheck.java * update versions
1 parent 6b079c5 commit 334b76c

File tree

19 files changed

+111
-86
lines changed

19 files changed

+111
-86
lines changed

Diff for: ‎.github/dependabot.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: maven
4+
directory: "/"
5+
schedule:
6+
interval: monthly
7+
open-pull-requests-limit: 50

Diff for: ‎.github/workflows/add-pr-to-project.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Add PRs to Dependabot PRs dashboard
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- labeled
8+
9+
jobs:
10+
add-to-project:
11+
name: Add PR to dashboard
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/[email protected]
15+
with:
16+
project-url: https://github.com/orgs/OpenLiberty/projects/26
17+
github-token: ${{ secrets.ADMIN_BACKLOG }}
18+
labeled: dependencies

Diff for: ‎finish/inventory/pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<inventory.service.root>localhost:32000</inventory.service.root>
2828
<!-- end::inventory.service.root[] -->
2929
<!-- Liberty configuration -->
30-
<liberty.var.default.http.port>9080</liberty.var.default.http.port>
31-
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
30+
<liberty.var.http.port>9090</liberty.var.http.port>
31+
<liberty.var.https.port>9453</liberty.var.https.port>
3232
</properties>
3333

3434
<dependencies>
@@ -42,33 +42,33 @@
4242
<dependency>
4343
<groupId>org.eclipse.microprofile</groupId>
4444
<artifactId>microprofile</artifactId>
45-
<version>6.0</version>
45+
<version>6.1</version>
4646
<type>pom</type>
4747
<scope>provided</scope>
4848
</dependency>
4949
<!-- Java utility classes -->
5050
<dependency>
5151
<groupId>org.apache.commons</groupId>
5252
<artifactId>commons-lang3</artifactId>
53-
<version>3.12.0</version>
53+
<version>3.14.0</version>
5454
</dependency>
5555
<!-- For tests -->
5656
<dependency>
5757
<groupId>org.junit.jupiter</groupId>
5858
<artifactId>junit-jupiter</artifactId>
59-
<version>5.9.2</version>
59+
<version>5.10.1</version>
6060
<scope>test</scope>
6161
</dependency>
6262
<dependency>
6363
<groupId>org.jboss.resteasy</groupId>
6464
<artifactId>resteasy-client</artifactId>
65-
<version>6.2.3.Final</version>
65+
<version>6.2.7.Final</version>
6666
<scope>test</scope>
6767
</dependency>
6868
<dependency>
6969
<groupId>org.jboss.resteasy</groupId>
7070
<artifactId>resteasy-json-binding-provider</artifactId>
71-
<version>6.2.3.Final</version>
71+
<version>6.2.7.Final</version>
7272
<scope>test</scope>
7373
</dependency>
7474
<dependency>
@@ -90,19 +90,19 @@
9090
<plugin>
9191
<groupId>io.openliberty.tools</groupId>
9292
<artifactId>liberty-maven-plugin</artifactId>
93-
<version>3.8.2</version>
93+
<version>3.10</version>
9494
</plugin>
9595
<!-- Plugin to run unit tests -->
9696
<plugin>
9797
<groupId>org.apache.maven.plugins</groupId>
9898
<artifactId>maven-surefire-plugin</artifactId>
99-
<version>3.0.0</version>
99+
<version>3.2.5</version>
100100
</plugin>
101101
<!-- Plugin to run functional tests -->
102102
<plugin>
103103
<groupId>org.apache.maven.plugins</groupId>
104104
<artifactId>maven-failsafe-plugin</artifactId>
105-
<version>3.0.0</version>
105+
<version>3.2.5</version>
106106
<configuration>
107107
<systemPropertyVariables>
108108
<inventory.service.root>${inventory.service.root}</inventory.service.root>

Diff for: ‎finish/inventory/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2017, 2023 IBM Corporation and others.
3+
* Copyright (c) 2017, 2024 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
@@ -34,8 +34,8 @@ public class SystemClient {
3434
private final String PROTOCOL = "http";
3535

3636
@Inject
37-
@ConfigProperty(name = "default.http.port")
38-
String DEFAULT_PORT;
37+
@ConfigProperty(name = "http.port")
38+
String HTTP_PORT;
3939

4040
// Wrapper function that gets properties
4141
public Properties getProperties(String hostname) {
@@ -56,7 +56,7 @@ public Properties getProperties(String hostname) {
5656
// Method that creates the client builder
5757
private Builder getBuilder(String hostname, Client client) throws Exception {
5858
URI uri = new URI(
59-
PROTOCOL, null, hostname, Integer.valueOf(DEFAULT_PORT),
59+
PROTOCOL, null, hostname, Integer.valueOf(HTTP_PORT),
6060
SYSTEM_PROPERTIES, null, null);
6161
String urlString = uri.toString();
6262
Builder builder = client.target(urlString).request();

Diff for: ‎finish/inventory/src/main/java/io/openliberty/guides/inventory/health/InventoryReadinessCheck.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2019, 2022 IBM Corporation and others.
3+
* Copyright (c) 2019, 2024 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
@@ -48,7 +48,7 @@ private boolean isSystemServiceReachable() {
4848
try {
4949
Client client = ClientBuilder.newClient();
5050
client
51-
.target("http://" + hostname + ":9080/system/properties")
51+
.target("http://" + hostname + ":9090/system/properties")
5252
.request()
5353
.post(null);
5454

Diff for: ‎finish/inventory/src/main/liberty/config/server.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
<feature>restfulWS-3.1</feature>
55
<feature>jsonb-3.0</feature>
66
<feature>cdi-4.0</feature>
7-
<feature>mpConfig-3.0</feature>
7+
<feature>mpConfig-3.1</feature>
88
<feature>jsonp-2.1</feature>
99
<feature>mpHealth-4.0</feature>
1010
</featureManager>
1111

12-
<variable name="default.http.port" defaultValue="9080" />
13-
<variable name="default.https.port" defaultValue="9443" />
12+
<variable name="http.port" defaultValue="9090" />
13+
<variable name="https.port" defaultValue="9453" />
1414

15-
<httpEndpoint host="*" httpPort="${default.http.port}"
16-
httpsPort="${default.https.port}" id="defaultHttpEndpoint" />
15+
<httpEndpoint host="*" httpPort="${http.port}"
16+
httpsPort="${https.port}" id="defaultHttpEndpoint" />
1717

1818
<webApplication location="guide-kubernetes-intro-inventory.war" contextRoot="/" />
1919
</server>

Diff for: ‎finish/inventory/src/main/webapp/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2016, 2023 IBM Corp.
2+
Copyright (c) 2016, 2024 IBM Corp.
33
​
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -30,10 +30,10 @@ <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-6.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.0</a></li>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
3434
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
3535
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
36-
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.0</a></li>
36+
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
3737
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
3838
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
3939
</ul>

Diff for: ‎finish/kubernetes.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ spec:
4141
# end::image1[]
4242
ports:
4343
# tag::containerPort1[]
44-
- containerPort: 9080
44+
- containerPort: 9090
4545
# end::containerPort1[]
4646
# tag::readinessProbe1[]
4747
readinessProbe:
4848
httpGet:
4949
# tag::ready1[]
5050
path: /health/ready
5151
# end::ready1[]
52-
port: 9080
52+
port: 9090
5353
# tag::delay2[]
5454
initialDelaySeconds: 30
5555
# end::delay2[]
@@ -107,7 +107,7 @@ spec:
107107
# end::image2[]
108108
ports:
109109
# tag::containerPort2[]
110-
- containerPort: 9080
110+
- containerPort: 9090
111111
# end::containerPort2[]
112112
env:
113113
- name: SYS_APP_HOSTNAME
@@ -118,7 +118,7 @@ spec:
118118
# tag::ready2[]
119119
path: /health/ready
120120
# end::ready2[]
121-
port: 9080
121+
port: 9090
122122
# tag::delay4[]
123123
initialDelaySeconds: 30
124124
# end::delay4[]
@@ -147,8 +147,8 @@ spec:
147147
# end::app7[]
148148
ports:
149149
- protocol: TCP
150-
port: 9080
151-
targetPort: 9080
150+
port: 9090
151+
targetPort: 9090
152152
# tag::nodePort1[]
153153
nodePort: 31000
154154
# end::nodePort1[]
@@ -168,8 +168,8 @@ spec:
168168
# end::app8[]
169169
ports:
170170
- protocol: TCP
171-
port: 9080
172-
targetPort: 9080
171+
port: 9090
172+
targetPort: 9090
173173
# tag::nodePort2[]
174174
nodePort: 32000
175175
# end::nodePort2[]

Diff for: ‎finish/system/pom.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<!-- Default test properties -->
2020
<system.service.root>localhost:31000</system.service.root>
2121
<!-- Liberty configuration -->
22-
<liberty.var.default.http.port>9080</liberty.var.default.http.port>
23-
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
22+
<liberty.var.http.port>9090</liberty.var.http.port>
23+
<liberty.var.https.port>9453</liberty.var.https.port>
2424
</properties>
2525

2626
<dependencies>
@@ -34,27 +34,27 @@
3434
<dependency>
3535
<groupId>org.eclipse.microprofile</groupId>
3636
<artifactId>microprofile</artifactId>
37-
<version>6.0</version>
37+
<version>6.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.9.2</version>
45+
<version>5.10.1</version>
4646
<scope>test</scope>
4747
</dependency>
4848
<dependency>
4949
<groupId>org.jboss.resteasy</groupId>
5050
<artifactId>resteasy-json-binding-provider</artifactId>
51-
<version>6.2.3.Final</version>
51+
<version>6.2.7.Final</version>
5252
<scope>test</scope>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.jboss.resteasy</groupId>
5656
<artifactId>resteasy-client</artifactId>
57-
<version>6.2.3.Final</version>
57+
<version>6.2.7.Final</version>
5858
<scope>test</scope>
5959
</dependency>
6060
</dependencies>
@@ -71,19 +71,19 @@
7171
<plugin>
7272
<groupId>io.openliberty.tools</groupId>
7373
<artifactId>liberty-maven-plugin</artifactId>
74-
<version>3.8.2</version>
74+
<version>3.10</version>
7575
</plugin>
7676
<!-- Plugin to run unit tests -->
7777
<plugin>
7878
<groupId>org.apache.maven.plugins</groupId>
7979
<artifactId>maven-surefire-plugin</artifactId>
80-
<version>3.0.0</version>
80+
<version>3.2.5</version>
8181
</plugin>
8282
<!-- Plugin to run functional tests -->
8383
<plugin>
8484
<groupId>org.apache.maven.plugins</groupId>
8585
<artifactId>maven-failsafe-plugin</artifactId>
86-
<version>3.0.0</version>
86+
<version>3.2.5</version>
8787
<configuration>
8888
<systemPropertyVariables>
8989
<system.service.root>${system.service.root}</system.service.root>

Diff for: ‎finish/system/src/main/liberty/config/server.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<feature>mpHealth-4.0</feature>
99
</featureManager>
1010

11-
<variable name="default.http.port" defaultValue="9080" />
12-
<variable name="default.https.port" defaultValue="9443" />
11+
<variable name="http.port" defaultValue="9090" />
12+
<variable name="https.port" defaultValue="9453" />
1313

14-
<httpEndpoint host="*" httpPort="${default.http.port}"
15-
httpsPort="${default.https.port}" id="defaultHttpEndpoint" />
14+
<httpEndpoint host="*" httpPort="${http.port}"
15+
httpsPort="${https.port}" id="defaultHttpEndpoint" />
1616

1717
<webApplication location="guide-kubernetes-intro-system.war" contextRoot="/" />
1818
</server>

Diff for: ‎finish/system/src/main/webapp/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2016, 2023 IBM Corp.
2+
Copyright (c) 2016, 2024 IBM Corp.
33
​
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -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-6.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.0</a></li>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
3434
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
3535
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
3636
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>

0 commit comments

Comments
 (0)