Merge pull request #251 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
@@ -48,10 +48,11 @@ jobs:
         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
 

README.adoc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019, 2023 IBM Corporation and others.
+// Copyright (c) 2019, 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/
@@ -333,7 +333,7 @@ endif::[]
 
 When you are done checking the application root, exit dev mode by pressing `CTRL+C` in the command-line session where you ran the Liberty.
 
-Although the Angular application that this guide shows you how to build is simple, when you build more complex Angular applications, testing becomes a crucial part of your development lifecycle. If you need to write test cases, follow the official unit testing and end-to-end testing documentation on the https://angular.io/guide/testing[official Angular page^].
+Although the Angular application that this guide shows you how to build is simple, when you build more complex Angular applications, testing becomes a crucial part of your development lifecycle. If you need to write test cases, follow the official unit testing and end-to-end testing documentation on the https://angular.dev/guide/testing[official Angular page^].
 
 == Great work! You're done!
 

finish/pom.xml

@@ -28,7 +28,7 @@
             <!-- tag::microprofile[] -->
             <artifactId>microprofile</artifactId>
             <!-- end::microprofile[] -->
-            <version>6.1</version>
+            <version>7.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>

finish/src/main/liberty/config/server.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>
+      <platform>jakartaee-10.0</platform>
+      <feature>restfulWS</feature>
+      <feature>jsonb</feature>
+      <feature>jsonp</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9080"/>

start/pom.xml

@@ -28,7 +28,7 @@
             <!-- tag::microprofile[] -->
             <artifactId>microprofile</artifactId>
             <!-- end::microprofile[] -->
-            <version>6.1</version>
+            <version>7.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>

start/src/main/liberty/config/server.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>
+      <platform>jakartaee-10.0</platform>
+      <feature>restfulWS</feature>
+      <feature>jsonb</feature>
+      <feature>jsonp</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9080"/>