Merge pull request #247 from OpenLiberty/staging

Merge staging to prod - Use versionless feature and MP7

Author: gkwan-ibm

Diff for: .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
@@ -48,10 +48,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

Diff for: README.adoc

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2024 IBM Corporation and others.
+// Copyright (c) 2020, 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/
@@ -177,8 +177,8 @@ include::finish/pom.xml[]
 
 == Creating the default page
 
-Create the entry point of your React application. The latest version of `Next.js` recommends you use the https://nextjs.org/docs/app/building-your-application/routing/defining-routes[App Router^], which centralizes routing logic under the `app` directory. 
- 
+Create the entry point of your React application. The latest version of `Next.js` recommends you use the https://nextjs.org/docs/app[App Router^], which centralizes routing logic under the `app` directory.
+
 To construct the home page of the web application, create a [hotspot file=0]`page.jsx` file.
 
 [role="code_command hotspot file=0", subs="quotes"]
@@ -209,7 +209,7 @@ layout.jsx
 include::finish/src/main/frontend/src/app/layout.jsx[]
 ----
 
-For more detailed information, see the `Next.js` documentation on https://nextjs.org/docs/app/building-your-application/routing/pages[Pages^] and https://nextjs.org/docs/app/building-your-application/routing/layouts-and-templates[Layouts^].
+For more detailed information, see the `Next.js` documentation on the https://nextjs.org/docs/app/getting-started/layouts-and-pages[Layouts and Pages^].
 
 // =================================================================================================
 // Creating the React component

Diff for: 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 for: finish/src/main/frontend/package-lock.json

@@ -1,9 +1,10 @@
 <server description="Sample Liberty server">
 
-  <featureManager>
-      <feature>restfulWS-3.1</feature>
-      <feature>jsonb-3.0</feature>
-      <feature>jsonp-2.1</feature>
+  <featureManager>
+      <platform>jakartaee-10.0</platform>
+      <feature>restfulWS</feature>
+      <feature>jsonb</feature>
+      <feature>jsonp</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9080"/>

Diff for: finish/src/main/liberty/config/server.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 for: start/pom.xml

@@ -1,9 +1,10 @@
 <server description="Sample Liberty server">
 
-  <featureManager>
-      <feature>restfulWS-3.1</feature>
-      <feature>jsonb-3.0</feature>
-      <feature>jsonp-2.1</feature>
+  <featureManager>
+      <platform>jakartaee-10.0</platform>
+      <feature>restfulWS</feature>
+      <feature>jsonb</feature>
+      <feature>jsonp</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9080"/>