From 75c62720530a132f6ef782309b068718bcb76bca Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Thu, 6 Feb 2025 14:28:37 -0500
Subject: [PATCH] Use versionless features (#154)

* use versionless feature

Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com>

* use versionless feature

Signed-off-by: Gilbert Kwan <gkwan@ca.ibm.com>

---------

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e1f9590..14f8834 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,10 +44,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: Run tests
diff --git a/finish/pom.xml b/finish/pom.xml
index 850304d..db05438 100644
--- a/finish/pom.xml
+++ b/finish/pom.xml
@@ -28,7 +28,7 @@
             <!-- tag::microprofile[] -->
             <artifactId>microprofile</artifactId>
             <!-- end::microprofile[] -->
-            <version>6.1</version>
+            <version>7.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml
index 44473e2..1396274 100644
--- a/finish/src/main/liberty/config/server.xml
+++ b/finish/src/main/liberty/config/server.xml
@@ -1,9 +1,10 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-      <feature>restfulWS-3.1</feature>
-      <feature>jsonb-3.0</feature>
-      <feature>jsonp-2.1</feature>
+      <platform>jakartaee-10.0</platform>
+      <feature>restfulWS</feature>
+      <feature>jsonb</feature>
+      <feature>jsonp</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9080"/>
diff --git a/start/pom.xml b/start/pom.xml
index 850304d..db05438 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -28,7 +28,7 @@
             <!-- tag::microprofile[] -->
             <artifactId>microprofile</artifactId>
             <!-- end::microprofile[] -->
-            <version>6.1</version>
+            <version>7.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml
index 44473e2..1396274 100644
--- a/start/src/main/liberty/config/server.xml
+++ b/start/src/main/liberty/config/server.xml
@@ -1,9 +1,10 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-      <feature>restfulWS-3.1</feature>
-      <feature>jsonb-3.0</feature>
-      <feature>jsonp-2.1</feature>
+      <platform>jakartaee-10.0</platform>
+      <feature>restfulWS</feature>
+      <feature>jsonb</feature>
+      <feature>jsonp</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9080"/>