Skip to content

Commit 13f0710

Browse files
gkwan-ibmgkwan-ibm
authored
Use versionless features (#280)
* use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> --------- Signed-off-by: Gilbert Kwan <[email protected]>
1 parent a1b9029 commit 13f0710

File tree

17 files changed

+69
-60
lines changed

17 files changed

+69
-60
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
@@ -47,10 +47,11 @@ jobs:
4747
run:
4848
working-directory: finish
4949
steps:
50-
- uses: actions/checkout@v2
50+
- uses: actions/checkout@v4
5151
- name: Set up JDK 11
52-
uses: actions/setup-java@v1
52+
uses: actions/setup-java@v4
5353
with:
54+
distribution: 'semeru'
5455
java-version: 11
5556
- run: unset _JAVA_OPTIONS
5657
- name: Run tests

‎finish/inventory/pom.xml‎

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

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<server description="Sample Liberty server">
22

33
<featureManager>
4-
<feature>restfulWS-3.1</feature>
5-
<feature>jsonb-3.0</feature>
6-
<feature>cdi-4.0</feature>
7-
<feature>mpConfig-3.1</feature>
8-
<feature>jsonp-2.1</feature>
9-
<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>cdi</feature>
9+
<feature>mpConfig</feature>
10+
<feature>jsonp</feature>
11+
<feature>mpHealth</feature>
1012
</featureManager>
1113

1214
<variable name="http.port" defaultValue="9090"/>

‎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
@@ -34,12 +34,12 @@ <h2>Eclipse MicroProfile</h2>
3434
<div id="technologies">
3535
<p>For more information about the features used in the application, see the Open Liberty documentation:</p>
3636
<ul>
37-
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html">MicroProfile 6.1</a></li>
38-
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html">Jakarta RESTful Web Services 3.1</a></li>
39-
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html">Jakarta Contexts and Dependency Injection 4.0</a></li>
40-
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html">MicroProfile Config 3.1</a></li>
41-
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html">Jakarta JSON Processing 2.1</a></li>
42-
<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>
37+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html">MicroProfile</a></li>
38+
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html">Jakarta RESTful Web Services</a></li>
39+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html">Jakarta Contexts and Dependency Injection</a></li>
40+
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html">MicroProfile Config</a></li>
41+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html">Jakarta JSON Processing</a></li>
42+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
4343
</ul>
4444
</div>
4545
</body>

‎finish/system/pom.xml‎

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

‎finish/system/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="Sample Liberty server">
22

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

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

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

14.7 KB
Binary file not shown.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ <h2>Eclipse MicroProfile</h2>
3434
<div id="technologies">
3535
<p>For more information about the features used in the application, see the Open Liberty documentation:</p>
3636
<ul>
37-
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html">MicroProfile 6.1</a></li>
38-
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html">Jakarta RESTful Web Services 3.1</a></li>
39-
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html">Jakarta Contexts and Dependency Injection 4.0</a></li>
40-
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html">MicroProfile Config 3.1</a></li>
41-
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html">Jakarta JSON Processing 2.1</a></li>
42-
<li><a href="https://openliberty.io/docs/ref/feature/#appSecurity-5.0.html">Application Security 5.0</a></li>
43-
<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>
37+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html">MicroProfile</a></li>
38+
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html">Jakarta RESTful Web Services</a></li>
39+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html">Jakarta Contexts and Dependency Injection</a></li>
40+
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html">MicroProfile Config</a></li>
41+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html">Jakarta JSON Processing</a></li>
42+
<li><a href="https://openliberty.io/docs/ref/feature/#appSecurity.html">Application Security</a></li>
43+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
4444
</ul>
4545
</div>
4646
</body>

‎start/inventory/pom.xml‎

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

0 commit comments

Comments
 (0)