Skip to content

Commit e0b6056

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #294 from OpenLiberty/staging
Merge staging to prod - Use versionless feature and MP7
2 parents 57b18a7 + d9c8ca0 commit e0b6056

File tree

18 files changed

+85
-62
lines changed

18 files changed

+85
-62
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: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2024 IBM Corporation and others.
1+
// Copyright (c) 2020, 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/
@@ -233,7 +233,15 @@ include::{common-includes}/os-tabs.adoc[]
233233
```
234234
--
235235

236-
[.tab_content.mac_section.linux_section]
236+
[.tab_content.mac_section]
237+
--
238+
[role='command']
239+
```
240+
./scripts/startContainers.sh
241+
```
242+
--
243+
244+
[.tab_content.linux_section]
237245
--
238246
[role='command']
239247
```
@@ -286,7 +294,15 @@ include::{common-includes}/os-tabs.adoc[]
286294
```
287295
--
288296

289-
[.tab_content.mac_section.linux_section]
297+
[.tab_content.mac_section]
298+
--
299+
[role='command']
300+
```
301+
./scripts/stopContainers.sh
302+
```
303+
--
304+
305+
[.tab_content.linux_section]
290306
--
291307
[role='command']
292308
```

‎finish/inventory/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>org.eclipse.microprofile</groupId>
3030
<artifactId>microprofile</artifactId>
31-
<version>6.1</version>
31+
<version>7.0</version>
3232
<type>pom</type>
3333
<scope>provided</scope>
3434
</dependency>

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<server description="Inventory Service">
22

33
<featureManager>
4-
<feature>restfulWS-3.1</feature>
5-
<feature>cdi-4.0</feature>
6-
<feature>concurrent-3.0</feature>
7-
<feature>jsonb-3.0</feature>
8-
<feature>mpHealth-4.0</feature>
9-
<feature>mpConfig-3.1</feature>
10-
<feature>mpReactiveMessaging-3.0</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<platform>microprofile-7.0</platform>
6+
<feature>restfulWS</feature>
7+
<feature>cdi</feature>
8+
<feature>concurrent</feature>
9+
<feature>jsonb</feature>
10+
<feature>mpHealth</feature>
11+
<feature>mpConfig</feature>
12+
<feature>mpReactiveMessaging</feature>
1113
</featureManager>
1214

1315
<variable name="http.port" defaultValue="9085"/>

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

14.7 KB
Binary file not shown.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ <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/#mpReactiveMessaging-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Reactive Messaging 3.0</a></li>
35-
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">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/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
38-
<li><a href="https://openliberty.io/docs/ref/feature/#concurrent-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta Concurrency 3.0</a></li>
39-
<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>
40-
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Health 4.0</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/#mpReactiveMessaging.html" target="_blank" rel="noopener noreferrer">MicroProfile Reactive Messaging</a></li>
35+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">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/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
38+
<li><a href="https://openliberty.io/docs/ref/feature/#concurrent.html" target="_blank" rel="noopener noreferrer">Jakarta Concurrency</a></li>
39+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
40+
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth.html" target="_blank" rel="noopener noreferrer"> MicroProfile Health</a></li>
4141
</ul>
4242
</p>
4343
</div>

‎finish/models/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>org.eclipse.microprofile</groupId>
1919
<artifactId>microprofile</artifactId>
20-
<version>6.1</version>
20+
<version>7.0</version>
2121
<type>pom</type>
2222
<scope>provided</scope>
2323
</dependency>

‎finish/system/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.eclipse.microprofile</groupId>
3232
<artifactId>microprofile</artifactId>
33-
<version>6.1</version>
33+
<version>7.0</version>
3434
<type>pom</type>
3535
<scope>provided</scope>
3636
</dependency>

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<server description="System Service">
22

33
<featureManager>
4-
<feature>cdi-4.0</feature>
5-
<feature>concurrent-3.0</feature>
6-
<feature>jsonb-3.0</feature>
7-
<feature>mpHealth-4.0</feature>
8-
<feature>mpConfig-3.1</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<platform>microprofile-7.0</platform>
6+
<feature>cdi</feature>
7+
<feature>concurrent</feature>
8+
<feature>jsonb</feature>
9+
<feature>mpHealth</feature>
10+
<feature>mpConfig</feature>
911
<!-- tag::featureMP[] -->
10-
<feature>mpReactiveMessaging-3.0</feature>
12+
<feature>mpReactiveMessaging</feature>
1113
<!-- end::featureMP[] -->
1214
</featureManager>
1315

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

14.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)