From eb14a2885b80be750a821791a375d8e960506b89 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 13 Nov 2024 12:01:30 -0500 Subject: [PATCH 1/5] use versionless feature Signed-off-by: Gilbert Kwan --- .github/workflows/test.yml | 9 +++++---- finish/inventory/src/main/liberty/config/server.xml | 12 +++++++----- finish/inventory/src/main/webapp/index.html | 10 +++++----- finish/system/src/main/liberty/config/server.xml | 9 +++++---- finish/system/src/main/webapp/index.html | 8 ++++---- start/inventory/src/main/liberty/config/server.xml | 12 +++++++----- start/inventory/src/main/webapp/index.html | 10 +++++----- start/system/src/main/liberty/config/server.xml | 9 +++++---- start/system/src/main/webapp/index.html | 8 ++++---- 9 files changed, 47 insertions(+), 40 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 59c13d0..f26a763 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 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/finish/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml index 5e7f75c..15a9eae 100755 --- a/finish/inventory/src/main/liberty/config/server.xml +++ b/finish/inventory/src/main/liberty/config/server.xml @@ -1,11 +1,13 @@ - restfulWS-3.1 - jsonb-3.0 - jsonp-2.1 - cdi-4.0 - mpConfig-3.1 + jakartaee-10.0 + microprofile-6.1 + restfulWS + jsonb + jsonp + cdi + mpConfig diff --git a/finish/inventory/src/main/webapp/index.html b/finish/inventory/src/main/webapp/index.html index 3a8c371..6be40dd 100755 --- a/finish/inventory/src/main/webapp/index.html +++ b/finish/inventory/src/main/webapp/index.html @@ -1,5 +1,5 @@