From f9862b936387f131fd12704c7631bdda7779cd4b Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Mon, 26 Feb 2024 10:24:54 -0500 Subject: [PATCH] Update to MP6.1 (#46) * update versions * Update testAppFinish.sh * update versions * Update README.adoc * Update README.adoc --- .github/dependabot.yml | 7 ++++ .github/workflows/add-pr-to-project.yml | 18 +++++++++ README.adoc | 37 +++++++------------ finish/inventory/pom.xml | 22 +++++------ .../src/main/liberty/config/server.xml | 8 ++-- finish/inventory/src/main/webapp/index.html | 4 +- finish/system/pom.xml | 20 +++++----- .../system/src/main/liberty/config/server.xml | 6 +-- finish/system/src/main/webapp/index.html | 2 +- scripts/testAppFinish.sh | 2 +- start/inventory/pom.xml | 22 +++++------ .../src/main/liberty/config/server.xml | 8 ++-- start/inventory/src/main/webapp/index.html | 4 +- start/system/pom.xml | 20 +++++----- .../system/src/main/liberty/config/server.xml | 6 +-- start/system/src/main/webapp/index.html | 2 +- 16 files changed, 102 insertions(+), 86 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/add-pr-to-project.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..00dad74 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: +- package-ecosystem: maven + directory: "/" + schedule: + interval: monthly + open-pull-requests-limit: 50 diff --git a/.github/workflows/add-pr-to-project.yml b/.github/workflows/add-pr-to-project.yml new file mode 100644 index 0000000..0b1643a --- /dev/null +++ b/.github/workflows/add-pr-to-project.yml @@ -0,0 +1,18 @@ +name: Add PRs to Dependabot PRs dashboard + +on: + pull_request: + types: + - opened + - labeled + +jobs: + add-to-project: + name: Add PR to dashboard + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@v0.5.0 + with: + project-url: https://github.com/orgs/OpenLiberty/projects/26 + github-token: ${{ secrets.ADMIN_BACKLOG }} + labeled: dependencies diff --git a/README.adoc b/README.adoc index cb6ea58..077bd97 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -// Copyright (c) 2022, 2023 IBM Corporation and others. +// Copyright (c) 2022, 2024 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/ @@ -253,13 +253,6 @@ include::finish/system/Containerfile-full[] Now that your microservices are packaged and your `Containerfile` files are written, you will build your container images by using the `podman build` command. -Run the following command to download or update to the latest Open Liberty container image: - -[role='command'] -``` -podman pull icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi -``` - Run the following commands to build container images for your application: [role='command'] @@ -424,29 +417,29 @@ In this example, you will use an environment variable to externally configure th HTTP port number of the `inventory` service. In the [hotspot file=0]`inventory/server.xml` file, -the [hotspot=httpPort file=0]`default.http.port` variable is declared and is used in the +the [hotspot=httpPort file=0]`http.port` variable is declared and is used in the [hotspot=httpEndpoint file=0]`httpEndpoint` element to define the service -endpoint. The default value of the [hotspot=httpPort file=0]`default.http.port` +endpoint. The default value of the [hotspot=httpPort file=0]`http.port` variable is `9081`. However, this value is only used if no other value is specified. You can replace this value in the container by using the -e flag for the podman run command. -Run the following commands to stop and remove the `inventory` container and rerun it with the `default.http.port` environment variable set: +Run the following commands to stop and remove the `inventory` container and rerun it with the `http.port` environment variable set: [role='command'] ``` podman stop inventory podman rm inventory -podman run -d --name inventory -e default.http.port=9091 -p 9091:9091 inventory:1.0-SNAPSHOT +podman run -d --name inventory -e http.port=9091 -p 9091:9091 inventory:1.0-SNAPSHOT ``` The `-e` flag can be used to create and set the values of environment variables -in a container. In this case, you are setting the `default.http.port` environment +in a container. In this case, you are setting the `http.port` environment variable to `9091` for the `inventory` container. The `-p` flag then maps the local port to the new container port that was specified via the environment variable. Now, when the service is starting up, Open Liberty finds the -`default.http.port` environment variable and uses it to set the value of the -[hotspot=httpPort file=0]`default.http.port` variable to be used in the HTTP +`http.port` environment variable and uses it to set the value of the +[hotspot=httpPort file=0]`http.port` variable to be used in the HTTP endpoint. // static guide instructions: @@ -574,14 +567,12 @@ podman exec -it inventory /opt/ol/wlp/bin/productInfo featureInfo Your list of Liberty features should be similar to the following: ---- jndi-1.0 -servlet-5.0 -cdi-3.0 -concurrent-2.0 -jsonb-2.0 -jsonp-2.0 -mpConfig-3.0 -restfulWS-3.0 -restfulWSClient-3.0 +cdi-4.0 +jsonb-3.0 +jsonp-2.1 +mpConfig-3.1 +restfulWS-3.1 +restfulWSClient-3.1 ---- // static guide instructions: diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml index de68607..e06ef6f 100644 --- a/finish/inventory/pom.xml +++ b/finish/inventory/pom.xml @@ -20,8 +20,8 @@ localhost 9080 - 9081 - 9444 + 9081 + 9444 @@ -35,7 +35,7 @@ org.eclipse.microprofile microprofile - 6.0 + 6.1 pom provided @@ -43,25 +43,25 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.14.0 org.junit.jupiter junit-jupiter-engine - 5.9.2 + 5.10.1 test org.jboss.resteasy resteasy-client - 6.2.3.Final + 6.2.7.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.3.Final + 6.2.7.Final test @@ -83,24 +83,24 @@ io.openliberty.tools liberty-maven-plugin - 3.8.2 + 3.10 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.2.5 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.2.5 ${system.ip} ${system.http.port} - ${liberty.var.default.http.port} + ${liberty.var.http.port} diff --git a/finish/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml index 98c6587..5e7f75c 100755 --- a/finish/inventory/src/main/liberty/config/server.xml +++ b/finish/inventory/src/main/liberty/config/server.xml @@ -5,16 +5,16 @@ jsonb-3.0 jsonp-2.1 cdi-4.0 - mpConfig-3.0 + mpConfig-3.1 - + - + - diff --git a/finish/inventory/src/main/webapp/index.html b/finish/inventory/src/main/webapp/index.html index 41cdf7a..3a8c371 100755 --- a/finish/inventory/src/main/webapp/index.html +++ b/finish/inventory/src/main/webapp/index.html @@ -30,8 +30,8 @@

Eclipse MicroProfile

For more information about the features used in this application, see the Open Liberty documentation:

    -
  • MicroProfile 6.0
    • -
  • MicroProfile Config 3.0
    • +
  • MicroProfile 6.1
    • +
  • MicroProfile Config 3.1
  • Jakarta Contexts and Dependency Injection 4.0
  • Jakarta RESTful Web Services 3.1
  • Jakarta JSON Processing 2.1
    • diff --git a/finish/system/pom.xml b/finish/system/pom.xml index 965b7b7..9f1058a 100644 --- a/finish/system/pom.xml +++ b/finish/system/pom.xml @@ -17,8 +17,8 @@ 11 11 - 9080 - 9443 + 9080 + 9443 @@ -32,7 +32,7 @@ org.eclipse.microprofile microprofile - 6.0 + 6.1 pom provided @@ -40,19 +40,19 @@ org.junit.jupiter junit-jupiter-engine - 5.9.2 + 5.10.1 test org.jboss.resteasy resteasy-json-binding-provider - 6.2.3.Final + 6.2.7.Final test org.jboss.resteasy resteasy-client - 6.2.3.Final + 6.2.7.Final test @@ -69,22 +69,22 @@ io.openliberty.tools liberty-maven-plugin - 3.8.2 + 3.10 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.2.5 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.2.5 - ${liberty.var.default.http.port} + ${liberty.var.http.port} diff --git a/finish/system/src/main/liberty/config/server.xml b/finish/system/src/main/liberty/config/server.xml index 2a8f1b2..0fdfc74 100644 --- a/finish/system/src/main/liberty/config/server.xml +++ b/finish/system/src/main/liberty/config/server.xml @@ -7,10 +7,10 @@ cdi-4.0 - - + + - diff --git a/finish/system/src/main/webapp/index.html b/finish/system/src/main/webapp/index.html index 2f08024..d65b202 100644 --- a/finish/system/src/main/webapp/index.html +++ b/finish/system/src/main/webapp/index.html @@ -30,7 +30,7 @@

    Eclipse MicroProfile

    For more information about the features used in this application, see the Open Liberty documentation:

      -
    • MicroProfile 6.0
      • +
    • MicroProfile 6.1
    • Jakarta Contexts and Dependency Injection 4.0
    • Jakarta RESTful Web Services 3.1
    • Jakarta JSON Processing 2.1
      • diff --git a/scripts/testAppFinish.sh b/scripts/testAppFinish.sh index 13d36a5..2fa838c 100755 --- a/scripts/testAppFinish.sh +++ b/scripts/testAppFinish.sh @@ -58,7 +58,7 @@ fi podman stop inventory podman rm inventory -podman run -d --name inventory -e default.http.port=9091 -p 9091:9091 inventory +podman run -d --name inventory -e http.port=9091 -p 9091:9091 inventory sleep 30 diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml index 9539d33..80ac401 100644 --- a/start/inventory/pom.xml +++ b/start/inventory/pom.xml @@ -20,8 +20,8 @@ localhost 9080 - 9081 - 9444 + 9081 + 9444 @@ -35,7 +35,7 @@ org.eclipse.microprofile microprofile - 6.0 + 6.1 pom provided @@ -43,25 +43,25 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.14.0 org.junit.jupiter junit-jupiter-engine - 5.9.2 + 5.10.1 test org.jboss.resteasy resteasy-client - 6.2.3.Final + 6.2.7.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.3.Final + 6.2.7.Final test @@ -83,24 +83,24 @@ io.openliberty.tools liberty-maven-plugin - 3.8.2 + 3.10 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.2.5 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.2.5 ${system.ip} ${system.http.port} - ${liberty.var.default.http.port} + ${liberty.var.http.port} diff --git a/start/inventory/src/main/liberty/config/server.xml b/start/inventory/src/main/liberty/config/server.xml index 542e5d8..9cad180 100755 --- a/start/inventory/src/main/liberty/config/server.xml +++ b/start/inventory/src/main/liberty/config/server.xml @@ -5,13 +5,13 @@ jsonb-3.0 jsonp-2.1 cdi-4.0 - mpConfig-3.0 + mpConfig-3.1 - - + + - diff --git a/start/inventory/src/main/webapp/index.html b/start/inventory/src/main/webapp/index.html index 41cdf7a..3a8c371 100755 --- a/start/inventory/src/main/webapp/index.html +++ b/start/inventory/src/main/webapp/index.html @@ -30,8 +30,8 @@

      Eclipse MicroProfile

      For more information about the features used in this application, see the Open Liberty documentation:

        -
      • MicroProfile 6.0
        • -
      • MicroProfile Config 3.0
        • +
      • MicroProfile 6.1
        • +
      • MicroProfile Config 3.1
      • Jakarta Contexts and Dependency Injection 4.0
      • Jakarta RESTful Web Services 3.1
      • Jakarta JSON Processing 2.1
        • diff --git a/start/system/pom.xml b/start/system/pom.xml index 965b7b7..9f1058a 100644 --- a/start/system/pom.xml +++ b/start/system/pom.xml @@ -17,8 +17,8 @@ 11 11 - 9080 - 9443 + 9080 + 9443 @@ -32,7 +32,7 @@ org.eclipse.microprofile microprofile - 6.0 + 6.1 pom provided @@ -40,19 +40,19 @@ org.junit.jupiter junit-jupiter-engine - 5.9.2 + 5.10.1 test org.jboss.resteasy resteasy-json-binding-provider - 6.2.3.Final + 6.2.7.Final test org.jboss.resteasy resteasy-client - 6.2.3.Final + 6.2.7.Final test @@ -69,22 +69,22 @@ io.openliberty.tools liberty-maven-plugin - 3.8.2 + 3.10 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.2.5 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.2.5 - ${liberty.var.default.http.port} + ${liberty.var.http.port} diff --git a/start/system/src/main/liberty/config/server.xml b/start/system/src/main/liberty/config/server.xml index 2a8f1b2..0fdfc74 100644 --- a/start/system/src/main/liberty/config/server.xml +++ b/start/system/src/main/liberty/config/server.xml @@ -7,10 +7,10 @@ cdi-4.0 - - + + - diff --git a/start/system/src/main/webapp/index.html b/start/system/src/main/webapp/index.html index 2f08024..d65b202 100644 --- a/start/system/src/main/webapp/index.html +++ b/start/system/src/main/webapp/index.html @@ -30,7 +30,7 @@

        Eclipse MicroProfile

        For more information about the features used in this application, see the Open Liberty documentation: