diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dcd1c68..7ed5d8f 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 @@ -47,10 +47,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 index f446d3b..bfc1268 100644 --- a/README.adoc +++ b/README.adoc @@ -1,7 +1,7 @@ // INSTRUCTION: Please remove all comments that start INSTRUCTION prior to commit. Most comments should be removed, although not the copyright. // INSTRUCTION: The copyright statement must appear at the top of the file // -// Copyright (c) 2017, 2024 IBM Corporation and others. +// Copyright (c) 2017, 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/ @@ -155,8 +155,8 @@ You'll see an image called `system:1.0-SNAPSHOT` listed in a table similar to th ---- REPOSITORY TAG IMAGE ID CREATED SIZE system 1.0-SNAPSHOT 8856039f4c42 9 minutes ago 745MB -istio/proxyv2 1.20.3 7a3aaffcf645 3 weeks ago 347MB -istio/pilot 1.20.3 4974b5b22dcc 3 weeks ago 261MB +istio/proxyv2 1.24.2 7a3aaffcf645 3 weeks ago 347MB +istio/pilot 1.24.2 4974b5b22dcc 3 weeks ago 261MB icr.io/appcafe/open-liberty kernel-slim-java11-openj9-ubi d6ef646493e1 8 days ago 729MB ---- diff --git a/finish/pom.xml b/finish/pom.xml index 810110e..5337c3b 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -34,7 +34,7 @@ org.eclipse.microprofile microprofile - 6.1 + 7.0 pom provided diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml index 3f2e09e..7137e20 100644 --- a/finish/src/main/liberty/config/server.xml +++ b/finish/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-7.0 + restfulWS + jsonb + jsonp + cdi + mpConfig diff --git a/finish/src/main/webapp/favicon.ico b/finish/src/main/webapp/favicon.ico new file mode 100644 index 0000000..c8652f3 Binary files /dev/null and b/finish/src/main/webapp/favicon.ico differ diff --git a/finish/src/main/webapp/index.html b/finish/src/main/webapp/index.html index 852bd7b..bc5a274 100644 --- a/finish/src/main/webapp/index.html +++ b/finish/src/main/webapp/index.html @@ -34,12 +34,12 @@

MicroProfile

diff --git a/start/pom.xml b/start/pom.xml index 46bb832..7ec07ef 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -34,7 +34,7 @@ org.eclipse.microprofile microprofile - 6.1 + 7.0 pom provided diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml index 3f2e09e..7137e20 100644 --- a/start/src/main/liberty/config/server.xml +++ b/start/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-7.0 + restfulWS + jsonb + jsonp + cdi + mpConfig diff --git a/start/src/main/webapp/favicon.ico b/start/src/main/webapp/favicon.ico new file mode 100644 index 0000000..c8652f3 Binary files /dev/null and b/start/src/main/webapp/favicon.ico differ diff --git a/start/src/main/webapp/index.html b/start/src/main/webapp/index.html index 852bd7b..bc5a274 100644 --- a/start/src/main/webapp/index.html +++ b/start/src/main/webapp/index.html @@ -34,12 +34,12 @@

MicroProfile