From 03e9f379d53bedad504ad9fb44b126f8bf4fd1b5 Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Wed, 13 Nov 2024 13:59:23 -0500
Subject: [PATCH] use versionless feature

Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com>
---
 .github/workflows/test.yml                | 9 +++++----
 finish/src/main/liberty/config/server.xml | 3 ++-
 start/src/main/liberty/config/server.xml  | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5cb99c5..5ef2643 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,9 +13,9 @@ jobs:
       canSkip: ${{ steps.Checker.outputs.canSkip }}
     steps:
       - name: Get files
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Get tools
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: tools/
           repository: openliberty/guides-common
@@ -46,10 +46,11 @@ jobs:
       run:
         working-directory: finish
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
+        distribution: 'semeru'
         java-version: 11
     - run: unset _JAVA_OPTIONS
     - name: Grant execute permission for gradlew
diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml
index bebf8c0..1a94fe1 100644
--- a/finish/src/main/liberty/config/server.xml
+++ b/finish/src/main/liberty/config/server.xml
@@ -1,6 +1,7 @@
 <server description="Sample Servlet server">
     <featureManager>
-        <feature>servlet-6.0</feature>
+        <platform>jakartaee-10.0</platform>
+        <feature>servlet</feature>
     </featureManager>
 
     <httpEndpoint httpPort="${http.port}" httpsPort="${https.port}" id="defaultHttpEndpoint"  host="*" />
diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml
index bebf8c0..1a94fe1 100644
--- a/start/src/main/liberty/config/server.xml
+++ b/start/src/main/liberty/config/server.xml
@@ -1,6 +1,7 @@
 <server description="Sample Servlet server">
     <featureManager>
-        <feature>servlet-6.0</feature>
+        <platform>jakartaee-10.0</platform>
+        <feature>servlet</feature>
     </featureManager>
 
     <httpEndpoint httpPort="${http.port}" httpsPort="${https.port}" id="defaultHttpEndpoint"  host="*" />