Skip to content

Commit 34b8d41

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #283 from OpenLiberty/staging
Merge staging to prod - Use versionless feature and MP7
2 parents 20e56eb + 0b379a1 commit 34b8d41

File tree

9 files changed

+41
-36
lines changed

9 files changed

+41
-36
lines changed

‎.github/workflows/test.yml

+5-4
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
@@ -45,10 +45,11 @@ jobs:
4545
working-directory: finish
4646

4747
steps:
48-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v4
4949
- name: Set up JDK 11
50-
uses: actions/setup-java@v1
50+
uses: actions/setup-java@v4
5151
with:
52+
distribution: 'semeru'
5253
java-version: 11
5354
- run: unset _JAVA_OPTIONS
5455

‎finish/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<!-- tag::microprofile[] -->
3232
<artifactId>microprofile</artifactId>
3333
<!-- end::microprofile[] -->
34-
<version>6.1</version>
34+
<version>7.0</version>
3535
<type>pom</type>
3636
<scope>provided</scope>
3737
</dependency>

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

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
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>
9-
<feature>mpRestClient-3.0</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>
11+
<feature>mpRestClient</feature>
1012
<!-- tag::mpHealth[] -->
11-
<feature>mpHealth-4.0</feature>
13+
<feature>mpHealth</feature>
1214
<!-- end::mpHealth[] -->
1315
</featureManager>
1416

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

14.7 KB
Binary file not shown.

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

+8-8
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/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
35-
<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>
36-
<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>
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/#mpRestClient-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 3.0</a></li>
39-
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Health 4.0</a></li>
40-
<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>
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/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
35+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
36+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</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/#mpRestClient.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client</a></li>
39+
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth.html" target="_blank" rel="noopener noreferrer"> MicroProfile Health</a></li>
40+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
4141
</ul>
4242
</p>
4343
</div>

‎start/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>org.eclipse.microprofile</groupId>
3131
<artifactId>microprofile</artifactId>
32-
<version>6.1</version>
32+
<version>7.0</version>
3333
<type>pom</type>
3434
<scope>provided</scope>
3535
</dependency>

‎start/src/main/liberty/config/server.xml

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
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>
9-
<feature>mpRestClient-3.0</feature>
10-
<feature>mpHealth-4.0</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>
11+
<feature>mpRestClient</feature>
12+
<feature>mpHealth</feature>
1113
</featureManager>
1214

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

‎start/src/main/webapp/favicon.ico

14.7 KB
Binary file not shown.

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

+8-8
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/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
35-
<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>
36-
<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>
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/#mpRestClient-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 3.0</a></li>
39-
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth-4.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Health 4.0</a></li>
40-
<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>
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/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
35+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
36+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</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/#mpRestClient.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client</a></li>
39+
<li><a href="https://openliberty.io/docs/ref/feature/#mpHealth.html" target="_blank" rel="noopener noreferrer"> MicroProfile Health</a></li>
40+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
4141
</ul>
4242
</p>
4343
</div>

0 commit comments

Comments
 (0)