From 0cc3d555863f0bbf208af31d12e648dce02cf423 Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Wed, 16 Oct 2024 10:32:28 -0400
Subject: [PATCH 1/4] use versionless feature

---
 finish/pom.xml                            |  2 +-
 finish/src/main/liberty/config/server.xml | 16 +++++++++-------
 start/pom.xml                             |  2 +-
 start/src/main/liberty/config/server.xml  | 16 +++++++++-------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/finish/pom.xml b/finish/pom.xml
index ec3f684..d445325 100644
--- a/finish/pom.xml
+++ b/finish/pom.xml
@@ -128,7 +128,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.10.3</version>
+                <version>3.11.1</version>
                 <configuration>
                   <!-- tag::arquillianProperties[] -->
                   <arquillianProperties>
diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml
index 9ae1b8b..cf8cf6d 100644
--- a/finish/src/main/liberty/config/server.xml
+++ b/finish/src/main/liberty/config/server.xml
@@ -1,18 +1,20 @@
 <server description="new server">
 
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>cdi-4.0</feature>
-        <feature>mpConfig-3.1</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-6.1</platform>
+        <feature>restfulWS</feature>
+        <feature>jsonb</feature>
+        <feature>jsonp</feature>
+        <feature>cdi</feature>
+        <feature>mpConfig</feature>
 
         <!--Enable the following features to run tests with Arquillian managed container-->
         <!-- tag::localConnector[] -->
-        <feature>localConnector-1.0</feature>
+        <feature>localConnector</feature>
         <!-- end::localConnector[] -->
         <!-- tag::Servlet[] -->
-        <feature>servlet-6.0</feature>
+        <feature>servlet</feature>
         <!-- end::Servlet[] -->
         
     </featureManager>
diff --git a/start/pom.xml b/start/pom.xml
index 9745087..777a716 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -128,7 +128,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.10.3</version>
+                <version>3.11.1</version>
                 <configuration>
                   <!-- tag::arquillianProperties[] -->
                   <arquillianProperties>
diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml
index 3fdb9ae..3277892 100644
--- a/start/src/main/liberty/config/server.xml
+++ b/start/src/main/liberty/config/server.xml
@@ -1,18 +1,20 @@
 <server description="new server">
 
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>cdi-4.0</feature>
-        <feature>mpConfig-3.1</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-6.1</platform>
+        <feature>restfulWS</feature>
+        <feature>jsonb</feature>
+        <feature>jsonp</feature>
+        <feature>cdi</feature>
+        <feature>mpConfig</feature>
 
         <!-- Enable the following features to run tests with Arquillian managed container -->
         <!-- tag::localConnector[] -->
-        <feature>localConnector-1.0</feature>
+        <feature>localConnector</feature>
         <!-- end::localConnector[] -->
         <!-- tag::Servlet[] -->
-        <feature>servlet-6.0</feature>
+        <feature>servlet</feature>
         <!-- end::Servlet[] -->
 
     </featureManager>

From 10fc44e6c67f723d904574ae7a196896a733381b Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Wed, 16 Oct 2024 11:08:17 -0400
Subject: [PATCH 2/4] use versionless feature

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

diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml
index cf8cf6d..54e750c 100644
--- a/finish/src/main/liberty/config/server.xml
+++ b/finish/src/main/liberty/config/server.xml
@@ -11,7 +11,7 @@
 
         <!--Enable the following features to run tests with Arquillian managed container-->
         <!-- tag::localConnector[] -->
-        <feature>localConnector</feature>
+        <feature>localConnector-1.0</feature>
         <!-- end::localConnector[] -->
         <!-- tag::Servlet[] -->
         <feature>servlet</feature>
diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml
index 3277892..e37e8cc 100644
--- a/start/src/main/liberty/config/server.xml
+++ b/start/src/main/liberty/config/server.xml
@@ -11,7 +11,7 @@
 
         <!-- Enable the following features to run tests with Arquillian managed container -->
         <!-- tag::localConnector[] -->
-        <feature>localConnector</feature>
+        <feature>localConnector-1.0</feature>
         <!-- end::localConnector[] -->
         <!-- tag::Servlet[] -->
         <feature>servlet</feature>

From 8ad4bafd0ca71887620e6eedd67b04b6003ec40f Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Tue, 12 Nov 2024 11:33:53 -0500
Subject: [PATCH 3/4] use versionless feature

Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com>
---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a1cf083..2d14fe5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,9 +12,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
@@ -44,7 +44,7 @@ jobs:
       run:
         working-directory: finish
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:

From 1395ee28833145c0145dd26dde32be1d3bd893ed Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Tue, 12 Nov 2024 11:48:19 -0500
Subject: [PATCH 4/4] use versionless feature

Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com>
---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2d14fe5..d177d46 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -46,8 +46,9 @@ jobs:
     steps:
     - 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: Run tests