Merge pull request #208 from OpenLiberty/staging

Merge staging to prod - Use versionless feature and MP7

Author: gkwan-ibm

.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

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"

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>

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

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