From 411baace675721d6688a4b3d1f10df3b42880152 Mon Sep 17 00:00:00 2001
From: John Alcorn <john.alcorn@kyndryl.com>
Date: Mon, 13 May 2024 17:25:05 -0400
Subject: [PATCH] Upgrade to Jakarta 10 and MicroProfile 6.1

---
 src/main/liberty/config/server.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/liberty/config/server.xml b/src/main/liberty/config/server.xml
index 8dbd73e..8e0bacb 100644
--- a/src/main/liberty/config/server.xml
+++ b/src/main/liberty/config/server.xml
@@ -17,15 +17,14 @@
 
 <server description="Portfolio server">
     <featureManager>
-        <!-- If adopting MicroProfile Reactive Messaging 1.0 (mpReactiveMessaging-1.0), need to downgrade to microProfile-3.3.
-             See https://github.com/OpenLiberty/open-liberty/issues/15440 for details. -->
-        <feature>microProfile-4.1</feature>
-        <feature>jdbc-4.2</feature>
+        <feature>restfulWS-3.1</feature>
+        <feature>microProfile-6.1</feature>
+        <feature>jdbc-4.3</feature>
+        <feature>jpa-3.1</feature>
         <feature>jndi-1.0</feature>
-        <feature>appSecurity-2.0</feature>
-        <feature>restConnector-2.0</feature>
-        <feature>jpa-2.2</feature>
-<!--    <feature>logstashCollector-1.0</feature> -->
+        <feature>appSecurity-3.0</feature>
+<!--    <feature>restConnector-2.0</feature>
+        <feature>logstashCollector-1.0</feature> -->
     </featureManager>
 
     <variable name="AUTH_TYPE"    defaultValue="basic"/>