Skip to content

Commit 24853f5

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #145 from OpenLiberty/staging
Merge staging to prod - Use versionless feature and MP7
2 parents 6ee3516 + d4a76ae commit 24853f5

File tree

18 files changed

+58
-51
lines changed

18 files changed

+58
-51
lines changed

‎.github/workflows/test.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
canSkip: ${{ steps.Checker.outputs.canSkip }}
1313
steps:
1414
- name: Get files
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616
- name: Get tools
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
with:
1919
path: tools/
2020
repository: openliberty/guides-common
@@ -44,10 +44,11 @@ jobs:
4444
run:
4545
working-directory: finish
4646
steps:
47-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v4
4848
- name: Set up JDK 11
49-
uses: actions/setup-java@v1
49+
uses: actions/setup-java@v4
5050
with:
51+
distribution: 'semeru'
5152
java-version: 11
5253
- run: unset _JAVA_OPTIONS
5354
- name: Run tests

‎README.adoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022, 2024 IBM Corporation and others.
1+
// Copyright (c) 2022, 2025 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/
@@ -52,7 +52,7 @@ with each other in different containers.
5252

5353
== Additional prerequisites
5454

55-
Before you begin, Podman needs to be installed. For installation instructions, refer to the https://podman.io/getting-started/installation[official Podman documentation^]. You will build and run the microservices in containers.
55+
Before you begin, Podman needs to be installed. For installation instructions, refer to the https://podman.io/docs/installation[official Podman documentation^]. You will build and run the microservices in containers.
5656

5757
If you are running Mac or Windows, make sure to start your Podman-managed VM before you proceed.
5858

@@ -194,7 +194,7 @@ A `Containerfile` file is a collection of instructions for building a container
194194
The `podman build` command uses Buildah to build your container image. As each instruction in a `Containerfile` file runs, a new image layer is created.
195195
These layers, which are known as intermediate images, are created when a change is made to your container image.
196196

197-
Learn more about Podman on the https://podman.io/getting-started/[official Podman page^].
197+
Learn more about Podman on the https://podman.io/get-started[official Podman page^].
198198

199199
=== Creating your Containerfile files
200200
You will be creating two container images to run the `inventory` service and `system` service. The first step is to create `Containerfile` files for both services.

‎finish/inventory/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>org.eclipse.microprofile</groupId>
3737
<artifactId>microprofile</artifactId>
38-
<version>6.1</version>
38+
<version>7.0</version>
3939
<type>pom</type>
4040
<scope>provided</scope>
4141
</dependency>

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<server description="Sample Liberty server">
22

33
<featureManager>
4-
<feature>restfulWS-3.1</feature>
5-
<feature>jsonb-3.0</feature>
6-
<feature>jsonp-2.1</feature>
7-
<feature>cdi-4.0</feature>
8-
<feature>mpConfig-3.1</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<platform>microprofile-7.0</platform>
6+
<feature>restfulWS</feature>
7+
<feature>jsonb</feature>
8+
<feature>jsonp</feature>
9+
<feature>cdi</feature>
10+
<feature>mpConfig</feature>
911
</featureManager>
1012

1113
<!-- tag::httpPort[] -->

‎finish/inventory/src/main/webapp/favicon.ico‎

14.7 KB
Binary file not shown.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2016, 2021 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,11 +30,11 @@ <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.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>
35-
<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/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
37-
<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>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
34+
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
35+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</a></li>
36+
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
37+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
3838
</ul>
3939
</p>
4040
</div>

‎finish/system/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>org.eclipse.microprofile</groupId>
3434
<artifactId>microprofile</artifactId>
35-
<version>6.1</version>
35+
<version>7.0</version>
3636
<type>pom</type>
3737
<scope>provided</scope>
3838
</dependency>

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<server description="Sample Liberty server">
22

33
<featureManager>
4-
<feature>restfulWS-3.1</feature>
5-
<feature>jsonb-3.0</feature>
6-
<feature>jsonp-2.1</feature>
7-
<feature>cdi-4.0</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<feature>restfulWS</feature>
6+
<feature>jsonb</feature>
7+
<feature>jsonp</feature>
8+
<feature>cdi</feature>
89
</featureManager>
910

1011
<variable name="http.port" defaultValue="9080" />

‎finish/system/src/main/webapp/favicon.ico‎

14.7 KB
Binary file not shown.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2016, 2021 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.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
34-
<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>
35-
<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>
36-
<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>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
34+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</a></li>
35+
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
36+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
3737
</ul>
3838
</p>
3939
</div>

0 commit comments

Comments
 (0)