From cf852412960360383791f4c414d413f7910127fd Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 16 Oct 2024 11:44:11 -0400 Subject: [PATCH 1/6] use versionless feature --- finish/inventory/pom.xml | 2 +- .../src/main/liberty/config/server.xml | 22 ++++++++++--------- finish/system/pom.xml | 2 +- .../system/src/main/liberty/config/server.xml | 18 ++++++++------- ibmmq/inventory/pom.xml | 2 +- .../src/main/liberty/config/server.xml | 22 ++++++++++--------- ibmmq/system/pom.xml | 2 +- .../system/src/main/liberty/config/server.xml | 18 ++++++++------- start/inventory/pom.xml | 2 +- .../src/main/liberty/config/server.xml | 22 ++++++++++--------- start/system/pom.xml | 2 +- .../system/src/main/liberty/config/server.xml | 14 +++++++----- 12 files changed, 70 insertions(+), 58 deletions(-) diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml index 56226e6..bc2a114 100644 --- a/finish/inventory/pom.xml +++ b/finish/inventory/pom.xml @@ -76,7 +76,7 @@ io.openliberty.tools liberty-maven-plugin - 3.10.3 + 3.11.1 diff --git a/finish/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml index 571ec1b..7217174 100755 --- a/finish/inventory/src/main/liberty/config/server.xml +++ b/finish/inventory/src/main/liberty/config/server.xml @@ -1,22 +1,24 @@ - restfulWS-3.1 - cdi-4.0 - jsonb-3.0 - mpHealth-4.0 - mpConfig-3.1 + jakartaee-10.0 + microprofile-6.1 + restfulWS + cdi + jsonb + mpHealth + mpConfig - messaging-3.1 + messaging - messagingServer-3.0 + messagingServer - messagingClient-3.0 + messagingClient - enterpriseBeansLite-4.0 - mdb-4.0 + enterpriseBeansLite + mdb diff --git a/finish/system/pom.xml b/finish/system/pom.xml index 8f2dcfb..6da3700 100644 --- a/finish/system/pom.xml +++ b/finish/system/pom.xml @@ -77,7 +77,7 @@ io.openliberty.tools liberty-maven-plugin - 3.10.3 + 3.11.1 diff --git a/finish/system/src/main/liberty/config/server.xml b/finish/system/src/main/liberty/config/server.xml index 9db708a..760f56d 100755 --- a/finish/system/src/main/liberty/config/server.xml +++ b/finish/system/src/main/liberty/config/server.xml @@ -1,18 +1,20 @@ - cdi-4.0 - jsonb-3.0 - mpHealth-4.0 - mpConfig-3.1 + jakartaee-10.0 + microprofile-6.1 + cdi + jsonb + mpHealth + mpConfig - messaging-3.1 + messaging - messagingClient-3.0 + messagingClient - enterpriseBeansLite-4.0 - mdb-4.0 + enterpriseBeansLite + mdb diff --git a/ibmmq/inventory/pom.xml b/ibmmq/inventory/pom.xml index f28f284..7c21eb0 100644 --- a/ibmmq/inventory/pom.xml +++ b/ibmmq/inventory/pom.xml @@ -86,7 +86,7 @@ io.openliberty.tools liberty-maven-plugin - 3.10.3 + 3.11.1 diff --git a/ibmmq/inventory/src/main/liberty/config/server.xml b/ibmmq/inventory/src/main/liberty/config/server.xml index 960a842..f13d8fb 100755 --- a/ibmmq/inventory/src/main/liberty/config/server.xml +++ b/ibmmq/inventory/src/main/liberty/config/server.xml @@ -1,16 +1,18 @@ - restfulWS-3.1 - cdi-4.0 - jsonb-3.0 - mpHealth-4.0 - mpConfig-3.1 - messaging-3.1 - messagingClient-3.0 - messagingServer-3.0 - enterpriseBeansLite-4.0 - mdb-4.0 + jakartaee-10.0 + microprofile-6.1 + restfulWS + cdi + jsonb + mpHealth + mpConfig + messaging + messagingClient + messagingServer + enterpriseBeansLite + mdb diff --git a/ibmmq/system/pom.xml b/ibmmq/system/pom.xml index 67a7e23..a1337ae 100644 --- a/ibmmq/system/pom.xml +++ b/ibmmq/system/pom.xml @@ -87,7 +87,7 @@ io.openliberty.tools liberty-maven-plugin - 3.10.3 + 3.11.1 diff --git a/ibmmq/system/src/main/liberty/config/server.xml b/ibmmq/system/src/main/liberty/config/server.xml index 7b81d36..dd5f496 100755 --- a/ibmmq/system/src/main/liberty/config/server.xml +++ b/ibmmq/system/src/main/liberty/config/server.xml @@ -1,14 +1,16 @@ - cdi-4.0 - jsonb-3.0 - mpHealth-4.0 - mpConfig-3.1 - messaging-3.1 - messagingClient-3.0 - enterpriseBeansLite-4.0 - mdb-4.0 + jakartaee-10.0 + microprofile-6.1 + cdi + jsonb + mpHealth + mpConfig + messaging + messagingClient + enterpriseBeansLite + mdb diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml index 56226e6..bc2a114 100644 --- a/start/inventory/pom.xml +++ b/start/inventory/pom.xml @@ -76,7 +76,7 @@ io.openliberty.tools liberty-maven-plugin - 3.10.3 + 3.11.1 diff --git a/start/inventory/src/main/liberty/config/server.xml b/start/inventory/src/main/liberty/config/server.xml index 120bc6e..0d27b78 100755 --- a/start/inventory/src/main/liberty/config/server.xml +++ b/start/inventory/src/main/liberty/config/server.xml @@ -1,16 +1,18 @@ - restfulWS-3.1 - cdi-4.0 - jsonb-3.0 - mpHealth-4.0 - mpConfig-3.1 - messaging-3.1 - messagingClient-3.0 - messagingServer-3.0 - enterpriseBeansLite-4.0 - mdb-4.0 + jakartaee-10.0 + microprofile-6.1 + restfulWS + cdi + jsonb + mpHealth + mpConfig + messaging + messagingClient + messagingServer + enterpriseBeansLite + mdb diff --git a/start/system/pom.xml b/start/system/pom.xml index 8f2dcfb..6da3700 100644 --- a/start/system/pom.xml +++ b/start/system/pom.xml @@ -77,7 +77,7 @@ io.openliberty.tools liberty-maven-plugin - 3.10.3 + 3.11.1 diff --git a/start/system/src/main/liberty/config/server.xml b/start/system/src/main/liberty/config/server.xml index cc9bd14..497f03c 100755 --- a/start/system/src/main/liberty/config/server.xml +++ b/start/system/src/main/liberty/config/server.xml @@ -1,12 +1,14 @@ - cdi-4.0 - jsonb-3.0 - mpHealth-4.0 - mpConfig-3.1 - enterpriseBeansLite-4.0 - mdb-4.0 + jakartaee-10.0 + microprofile-6.1 + cdi + jsonb + mpHealth + mpConfig + enterpriseBeansLite + mdb From a54a97fa06ebe259c451980b07ddebbba2baaa51 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 13 Nov 2024 14:58:28 -0500 Subject: [PATCH 2/6] Update test.yml --- .github/workflows/test.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d925436..bc79802 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 @@ -44,10 +44,11 @@ jobs: run: working-directory: finish steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: 'semeru' java-version: 17 - run: unset _JAVA_OPTIONS - name: Run tests From dbc4038fe9e7e0f794548be7828fc3e53157862f Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 13 Nov 2024 15:21:14 -0500 Subject: [PATCH 3/6] Update test.yml --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc79802..5548606 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -62,6 +62,8 @@ jobs: sudo cat "$logsPath" | sudo grep Launching logsPath=$(sudo find . -name "console.log" | grep system); sudo cat "$logsPath" | sudo grep Launching + sudo chmod -R a+xr system/target + sudo chmod -R a+xr inventory/target - name: Archive finish inventory logs if failed if: failure() uses: actions/upload-artifact@v4 From 087749e8678c8b8c425d2053f8f4c16feaefa6c6 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Mon, 9 Dec 2024 12:19:13 -0500 Subject: [PATCH 4/6] use versionless feature Signed-off-by: Gilbert Kwan --- finish/inventory/pom.xml | 2 +- finish/inventory/src/main/liberty/config/server.xml | 2 +- finish/models/pom.xml | 2 +- finish/system/pom.xml | 2 +- finish/system/src/main/liberty/config/server.xml | 2 +- ibmmq/inventory/pom.xml | 2 +- ibmmq/inventory/src/main/liberty/config/server.xml | 2 +- ibmmq/system/pom.xml | 2 +- ibmmq/system/src/main/liberty/config/server.xml | 2 +- start/inventory/pom.xml | 2 +- start/inventory/src/main/liberty/config/server.xml | 2 +- start/models/pom.xml | 2 +- start/system/pom.xml | 2 +- start/system/src/main/liberty/config/server.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml index b69614b..30b65d0 100644 --- a/finish/inventory/pom.xml +++ b/finish/inventory/pom.xml @@ -28,7 +28,7 @@ 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 7217174..d9f2560 100755 --- a/finish/inventory/src/main/liberty/config/server.xml +++ b/finish/inventory/src/main/liberty/config/server.xml @@ -2,7 +2,7 @@ jakartaee-10.0 - microprofile-6.1 + microprofile-7.0 restfulWS cdi jsonb diff --git a/finish/models/pom.xml b/finish/models/pom.xml index 2bffb9a..396cc05 100644 --- a/finish/models/pom.xml +++ b/finish/models/pom.xml @@ -17,7 +17,7 @@ org.eclipse.microprofile microprofile - 6.1 + 7.0 pom provided diff --git a/finish/system/pom.xml b/finish/system/pom.xml index c0824fa..f3dde14 100644 --- a/finish/system/pom.xml +++ b/finish/system/pom.xml @@ -32,7 +32,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 760f56d..4d882a3 100755 --- a/finish/system/src/main/liberty/config/server.xml +++ b/finish/system/src/main/liberty/config/server.xml @@ -2,7 +2,7 @@ jakartaee-10.0 - microprofile-6.1 + microprofile-7.0 cdi jsonb mpHealth diff --git a/ibmmq/inventory/pom.xml b/ibmmq/inventory/pom.xml index 3c287d0..b6c8056 100644 --- a/ibmmq/inventory/pom.xml +++ b/ibmmq/inventory/pom.xml @@ -38,7 +38,7 @@ org.eclipse.microprofile microprofile - 6.1 + 7.0 pom provided diff --git a/ibmmq/inventory/src/main/liberty/config/server.xml b/ibmmq/inventory/src/main/liberty/config/server.xml index f13d8fb..c3c80b8 100755 --- a/ibmmq/inventory/src/main/liberty/config/server.xml +++ b/ibmmq/inventory/src/main/liberty/config/server.xml @@ -2,7 +2,7 @@ jakartaee-10.0 - microprofile-6.1 + microprofile-7.0 restfulWS cdi jsonb diff --git a/ibmmq/system/pom.xml b/ibmmq/system/pom.xml index 3da66a3..3a65d1b 100644 --- a/ibmmq/system/pom.xml +++ b/ibmmq/system/pom.xml @@ -42,7 +42,7 @@ org.eclipse.microprofile microprofile - 6.1 + 7.0 pom provided diff --git a/ibmmq/system/src/main/liberty/config/server.xml b/ibmmq/system/src/main/liberty/config/server.xml index dd5f496..2a16e00 100755 --- a/ibmmq/system/src/main/liberty/config/server.xml +++ b/ibmmq/system/src/main/liberty/config/server.xml @@ -2,7 +2,7 @@ jakartaee-10.0 - microprofile-6.1 + microprofile-7.0 cdi jsonb mpHealth diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml index b69614b..30b65d0 100644 --- a/start/inventory/pom.xml +++ b/start/inventory/pom.xml @@ -28,7 +28,7 @@ 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 0d27b78..2a02052 100755 --- a/start/inventory/src/main/liberty/config/server.xml +++ b/start/inventory/src/main/liberty/config/server.xml @@ -2,7 +2,7 @@ jakartaee-10.0 - microprofile-6.1 + microprofile-7.0 restfulWS cdi jsonb diff --git a/start/models/pom.xml b/start/models/pom.xml index 2bffb9a..396cc05 100644 --- a/start/models/pom.xml +++ b/start/models/pom.xml @@ -17,7 +17,7 @@ org.eclipse.microprofile microprofile - 6.1 + 7.0 pom provided diff --git a/start/system/pom.xml b/start/system/pom.xml index c0824fa..f3dde14 100644 --- a/start/system/pom.xml +++ b/start/system/pom.xml @@ -32,7 +32,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 497f03c..c69bed5 100755 --- a/start/system/src/main/liberty/config/server.xml +++ b/start/system/src/main/liberty/config/server.xml @@ -2,7 +2,7 @@ jakartaee-10.0 - microprofile-6.1 + microprofile-7.0 cdi jsonb mpHealth From 339b30aa3300cf4c68f82ff7e62d6ec6d306399f Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 11 Dec 2024 10:34:10 -0500 Subject: [PATCH 5/6] use versionless feature Signed-off-by: Gilbert Kwan --- README.adoc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index 92581c2..9994f92 100644 --- a/README.adoc +++ b/README.adoc @@ -193,7 +193,7 @@ include::finish/inventory/src/main/java/io/openliberty/guides/inventory/Inventor The `inventory` microservice receives the messages from the `system` microservice. Implement the [hotspot=InventoryQueueListener file=0]`InventoryQueueListener` class with the `MessageListener` interface and annotate with [hotspot=messageDriven file=0]`@MessageDriven` to monitor the `jms/InventoryQueue` message queue. Implement the [hotspot=onMessage file=0]`onMessage()` method that processes the incoming messages, updates the inventory by using the [hotspot=InventoryManager hotspot=InventoryManagerUpdate file=0]`InventoryManager` bean, and logs the action. Use the [hotspot=systemLoad file=0]`SystemLoad.fromJson()` method to convert the JSON message string to the `SystemLoad` object. -Next, configure the `inventory` microservice with an embedded messaging server and the https://openliberty.io/docs/latest/reference/feature/messagingClient-3.0.html[Messaging Server Client^] feature. +Next, configure the `inventory` microservice with an embedded messaging server and the https://openliberty.io/docs/latest/reference/feature/messagingClient.html[Messaging Server Client^] feature. [role='code_command hotspot file=1', subs="quotes"] ---- @@ -299,8 +299,6 @@ endif::[] == Testing the inventory application -//similar to https://openliberty.io/guides/cdi-intro.html#testing-the-inventory-application -//explain the test While you can test your application manually, you should rely on automated tests because they trigger a failure whenever a code change introduces a defect. Because the application is a RESTful web service application, you can use JUnit and the RESTful web service Client API to write tests. In testing the functionality of the application, the scopes and dependencies are being tested. [role='code_command hotspot file=0', subs='quotes'] From c20a792b25c83a94d99185b21e7d9edbc7264e8e Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Tue, 7 Jan 2025 11:49:27 -0500 Subject: [PATCH 6/6] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 9994f92..ba9dc49 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 IBM Corporation and others. +// Copyright (c) 2024, 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/