From 42a2b4c1acf9fbdea96c8639c35eebd342c6d105 Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Wed, 16 Oct 2024 15:04:11 -0400
Subject: [PATCH 1/3] use versionless feature

---
 finish/pom.xml                            |  2 +-
 finish/src/main/liberty/config/server.xml | 12 +++++++-----
 start/pom.xml                             |  2 +-
 start/src/main/liberty/config/server.xml  | 10 ++++++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/finish/pom.xml b/finish/pom.xml
index 26a98cc..4c9c8f5 100644
--- a/finish/pom.xml
+++ b/finish/pom.xml
@@ -78,7 +78,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.10.3</version>
+                <version>3.11.1</version>
             </plugin>
             <!-- Plugin to run functional tests -->
             <plugin>
diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml
index e01752b..ac21700 100644
--- a/finish/src/main/liberty/config/server.xml
+++ b/finish/src/main/liberty/config/server.xml
@@ -1,13 +1,15 @@
 <server description="Liberty Server for Bean Validation Guide">
 
     <featureManager>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-6.1</platform>
         <!-- tag::beanValidation[] -->
-        <feature>beanValidation-3.0</feature>
+        <feature>beanValidation</feature>
         <!-- end::beanValidation[] -->
-        <feature>cdi-4.0</feature>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>mpOpenAPI-3.1</feature>
+        <feature>cdi</feature>
+        <feature>restfulWS</feature>
+        <feature>jsonb</feature>
+        <feature>mpOpenAPI</feature>
     </featureManager>
 
     <variable name="http.port" defaultValue="9080"/>
diff --git a/start/pom.xml b/start/pom.xml
index 26a98cc..4c9c8f5 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -78,7 +78,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.10.3</version>
+                <version>3.11.1</version>
             </plugin>
             <!-- Plugin to run functional tests -->
             <plugin>
diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml
index 120d1a6..b7b41db 100644
--- a/start/src/main/liberty/config/server.xml
+++ b/start/src/main/liberty/config/server.xml
@@ -1,10 +1,12 @@
 <server description="Liberty Server for Bean Validation Guide">
 
     <featureManager>
-        <feature>cdi-4.0</feature>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>mpOpenAPI-3.1</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-6.1</platform>
+        <feature>cdi</feature>
+        <feature>restfulWS</feature>
+        <feature>jsonb</feature>
+        <feature>mpOpenAPI</feature>
     </featureManager>
 
     <variable name="http.port" defaultValue="9080"/>

From 7284c199977382cf29f90d911a78f9fbfe325519 Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Tue, 12 Nov 2024 12:06:16 -0500
Subject: [PATCH 2/3] use versionless feature

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d780a3b..8d731a3 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
@@ -45,10 +45,11 @@ jobs:
         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
 

From 6eea9cbd43ca75a5595f420164b21b50830657b5 Mon Sep 17 00:00:00 2001
From: Gilbert Kwan <gkwan@ca.ibm.com>
Date: Wed, 22 Jan 2025 11:58:43 -0500
Subject: [PATCH 3/3] use versionless feature

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

diff --git a/finish/pom.xml b/finish/pom.xml
index 514e318..8318af7 100644
--- a/finish/pom.xml
+++ b/finish/pom.xml
@@ -29,7 +29,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 ac21700..7120f1c 100644
--- a/finish/src/main/liberty/config/server.xml
+++ b/finish/src/main/liberty/config/server.xml
@@ -2,7 +2,7 @@
 
     <featureManager>
         <platform>jakartaee-10.0</platform>
-        <platform>microprofile-6.1</platform>
+        <platform>microprofile-7.0</platform>
         <!-- tag::beanValidation[] -->
         <feature>beanValidation</feature>
         <!-- end::beanValidation[] -->
diff --git a/start/pom.xml b/start/pom.xml
index 514e318..8318af7 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -29,7 +29,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/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml
index b7b41db..b1d99dc 100644
--- a/start/src/main/liberty/config/server.xml
+++ b/start/src/main/liberty/config/server.xml
@@ -2,7 +2,7 @@
 
     <featureManager>
         <platform>jakartaee-10.0</platform>
-        <platform>microprofile-6.1</platform>
+        <platform>microprofile-7.0</platform>
         <feature>cdi</feature>
         <feature>restfulWS</feature>
         <feature>jsonb</feature>