Skip to content

Commit 9d628e0

Browse files
authored
Use versionless features (#271)
* use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * Update server.xml * use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * reorder the features Signed-off-by: Gilbert Kwan <[email protected]> --------- Signed-off-by: Gilbert Kwan <[email protected]>
1 parent 568d3de commit 9d628e0

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
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
@@ -46,10 +46,11 @@ jobs:
4646
run:
4747
working-directory: finish
4848
steps:
49-
- uses: actions/checkout@v2
49+
- uses: actions/checkout@v4
5050
- name: Set up JDK 11
51-
uses: actions/setup-java@v1
51+
uses: actions/setup-java@v4
5252
with:
53+
distribution: 'semeru'
5354
java-version: 11
5455
- run: unset _JAVA_OPTIONS
5556
- name: Run tests

finish/pom.xml

Lines changed: 1 addition & 1 deletion
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>

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@
1212
<server description="Liberty Server for Sessions Management">
1313

1414
<featureManager>
15-
<feature>servlet-6.0</feature>
15+
<platform>jakartaee-10.0</platform>
16+
<platform>microprofile-7.0</platform>
17+
<feature>servlet</feature>
18+
<feature>restfulWS</feature>
19+
<feature>jsonb</feature>
20+
<feature>jsonp</feature>
21+
<feature>mpOpenAPI</feature>
1622
<!-- tag::sessionCache[] -->
1723
<feature>sessionCache-1.0</feature>
1824
<!-- end::sessionCache[] -->
19-
<feature>restfulWS-3.1</feature>
20-
<feature>jsonb-3.0</feature>
21-
<feature>jsonp-2.1</feature>
22-
<feature>mpOpenAPI-3.1</feature>
2325
</featureManager>
2426

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

start/pom.xml

Lines changed: 1 addition & 1 deletion
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>

0 commit comments

Comments
 (0)