Skip to content

Commit e0d72f7

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #47 from OpenLiberty/staging
Merge staging to prod: Update to MP6.1
2 parents 877b75b + 34a9472 commit e0d72f7

File tree

16 files changed

+102
-86
lines changed

16 files changed

+102
-86
lines changed

‎.github/dependabot.yml‎

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

‎.github/workflows/add-pr-to-project.yml‎

Lines changed: 18 additions & 0 deletions
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/add-to-project@v0.5.0
15+
with:
16+
project-url: https://github.com/orgs/OpenLiberty/projects/26
17+
github-token: ${{ secrets.ADMIN_BACKLOG }}
18+
labeled: dependencies

‎README.adoc‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022, 2023 IBM Corporation and others.
1+
// Copyright (c) 2022, 2024 IBM Corporation and others.
22
// Licensed under Creative Commons Attribution-NoDerivatives
33
// 4.0 International (CC BY-ND 4.0)
44
// https://creativecommons.org/licenses/by-nd/4.0/
@@ -253,13 +253,6 @@ include::finish/system/Containerfile-full[]
253253

254254
Now that your microservices are packaged and your `Containerfile` files are written, you will build your container images by using the `podman build` command.
255255

256-
Run the following command to download or update to the latest Open Liberty container image:
257-
258-
[role='command']
259-
```
260-
podman pull icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
261-
```
262-
263256
Run the following commands to build container images for your application:
264257

265258
[role='command']
@@ -424,29 +417,29 @@ In this example, you will use an environment variable to externally configure th
424417
HTTP port number of the `inventory` service.
425418

426419
In the [hotspot file=0]`inventory/server.xml` file,
427-
the [hotspot=httpPort file=0]`default.http.port` variable is declared and is used in the
420+
the [hotspot=httpPort file=0]`http.port` variable is declared and is used in the
428421
[hotspot=httpEndpoint file=0]`httpEndpoint` element to define the service
429-
endpoint. The default value of the [hotspot=httpPort file=0]`default.http.port`
422+
endpoint. The default value of the [hotspot=httpPort file=0]`http.port`
430423
variable is `9081`. However, this value is only used if no other value is specified.
431424
You can replace this value in the container by using the -e flag for the podman run command.
432425

433-
Run the following commands to stop and remove the `inventory` container and rerun it with the `default.http.port` environment variable set:
426+
Run the following commands to stop and remove the `inventory` container and rerun it with the `http.port` environment variable set:
434427

435428
[role='command']
436429
```
437430
podman stop inventory
438431
podman rm inventory
439-
podman run -d --name inventory -e default.http.port=9091 -p 9091:9091 inventory:1.0-SNAPSHOT
432+
podman run -d --name inventory -e http.port=9091 -p 9091:9091 inventory:1.0-SNAPSHOT
440433
```
441434

442435
The `-e` flag can be used to create and set the values of environment variables
443-
in a container. In this case, you are setting the `default.http.port` environment
436+
in a container. In this case, you are setting the `http.port` environment
444437
variable to `9091` for the `inventory` container. The `-p` flag then maps the local port
445438
to the new container port that was specified via the environment variable.
446439

447440
Now, when the service is starting up, Open Liberty finds the
448-
`default.http.port` environment variable and uses it to set the value of the
449-
[hotspot=httpPort file=0]`default.http.port` variable to be used in the HTTP
441+
`http.port` environment variable and uses it to set the value of the
442+
[hotspot=httpPort file=0]`http.port` variable to be used in the HTTP
450443
endpoint.
451444

452445
// static guide instructions:
@@ -574,14 +567,12 @@ podman exec -it inventory /opt/ol/wlp/bin/productInfo featureInfo
574567
Your list of Liberty features should be similar to the following:
575568
----
576569
jndi-1.0
577-
servlet-5.0
578-
cdi-3.0
579-
concurrent-2.0
580-
jsonb-2.0
581-
jsonp-2.0
582-
mpConfig-3.0
583-
restfulWS-3.0
584-
restfulWSClient-3.0
570+
cdi-4.0
571+
jsonb-3.0
572+
jsonp-2.1
573+
mpConfig-3.1
574+
restfulWS-3.1
575+
restfulWSClient-3.1
585576
----
586577

587578
// static guide instructions:

‎finish/inventory/pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<system.ip>localhost</system.ip>
2121
<system.http.port>9080</system.http.port>
2222
<!-- Liberty configuration -->
23-
<liberty.var.default.http.port>9081</liberty.var.default.http.port>
24-
<liberty.var.default.https.port>9444</liberty.var.default.https.port>
23+
<liberty.var.http.port>9081</liberty.var.http.port>
24+
<liberty.var.https.port>9444</liberty.var.https.port>
2525
</properties>
2626

2727
<dependencies>
@@ -35,33 +35,33 @@
3535
<dependency>
3636
<groupId>org.eclipse.microprofile</groupId>
3737
<artifactId>microprofile</artifactId>
38-
<version>6.0</version>
38+
<version>6.1</version>
3939
<type>pom</type>
4040
<scope>provided</scope>
4141
</dependency>
4242
<!-- Java utility classes -->
4343
<dependency>
4444
<groupId>org.apache.commons</groupId>
4545
<artifactId>commons-lang3</artifactId>
46-
<version>3.12.0</version>
46+
<version>3.14.0</version>
4747
</dependency>
4848
<!-- For tests -->
4949
<dependency>
5050
<groupId>org.junit.jupiter</groupId>
5151
<artifactId>junit-jupiter-engine</artifactId>
52-
<version>5.9.2</version>
52+
<version>5.10.1</version>
5353
<scope>test</scope>
5454
</dependency>
5555
<dependency>
5656
<groupId>org.jboss.resteasy</groupId>
5757
<artifactId>resteasy-client</artifactId>
58-
<version>6.2.3.Final</version>
58+
<version>6.2.7.Final</version>
5959
<scope>test</scope>
6060
</dependency>
6161
<dependency>
6262
<groupId>org.jboss.resteasy</groupId>
6363
<artifactId>resteasy-json-binding-provider</artifactId>
64-
<version>6.2.3.Final</version>
64+
<version>6.2.7.Final</version>
6565
<scope>test</scope>
6666
</dependency>
6767
<dependency>
@@ -83,24 +83,24 @@
8383
<plugin>
8484
<groupId>io.openliberty.tools</groupId>
8585
<artifactId>liberty-maven-plugin</artifactId>
86-
<version>3.8.2</version>
86+
<version>3.10</version>
8787
</plugin>
8888
<!-- Plugin to run unit tests -->
8989
<plugin>
9090
<groupId>org.apache.maven.plugins</groupId>
9191
<artifactId>maven-surefire-plugin</artifactId>
92-
<version>3.0.0</version>
92+
<version>3.2.5</version>
9393
</plugin>
9494
<!-- Plugin to run functional tests -->
9595
<plugin>
9696
<groupId>org.apache.maven.plugins</groupId>
9797
<artifactId>maven-failsafe-plugin</artifactId>
98-
<version>3.0.0</version>
98+
<version>3.2.5</version>
9999
<configuration>
100100
<systemPropertyVariables>
101101
<system.ip>${system.ip}</system.ip>
102102
<system.http.port>${system.http.port}</system.http.port>
103-
<inventory.http.port>${liberty.var.default.http.port}</inventory.http.port>
103+
<inventory.http.port>${liberty.var.http.port}</inventory.http.port>
104104
</systemPropertyVariables>
105105
</configuration>
106106
</plugin>

‎finish/inventory/src/main/liberty/config/server.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
<feature>jsonb-3.0</feature>
66
<feature>jsonp-2.1</feature>
77
<feature>cdi-4.0</feature>
8-
<feature>mpConfig-3.0</feature>
8+
<feature>mpConfig-3.1</feature>
99
</featureManager>
1010

1111
<!-- tag::httpPort[] -->
12-
<variable name="default.http.port" defaultValue="9081" />
12+
<variable name="http.port" defaultValue="9081" />
1313
<!-- end::httpPort[] -->
14-
<variable name="default.https.port" defaultValue="9444" />
14+
<variable name="https.port" defaultValue="9444" />
1515

1616
<!-- tag::httpEndpoint[] -->
17-
<httpEndpoint httpPort="${default.http.port}" httpsPort="${default.https.port}"
17+
<httpEndpoint httpPort="${http.port}" httpsPort="${https.port}"
1818
id="defaultHttpEndpoint" host="*" />
1919
<!-- end::httpEndpoint[] -->
2020

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ <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>
34-
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.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>
34+
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 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/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 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>

‎finish/system/pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<maven.compiler.source>11</maven.compiler.source>
1818
<maven.compiler.target>11</maven.compiler.target>
1919
<!-- Liberty configuration -->
20-
<liberty.var.default.http.port>9080</liberty.var.default.http.port>
21-
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
20+
<liberty.var.http.port>9080</liberty.var.http.port>
21+
<liberty.var.https.port>9443</liberty.var.https.port>
2222
</properties>
2323

2424
<dependencies>
@@ -32,27 +32,27 @@
3232
<dependency>
3333
<groupId>org.eclipse.microprofile</groupId>
3434
<artifactId>microprofile</artifactId>
35-
<version>6.0</version>
35+
<version>6.1</version>
3636
<type>pom</type>
3737
<scope>provided</scope>
3838
</dependency>
3939
<!-- For tests -->
4040
<dependency>
4141
<groupId>org.junit.jupiter</groupId>
4242
<artifactId>junit-jupiter-engine</artifactId>
43-
<version>5.9.2</version>
43+
<version>5.10.1</version>
4444
<scope>test</scope>
4545
</dependency>
4646
<dependency>
4747
<groupId>org.jboss.resteasy</groupId>
4848
<artifactId>resteasy-json-binding-provider</artifactId>
49-
<version>6.2.3.Final</version>
49+
<version>6.2.7.Final</version>
5050
<scope>test</scope>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.jboss.resteasy</groupId>
5454
<artifactId>resteasy-client</artifactId>
55-
<version>6.2.3.Final</version>
55+
<version>6.2.7.Final</version>
5656
<scope>test</scope>
5757
</dependency>
5858
</dependencies>
@@ -69,22 +69,22 @@
6969
<plugin>
7070
<groupId>io.openliberty.tools</groupId>
7171
<artifactId>liberty-maven-plugin</artifactId>
72-
<version>3.8.2</version>
72+
<version>3.10</version>
7373
</plugin>
7474
<!-- Plugin to run unit tests -->
7575
<plugin>
7676
<groupId>org.apache.maven.plugins</groupId>
7777
<artifactId>maven-surefire-plugin</artifactId>
78-
<version>3.0.0</version>
78+
<version>3.2.5</version>
7979
</plugin>
8080
<!-- Plugin to run functional tests -->
8181
<plugin>
8282
<groupId>org.apache.maven.plugins</groupId>
8383
<artifactId>maven-failsafe-plugin</artifactId>
84-
<version>3.0.0</version>
84+
<version>3.2.5</version>
8585
<configuration>
8686
<systemPropertyVariables>
87-
<system.http.port>${liberty.var.default.http.port}</system.http.port>
87+
<system.http.port>${liberty.var.http.port}</system.http.port>
8888
</systemPropertyVariables>
8989
</configuration>
9090
</plugin>

‎finish/system/src/main/liberty/config/server.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<feature>cdi-4.0</feature>
88
</featureManager>
99

10-
<variable name="default.http.port" defaultValue="9080" />
11-
<variable name="default.https.port" defaultValue="9443" />
10+
<variable name="http.port" defaultValue="9080" />
11+
<variable name="https.port" defaultValue="9443" />
1212

13-
<httpEndpoint httpPort="${default.http.port}" httpsPort="${default.https.port}"
13+
<httpEndpoint httpPort="${http.port}" httpsPort="${https.port}"
1414
id="defaultHttpEndpoint" host="*" />
1515

1616
<webApplication location="system.war" contextRoot="/">

‎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-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/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
3535
<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>
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>

‎scripts/testAppFinish.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fi
5858

5959
podman stop inventory
6060
podman rm inventory
61-
podman run -d --name inventory -e default.http.port=9091 -p 9091:9091 inventory
61+
podman run -d --name inventory -e http.port=9091 -p 9091:9091 inventory
6262

6363
sleep 30
6464

0 commit comments

Comments
 (0)