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
@@ -45,10 +45,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) 2023, 2024 IBM Corporation and others.
+// Copyright (c) 2023, 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/
@@ -279,7 +279,7 @@ system/server.xml
 include::finish/system/src/main/liberty/config/server.xml[]
 ----
 
-The [hotspot=mpTelemetry file=0]`mpTelemetry` feature is now enabled in the `server.xml` of the `system` service.
+The [hotspot=microprofile hotspot=mpTelemetry file=0]`mpTelemetry` feature is now enabled in the `server.xml` of the `system` service.
 
 [role="code_command hotspot file=1", subs="quotes"]
 ----
@@ -310,7 +310,7 @@ system/microprofile-config.properties
 include::finish/system/src/main/resources/META-INF/microprofile-config.properties[]
 ----
 
-The MicroProfile properties file sets the [hotspot=service file=2]`otel.service.name` property with the `system` service name and sets the [hotspot=disabled file=2]`otel.sdk.disabled` property to `false` to enable tracing.
+The MicroProfile properties file sets the [hotspot=service file=2]`otel.service.name` property with the `system` service name, sets the [hotspot=disabled file=2]`otel.sdk.disabled` property to `false` to enable tracing, sets the [hotspot=metrics file=2]`otel.metrics.exporter` property to `none` to disable metrics, and sets the [hotspot=logs file=2]`otel.logs.exporter` property to `none` to disable exporting logs.
 
 
 [role="code_command hotspot file=3", subs="quotes"]
@@ -327,7 +327,7 @@ include::finish/inventory/src/main/resources/META-INF/microprofile-config.proper
 
 Similarly, specify the [hotspot=otel file=3]`otel` properties for the `inventory` service.
 
-For more information about these and other Telemetry properties, see the https://openliberty.io/docs/latest/microprofile-config-properties.html#telemetry[MicroProfile Config properties for MicroProfile Telemetry^] documentation.
+For more information about these and other Telemetry properties, see the https://openliberty.io/docs/latest/reference/microprofile-config-properties.html#telemetry[MicroProfile Config properties for MicroProfile Telemetry^] documentation.
 
 ifndef::cloud-hosted[]
 To run the `system` and `inventory` services, simply navigate your browser to the http://localhost:9081/inventory/systems/localhost URL. To view the traces, go to the http://localhost:16686 URL.

finish/inventory/pom.xml

@@ -31,7 +31,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
         <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,13 +1,15 @@
 <server description="inventory service">
 
     <featureManager>
-        <feature>cdi-4.0</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>restfulWS-3.1</feature>
-        <feature>mpConfig-3.1</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-7.0</platform>
+        <feature>cdi</feature>
+        <feature>jsonb</feature>
+        <feature>jsonp</feature>
+        <feature>restfulWS</feature>
+        <feature>mpConfig</feature>
         <!-- tag::mpTelemetry[] -->
-        <feature>mpTelemetry-1.1</feature>
+        <feature>mpTelemetry</feature>
         <!-- end::mpTelemetry[] -->
     </featureManager>
 

finish/inventory/src/main/resources/META-INF/microprofile-config.properties

@@ -2,4 +2,6 @@ io.openliberty.guides.inventory.client.SystemClient/mp-rest/url=http://localhost
 # tag::otel[]
 otel.service.name=inventory
 otel.sdk.disabled=false
+otel.metrics.exporter=none
+otel.logs.exporter=none
 # end::otel[]

finish/inventory/src/main/webapp/index.html

@@ -27,13 +27,13 @@ <h2>Eclipse MicroProfile</h2>
         <p>
             For more information about the features used in this application, see the Open Liberty documentation:
             <ul>
-                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#mpTelemetry-1.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Telemetry 1.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#mpTelemetry.html" target="_blank" rel="noopener noreferrer">MicroProfile Telemetry</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
              </ul>
         </p>
     </div>

finish/system/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/system/src/main/liberty/config/server.xml

@@ -1,12 +1,16 @@
 <server description="system service">
 
     <featureManager>
-        <feature>cdi-4.0</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>restfulWS-3.1</feature>
+        <platform>jakartaee-10.0</platform>
+        <!-- tag::microprofile[] -->
+        <platform>microprofile-7.0</platform>
+        <!-- end::microprofile[] -->
+        <feature>cdi</feature>
+        <feature>jsonb</feature>
+        <feature>jsonp</feature>
+        <feature>restfulWS</feature>
         <!-- tag::mpTelemetry[] -->
-        <feature>mpTelemetry-1.1</feature>
+        <feature>mpTelemetry</feature>
         <!-- end::mpTelemetry[] -->
     </featureManager>
 

finish/system/src/main/resources/META-INF/microprofile-config.properties

@@ -4,3 +4,9 @@ otel.service.name=system
 # tag::disabled[]
 otel.sdk.disabled=false
 # end::disabled[]
+# tag::metrics[]
+otel.metrics.exporter=none
+# end::metrics[]
+# tag::logs[]
+otel.logs.exporter=none
+# end::logs[]

finish/system/src/main/webapp/index.html

@@ -27,12 +27,12 @@ <h2>Eclipse MicroProfile</h2>
         <p>
             For more information about the features used in this application, see the Open Liberty documentation:
             <ul>
-                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#mpTelemetry-1.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Telemetry 1.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#mpTelemetry.html" target="_blank" rel="noopener noreferrer">MicroProfile Telemetry</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
             </ul>
         </p>
     </div>

start/inventory/pom.xml

@@ -31,7 +31,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
         <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,11 +1,13 @@
 <server description="inventory service">
 
     <featureManager>
-        <feature>cdi-4.0</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>restfulWS-3.1</feature>
-        <feature>mpConfig-3.1</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-7.0</platform>
+        <feature>cdi</feature>
+        <feature>jsonb</feature>
+        <feature>jsonp</feature>
+        <feature>restfulWS</feature>
+        <feature>mpConfig</feature>
     </featureManager>
 
     <httpEndpoint httpPort="${http.port}"

start/inventory/src/main/webapp/index.html

@@ -27,13 +27,13 @@ <h2>Eclipse MicroProfile</h2>
         <p>
             For more information about the features used in this application, see the Open Liberty documentation:
             <ul>
-                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#mpTelemetry-1.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Telemetry 1.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#mpTelemetry.html" target="_blank" rel="noopener noreferrer">MicroProfile Telemetry</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
              </ul>
         </p>
     </div>

start/system/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/system/src/main/liberty/config/server.xml

@@ -1,10 +1,11 @@
 <server description="system service">
 
     <featureManager>
-        <feature>cdi-4.0</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>restfulWS-3.1</feature>
+        <platform>jakartaee-10.0</platform>
+        <feature>cdi</feature>
+        <feature>jsonb</feature>
+        <feature>jsonp</feature>
+        <feature>restfulWS</feature>
     </featureManager>
 
     <httpEndpoint httpPort="${http.port}"

start/system/src/main/webapp/index.html

@@ -27,12 +27,12 @@ <h2>Eclipse MicroProfile</h2>
         <p>
             For more information about the features used in this application, see the Open Liberty documentation:
             <ul>
-                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#mpTelemetry-1.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Telemetry 1.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#mpTelemetry.html" target="_blank" rel="noopener noreferrer">MicroProfile Telemetry</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
              </ul>
         </p>
     </div>