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

---
 finish/inventory/pom.xml                      |  2 +-
 .../src/main/liberty/config/server.xml        | 22 ++++++++++---------
 finish/system/pom.xml                         |  2 +-
 .../system/src/main/liberty/config/server.xml | 18 ++++++++-------
 ibmmq/inventory/pom.xml                       |  2 +-
 .../src/main/liberty/config/server.xml        | 22 ++++++++++---------
 ibmmq/system/pom.xml                          |  2 +-
 .../system/src/main/liberty/config/server.xml | 18 ++++++++-------
 start/inventory/pom.xml                       |  2 +-
 .../src/main/liberty/config/server.xml        | 22 ++++++++++---------
 start/system/pom.xml                          |  2 +-
 .../system/src/main/liberty/config/server.xml | 14 +++++++-----
 12 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml
index 56226e6..bc2a114 100644
--- a/finish/inventory/pom.xml
+++ b/finish/inventory/pom.xml
@@ -76,7 +76,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 unit tests -->
diff --git a/finish/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml
index 571ec1b..7217174 100755
--- a/finish/inventory/src/main/liberty/config/server.xml
+++ b/finish/inventory/src/main/liberty/config/server.xml
@@ -1,22 +1,24 @@
 <server description="Inventory Service">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>cdi-4.0</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>mpHealth-4.0</feature>
-    <feature>mpConfig-3.1</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-6.1</platform>
+    <feature>restfulWS</feature>
+    <feature>cdi</feature>
+    <feature>jsonb</feature>
+    <feature>mpHealth</feature>
+    <feature>mpConfig</feature>
     <!-- tag::messaging[] -->
-    <feature>messaging-3.1</feature>
+    <feature>messaging</feature>
     <!-- end::messaging[] -->
     <!-- tag::messagingServer[] -->
-    <feature>messagingServer-3.0</feature>
+    <feature>messagingServer</feature>
     <!-- end::messagingServer[] -->
     <!-- tag::messagingClient[] -->
-    <feature>messagingClient-3.0</feature>
+    <feature>messagingClient</feature>
     <!-- end::messagingClient[] -->
-    <feature>enterpriseBeansLite-4.0</feature>
-    <feature>mdb-4.0</feature>
+    <feature>enterpriseBeansLite</feature>
+    <feature>mdb</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9081"/>
diff --git a/finish/system/pom.xml b/finish/system/pom.xml
index 8f2dcfb..6da3700 100644
--- a/finish/system/pom.xml
+++ b/finish/system/pom.xml
@@ -77,7 +77,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 unit tests -->
diff --git a/finish/system/src/main/liberty/config/server.xml b/finish/system/src/main/liberty/config/server.xml
index 9db708a..760f56d 100755
--- a/finish/system/src/main/liberty/config/server.xml
+++ b/finish/system/src/main/liberty/config/server.xml
@@ -1,18 +1,20 @@
 <server description="System Service">
 
   <featureManager>
-    <feature>cdi-4.0</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>mpHealth-4.0</feature>
-    <feature>mpConfig-3.1</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-6.1</platform>
+    <feature>cdi</feature>
+    <feature>jsonb</feature>
+    <feature>mpHealth</feature>
+    <feature>mpConfig</feature>
     <!-- tag::messaging[] -->
-    <feature>messaging-3.1</feature>
+    <feature>messaging</feature>
     <!-- end::messaging[] -->
     <!-- tag::messagingClient[] -->
-    <feature>messagingClient-3.0</feature>
+    <feature>messagingClient</feature>
     <!-- end::messagingClient[] -->
-    <feature>enterpriseBeansLite-4.0</feature>
-    <feature>mdb-4.0</feature>
+    <feature>enterpriseBeansLite</feature>
+    <feature>mdb</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9082"/>
diff --git a/ibmmq/inventory/pom.xml b/ibmmq/inventory/pom.xml
index f28f284..7c21eb0 100644
--- a/ibmmq/inventory/pom.xml
+++ b/ibmmq/inventory/pom.xml
@@ -86,7 +86,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 unit tests -->
diff --git a/ibmmq/inventory/src/main/liberty/config/server.xml b/ibmmq/inventory/src/main/liberty/config/server.xml
index 960a842..f13d8fb 100755
--- a/ibmmq/inventory/src/main/liberty/config/server.xml
+++ b/ibmmq/inventory/src/main/liberty/config/server.xml
@@ -1,16 +1,18 @@
 <server description="Inventory Service">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>cdi-4.0</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>mpHealth-4.0</feature>
-    <feature>mpConfig-3.1</feature>
-    <feature>messaging-3.1</feature>
-    <feature>messagingClient-3.0</feature>
-    <feature>messagingServer-3.0</feature>
-    <feature>enterpriseBeansLite-4.0</feature>
-    <feature>mdb-4.0</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-6.1</platform>
+    <feature>restfulWS</feature>
+    <feature>cdi</feature>
+    <feature>jsonb</feature>
+    <feature>mpHealth</feature>
+    <feature>mpConfig</feature>
+    <feature>messaging</feature>
+    <feature>messagingClient</feature>
+    <feature>messagingServer</feature>
+    <feature>enterpriseBeansLite</feature>
+    <feature>mdb</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9081"/>
diff --git a/ibmmq/system/pom.xml b/ibmmq/system/pom.xml
index 67a7e23..a1337ae 100644
--- a/ibmmq/system/pom.xml
+++ b/ibmmq/system/pom.xml
@@ -87,7 +87,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 unit tests -->
diff --git a/ibmmq/system/src/main/liberty/config/server.xml b/ibmmq/system/src/main/liberty/config/server.xml
index 7b81d36..dd5f496 100755
--- a/ibmmq/system/src/main/liberty/config/server.xml
+++ b/ibmmq/system/src/main/liberty/config/server.xml
@@ -1,14 +1,16 @@
 <server description="System Service">
 
   <featureManager>
-    <feature>cdi-4.0</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>mpHealth-4.0</feature>
-    <feature>mpConfig-3.1</feature>
-    <feature>messaging-3.1</feature>
-    <feature>messagingClient-3.0</feature>
-    <feature>enterpriseBeansLite-4.0</feature>
-    <feature>mdb-4.0</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-6.1</platform>
+    <feature>cdi</feature>
+    <feature>jsonb</feature>
+    <feature>mpHealth</feature>
+    <feature>mpConfig</feature>
+    <feature>messaging</feature>
+    <feature>messagingClient</feature>
+    <feature>enterpriseBeansLite</feature>
+    <feature>mdb</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9082"/>
diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml
index 56226e6..bc2a114 100644
--- a/start/inventory/pom.xml
+++ b/start/inventory/pom.xml
@@ -76,7 +76,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 unit tests -->
diff --git a/start/inventory/src/main/liberty/config/server.xml b/start/inventory/src/main/liberty/config/server.xml
index 120bc6e..0d27b78 100755
--- a/start/inventory/src/main/liberty/config/server.xml
+++ b/start/inventory/src/main/liberty/config/server.xml
@@ -1,16 +1,18 @@
 <server description="Inventory Service">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>cdi-4.0</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>mpHealth-4.0</feature>
-    <feature>mpConfig-3.1</feature>
-    <feature>messaging-3.1</feature>
-    <feature>messagingClient-3.0</feature>
-    <feature>messagingServer-3.0</feature>
-    <feature>enterpriseBeansLite-4.0</feature>
-    <feature>mdb-4.0</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-6.1</platform>
+    <feature>restfulWS</feature>
+    <feature>cdi</feature>
+    <feature>jsonb</feature>
+    <feature>mpHealth</feature>
+    <feature>mpConfig</feature>
+    <feature>messaging</feature>
+    <feature>messagingClient</feature>
+    <feature>messagingServer</feature>
+    <feature>enterpriseBeansLite</feature>
+    <feature>mdb</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9081"/>
diff --git a/start/system/pom.xml b/start/system/pom.xml
index 8f2dcfb..6da3700 100644
--- a/start/system/pom.xml
+++ b/start/system/pom.xml
@@ -77,7 +77,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 unit tests -->
diff --git a/start/system/src/main/liberty/config/server.xml b/start/system/src/main/liberty/config/server.xml
index cc9bd14..497f03c 100755
--- a/start/system/src/main/liberty/config/server.xml
+++ b/start/system/src/main/liberty/config/server.xml
@@ -1,12 +1,14 @@
 <server description="System Service">
 
   <featureManager>
-    <feature>cdi-4.0</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>mpHealth-4.0</feature>
-    <feature>mpConfig-3.1</feature>
-    <feature>enterpriseBeansLite-4.0</feature>
-    <feature>mdb-4.0</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-6.1</platform>
+    <feature>cdi</feature>
+    <feature>jsonb</feature>
+    <feature>mpHealth</feature>
+    <feature>mpConfig</feature>
+    <feature>enterpriseBeansLite</feature>
+    <feature>mdb</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9082"/>