From 959d305e65b1698fa9941283e7a04adb24f6b064 Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Thu, 6 Feb 2025 15:22:51 -0500
Subject: [PATCH] Use versionless features (#200)

* use versionless feature

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

* use versionless feature

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

* Update README.adoc

* 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 +++++----
 README.adoc                               | 6 +++---
 finish/pom.xml                            | 2 +-
 finish/src/main/liberty/config/server.xml | 3 ++-
 start/src/main/liberty/config/server.xml  | 3 ++-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0443999..58190bb 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/README.adoc b/README.adoc
index a28aedf..e35e6ad 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,4 +1,4 @@
-// Copyright (c) 2017, 2024 IBM Corporation and others.
+// Copyright (c) 2017, 2025 IBM Corporation and others.
 // Licensed under Creative Commons Attribution-NoDerivatives
 // 4.0 International (CC BY-ND 4.0)
 //   https://creativecommons.org/licenses/by-nd/4.0/
@@ -63,8 +63,8 @@ If Maven is installed properly, you see information about the Maven installation
 
 [source, role="no_copy"]
 ----
-Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d)
-Maven home: /Applications/Maven/apache-maven-3.8.1
+Apache Maven 3.9.6 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d)
+Maven home: /Applications/Maven/apache-maven-3.9.6
 Java version: 11.0.12, vendor: International Business Machines Corporation, runtime: /Library/Java/JavaVirtualMachines/ibm-semeru-open-11.jdk/Contents/Home
 Default locale: en_US, platform encoding: UTF-8
 OS name: "mac os x", version: "11.6", arch: "x86_64", family: "mac"
diff --git a/finish/pom.xml b/finish/pom.xml
index fb826b0..b9ea31f 100644
--- a/finish/pom.xml
+++ b/finish/pom.xml
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <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 e183533..48c6b0b 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>
 
     <variable name="http.port" defaultValue="9080"/>
diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml
index e183533..48c6b0b 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>
 
     <variable name="http.port" defaultValue="9080"/>