Use versionless features

.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 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'semeru'
           java-version: 17
       - run: unset _JAVA_OPTIONS
       - name: Run tests
@@ -61,6 +62,8 @@ jobs:
           sudo cat "$logsPath" | sudo grep Launching
           logsPath=$(sudo find . -name "console.log" | grep system);
           sudo cat "$logsPath" | sudo grep Launching
+          sudo chmod -R a+xr system/target
+          sudo chmod -R a+xr inventory/target
       - name: Archive finish inventory logs if failed
         if: failure()
         uses: actions/upload-artifact@v4

README.adoc

@@ -1,4 +1,4 @@
-// Copyright (c) 2024 IBM Corporation and others.
+// Copyright (c) 2024, 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/
@@ -193,7 +193,7 @@ include::finish/inventory/src/main/java/io/openliberty/guides/inventory/Inventor
 
 The `inventory` microservice receives the messages from the `system` microservice. Implement the [hotspot=InventoryQueueListener file=0]`InventoryQueueListener` class with the `MessageListener` interface and annotate with [hotspot=messageDriven file=0]`@MessageDriven` to monitor the `jms/InventoryQueue` message queue. Implement the [hotspot=onMessage file=0]`onMessage()` method that processes the incoming messages, updates the inventory by using the [hotspot=InventoryManager hotspot=InventoryManagerUpdate file=0]`InventoryManager` bean, and logs the action. Use the [hotspot=systemLoad file=0]`SystemLoad.fromJson()` method to convert the JSON message string to the `SystemLoad` object.
 
-Next, configure the `inventory` microservice with an embedded messaging server and the https://openliberty.io/docs/latest/reference/feature/messagingClient-3.0.html[Messaging Server Client^] feature.
+Next, configure the `inventory` microservice with an embedded messaging server and the https://openliberty.io/docs/latest/reference/feature/messagingClient.html[Messaging Server Client^] feature.
 
 [role='code_command hotspot file=1', subs="quotes"]
 ----
@@ -299,8 +299,6 @@ endif::[]
 
 == Testing the inventory application
 
-//similar to https://openliberty.io/guides/cdi-intro.html#testing-the-inventory-application
-//explain the test
 While you can test your application manually, you should rely on automated tests because they trigger a failure whenever a code change introduces a defect. Because the application is a RESTful web service application, you can use JUnit and the RESTful web service Client API to write tests. In testing the functionality of the application, the scopes and dependencies are being tested.
 
 [role='code_command hotspot file=0', subs='quotes']

finish/inventory/pom.xml

@@ -28,7 +28,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>

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-7.0</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"/>

finish/models/pom.xml

@@ -17,7 +17,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>

finish/system/pom.xml

@@ -32,7 +32,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>

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-7.0</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"/>

ibmmq/inventory/pom.xml

@@ -38,7 +38,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>

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-7.0</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"/>

ibmmq/system/pom.xml

@@ -42,7 +42,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>

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-7.0</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"/>

start/inventory/pom.xml

@@ -28,7 +28,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>

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-7.0</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"/>

start/models/pom.xml

@@ -17,7 +17,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>

start/system/pom.xml

@@ -32,7 +32,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>

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-7.0</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"/>