diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5535ecf..bdd2c05 100644
--- 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
@@ -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
diff --git a/README.adoc b/README.adoc
index 7378585..d3d0302 100644
--- a/README.adoc
+++ b/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.
diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml
index 076e9fb..6b7d3f3 100644
--- a/finish/inventory/pom.xml
+++ b/finish/inventory/pom.xml
@@ -31,7 +31,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
org.eclipse.microprofile
microprofile
- 6.1
+ 7.0
pom
provided
diff --git a/finish/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml
index 4abf9fe..9e88efe 100644
--- a/finish/inventory/src/main/liberty/config/server.xml
+++ b/finish/inventory/src/main/liberty/config/server.xml
@@ -1,13 +1,15 @@
- cdi-4.0
- jsonb-3.0
- jsonp-2.1
- restfulWS-3.1
- mpConfig-3.1
+ jakartaee-10.0
+ microprofile-7.0
+ cdi
+ jsonb
+ jsonp
+ restfulWS
+ mpConfig
- mpTelemetry-1.1
+ mpTelemetry
diff --git a/finish/inventory/src/main/resources/META-INF/microprofile-config.properties b/finish/inventory/src/main/resources/META-INF/microprofile-config.properties
index 49f515e..f8e03aa 100644
--- a/finish/inventory/src/main/resources/META-INF/microprofile-config.properties
+++ b/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[]
diff --git a/finish/inventory/src/main/webapp/favicon.ico b/finish/inventory/src/main/webapp/favicon.ico
new file mode 100644
index 0000000..c8652f3
Binary files /dev/null and b/finish/inventory/src/main/webapp/favicon.ico differ
diff --git a/finish/inventory/src/main/webapp/index.html b/finish/inventory/src/main/webapp/index.html
index 99e57fe..eee61e3 100644
--- a/finish/inventory/src/main/webapp/index.html
+++ b/finish/inventory/src/main/webapp/index.html
@@ -27,13 +27,13 @@ Eclipse MicroProfile
For more information about the features used in this application, see the Open Liberty documentation:
diff --git a/finish/system/pom.xml b/finish/system/pom.xml
index 0d1ea93..0323572 100644
--- a/finish/system/pom.xml
+++ b/finish/system/pom.xml
@@ -28,7 +28,7 @@
org.eclipse.microprofile
microprofile
- 6.1
+ 7.0
pom
provided
diff --git a/finish/system/src/main/liberty/config/server.xml b/finish/system/src/main/liberty/config/server.xml
index b86266f..1cb2002 100644
--- a/finish/system/src/main/liberty/config/server.xml
+++ b/finish/system/src/main/liberty/config/server.xml
@@ -1,12 +1,16 @@
- cdi-4.0
- jsonb-3.0
- jsonp-2.1
- restfulWS-3.1
+ jakartaee-10.0
+
+ microprofile-7.0
+
+ cdi
+ jsonb
+ jsonp
+ restfulWS
- mpTelemetry-1.1
+ mpTelemetry
diff --git a/finish/system/src/main/resources/META-INF/microprofile-config.properties b/finish/system/src/main/resources/META-INF/microprofile-config.properties
index 89b84d8..cf24a4d 100644
--- a/finish/system/src/main/resources/META-INF/microprofile-config.properties
+++ b/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[]
diff --git a/finish/system/src/main/webapp/favicon.ico b/finish/system/src/main/webapp/favicon.ico
new file mode 100644
index 0000000..c8652f3
Binary files /dev/null and b/finish/system/src/main/webapp/favicon.ico differ
diff --git a/finish/system/src/main/webapp/index.html b/finish/system/src/main/webapp/index.html
index 972478c..60ec3c3 100644
--- a/finish/system/src/main/webapp/index.html
+++ b/finish/system/src/main/webapp/index.html
@@ -27,12 +27,12 @@ Eclipse MicroProfile
For more information about the features used in this application, see the Open Liberty documentation:
diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml
index ea4c008..4018dcc 100644
--- a/start/inventory/pom.xml
+++ b/start/inventory/pom.xml
@@ -31,7 +31,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
org.eclipse.microprofile
microprofile
- 6.1
+ 7.0
pom
provided
diff --git a/start/inventory/src/main/liberty/config/server.xml b/start/inventory/src/main/liberty/config/server.xml
index 63b9751..f24d622 100644
--- a/start/inventory/src/main/liberty/config/server.xml
+++ b/start/inventory/src/main/liberty/config/server.xml
@@ -1,11 +1,13 @@
- cdi-4.0
- jsonb-3.0
- jsonp-2.1
- restfulWS-3.1
- mpConfig-3.1
+ jakartaee-10.0
+ microprofile-7.0
+ cdi
+ jsonb
+ jsonp
+ restfulWS
+ mpConfig
Eclipse MicroProfile
For more information about the features used in this application, see the Open Liberty documentation:
diff --git a/start/system/pom.xml b/start/system/pom.xml
index 7d34cfb..5e0db8b 100644
--- a/start/system/pom.xml
+++ b/start/system/pom.xml
@@ -28,7 +28,7 @@
org.eclipse.microprofile
microprofile
- 6.1
+ 7.0
pom
provided
diff --git a/start/system/src/main/liberty/config/server.xml b/start/system/src/main/liberty/config/server.xml
index 428e7f8..69f3e7e 100644
--- a/start/system/src/main/liberty/config/server.xml
+++ b/start/system/src/main/liberty/config/server.xml
@@ -1,10 +1,11 @@
- cdi-4.0
- jsonb-3.0
- jsonp-2.1
- restfulWS-3.1
+ jakartaee-10.0
+ cdi
+ jsonb
+ jsonp
+ restfulWS
Eclipse MicroProfile
For more information about the features used in this application, see the Open Liberty documentation: