Merge pull request #439 from OpenLiberty/staging

gkwan-ibm · web-flow · commit fff2299db012 · 2025-02-13T14:41:55.000-05:00
Merge staging to prod - Use versionless feature and MP7
diff --git a/.github/workflows/test.yml b/.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
@@ -46,10 +46,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 --git a/README.adoc b/README.adoc
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2024 IBM Corporation and others.
+// Copyright (c) 2018, 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/
@@ -323,6 +323,12 @@ After you change the file, Open Liberty automatically reloads its configuration.
 
 Now, when you visit the `/health` endpoint, additional traces are logged in the `trace.log` file.
 
+ifdef::cloud-hosted[]
+```bash
+ls /home/project/guide-getting-started/start/target/liberty/wlp/usr/servers/defaultServer/logs
+```
+endif::[]
+
 [role='command']
 include::{common-includes}/devmode-quit-ctrlc.adoc[]
 
diff --git a/finish/pom.xml b/finish/pom.xml
@@ -30,7 +30,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 --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml
@@ -1,15 +1,17 @@
 <server description="Sample Liberty server">
     <!-- tag::features[] -->
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>cdi-4.0</feature>
-        <feature>mpMetrics-5.1</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-7.0</platform>
+        <feature>restfulWS</feature>
+        <feature>jsonp</feature>
+        <feature>jsonb</feature>
+        <feature>cdi</feature>
         <!-- tag::mpHealth[] -->
-        <feature>mpHealth-4.0</feature>
+        <feature>mpHealth</feature>
         <!-- end::mpHealth[] -->
-        <feature>mpConfig-3.1</feature>
+        <feature>mpConfig</feature>
+        <feature>mpMetrics</feature>
     </featureManager>
     <!-- end::features[] -->
 
@@ -25,7 +27,7 @@
     <logging traceSpecification="com.ibm.ws.microprofile.health.*=all" />
     <!-- end::logging[] -->
 
-    <httpEndpoint host="*" httpPort="${http.port}" 
+    <httpEndpoint host="*" httpPort="${http.port}"
         httpsPort="${https.port}" id="defaultHttpEndpoint"/>
 
     <variable name="io_openliberty_guides_system_inMaintenance" value="false"/>
diff --git a/finish/src/main/webapp/fonts/BunueloCleanPro-Light.otf b/finish/src/main/webapp/fonts/BunueloCleanPro-Light.otf
diff --git a/finish/src/main/webapp/fonts/BunueloCleanPro-Light.woff b/finish/src/main/webapp/fonts/BunueloCleanPro-Light.woff
diff --git a/finish/src/main/webapp/fonts/BunueloCleanPro-SemiBold.otf b/finish/src/main/webapp/fonts/BunueloCleanPro-SemiBold.otf
diff --git a/finish/src/main/webapp/fonts/BunueloCleanPro-SemiBold.woff b/finish/src/main/webapp/fonts/BunueloCleanPro-SemiBold.woff
diff --git a/staging/server.xml b/staging/server.xml
@@ -1,15 +1,17 @@
 <server description="Sample Liberty server">
     <!-- tag::features[] -->
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>cdi-4.0</feature>
-        <feature>mpMetrics-5.1</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-7.0</platform>
+        <feature>restfulWS</feature>
+        <feature>jsonp</feature>
+        <feature>jsonb</feature>
+        <feature>cdi</feature>
         <!-- tag::mpHealth[] -->
-        <feature>mpHealth-4.0</feature>
+        <feature>mpHealth</feature>
         <!-- end::mpHealth[] -->
-        <feature>mpConfig-3.1</feature>
+        <feature>mpConfig</feature>
+        <feature>mpMetrics</feature>
     </featureManager>
     <!-- end::features[] -->
 
@@ -24,7 +26,7 @@
     <logging traceSpecification="com.ibm.ws.microprofile.health.*=all" />
     <!-- end::logging[] -->
 
-    <httpEndpoint host="*" httpPort="${http.port}" 
+    <httpEndpoint host="*" httpPort="${http.port}"
         httpsPort="${https.port}" id="defaultHttpEndpoint"/>
 
     <variable name="io_openliberty_guides_system_inMaintenance" value="false"/>
diff --git a/start/pom.xml b/start/pom.xml
@@ -30,7 +30,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 --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml
@@ -1,11 +1,13 @@
 <server description="Sample Liberty server">
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>cdi-4.0</feature>
-        <feature>mpMetrics-5.1</feature>
-        <feature>mpConfig-3.1</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-7.0</platform>
+        <feature>restfulWS</feature>
+        <feature>jsonp</feature>
+        <feature>jsonb</feature>
+        <feature>cdi</feature>
+        <feature>mpConfig</feature>
+        <feature>mpMetrics</feature>
     </featureManager>
 
     <variable name="http.port" defaultValue="9080"/>
diff --git a/start/src/main/webapp/js/mpData.js b/start/src/main/webapp/js/mpData.js
@@ -1,11 +1,10 @@
 /*******************************************************************************
-* Copyright (c) 2018, 2019 IBM Corporation and others.
+* Copyright (c) 2018, 2025 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License 2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* http://www.eclipse.org/legal/epl-2.0/
 *
-* Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
 function displayMetrics() {
@@ -85,7 +84,8 @@ function displaySystemProperties() {
 }
 
 function getSystemPropertiesRequest() {
-    var propToDisplay = ["java.vendor", "java.version", "user.name", "os.name", "wlp.install.dir", "wlp.server.name" ];
+    var propToDisplay = ["java.vendor", "java.version", "user.name",
+                         "os.name", "wlp.install.dir", "wlp.server.name" ];
     var url = "http://localhost:9080/system/properties";
     var req = new XMLHttpRequest();
     var table = document.getElementById("systemPropertiesTable");
@@ -240,4 +240,4 @@ function addSourceRow(table, url) {
     sourceText.innerHTML = "API Source\: <a href='"+url+"'>"+url+"</a>";
     sourceRow.appendChild(sourceText);
     table.appendChild(sourceRow);
-}
+}
