From 2db6f1c098fddb6c7bb1ef4dcba19d96719fd3e7 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 29 Feb 2024 14:22:18 -0500 Subject: [PATCH] Update to MP6.1 (#166) * update versions * Update README.adoc * update versions --- .github/dependabot.yml | 7 +++++++ .github/workflows/add-pr-to-project.yml | 18 ++++++++++++++++++ README.adoc | 6 +++--- finish/pom.xml | 18 +++++++++--------- finish/src/main/liberty/config/server.xml | 8 ++++---- scripts/dailyBuild.sh | 2 +- start/src/main/liberty/config/server.xml | 8 ++++---- 7 files changed, 46 insertions(+), 21 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 a03a11e..a28aedf 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -// Copyright (c) 2017, 2023 IBM Corporation and others. +// Copyright (c) 2017, 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/ @@ -15,7 +15,7 @@ :page-essential-order: 3 :page-description: Learn how to build and test a simple web application using Maven and Open Liberty :page-related-guides: ['maven-multimodules', 'gradle-intro'] -:page-tags: ['Maven'] +:page-tags: ['maven'] :page-permalink: /guides/{projectid} :common-includes: https://raw.githubusercontent.com/OpenLiberty/guides-common/prod :page-seo-title: Building and testing a Java web application with Maven and Open Liberty @@ -178,7 +178,7 @@ The project coordinates describe the name and version of the application. The [h The first four properties in the properties section of the project, just define the encoding ([hotspot=encoding file=0]`UTF-8`) and version of Java ([hotspot=java-version file=0]`Java 11`) that Maven uses to compile the application source code. -Open Liberty configuration properties provide you with a single place to specify values that are used in multiple places throughout the application. For example, the [hotspot=default-http-port file=0]`default.http.port` value is used in both the Liberty [hotspot=httpEndpoint file=2]`server.xml` configuration file and will be used in the test class that you will add (`EndpointIT.java`) to the application. Because the [hotspot=default-http-port file=0]`default.http.port` value is specified in the [hotspot file=0]`pom.xml` file, you can easily change the port number that the Liberty instance runs on without updating the application code in multiple places. +Open Liberty configuration properties provide you with a single place to specify values that are used in multiple places throughout the application. For example, the [hotspot=http.port file=0]`http.port` value is used in both the Liberty [hotspot=httpEndpoint file=2]`server.xml` configuration file and will be used in the test class that you will add (`EndpointIT.java`) to the application. Because the [hotspot=http.port file=0]`http.port` value is specified in the [hotspot file=0]`pom.xml` file, you can easily change the port number that the Liberty instance runs on without updating the application code in multiple places. HelloServlet.java [source, java, linenums, role='code_column hide_tags=comment,javadoc1,javadoc2'] diff --git a/finish/pom.xml b/finish/pom.xml index 5e88f1b..05de452 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -26,10 +26,10 @@ 11 - - 9080 - - 9443 + + 9080 + + 9443 ${project.artifactId} @@ -56,7 +56,7 @@ org.eclipse.microprofile microprofile - 6.0 + 6.1 pom provided @@ -75,7 +75,7 @@ org.junit.jupiter junit-jupiter - 5.9.2 + 5.10.1 test @@ -97,7 +97,7 @@ io.openliberty.tools liberty-maven-plugin - 3.8.2 + 3.10 @@ -111,12 +111,12 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.2.5 - ${liberty.var.default.http.port} + ${liberty.var.http.port} ${liberty.var.app.context.root} diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml index b3ae63d..e183533 100644 --- a/finish/src/main/liberty/config/server.xml +++ b/finish/src/main/liberty/config/server.xml @@ -3,13 +3,13 @@ servlet-6.0 - - + + - + diff --git a/scripts/dailyBuild.sh b/scripts/dailyBuild.sh index 2cced31..e4c89ab 100755 --- a/scripts/dailyBuild.sh +++ b/scripts/dailyBuild.sh @@ -8,7 +8,7 @@ do esac done -sed -i "\#liberty-maven-plugin#,\##cliberty-maven-plugin3.7.1https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER" pom.xml +sed -i "\#liberty-maven-plugin#,\##cliberty-maven-plugin3.10https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER" pom.xml cat pom.xml ../scripts/testApp.sh diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml index b3ae63d..e183533 100644 --- a/start/src/main/liberty/config/server.xml +++ b/start/src/main/liberty/config/server.xml @@ -3,13 +3,13 @@ servlet-6.0 - - + + - +