From b673c044540753dbe7b9d85255baf3c2fd23ac69 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Fri, 4 Nov 2022 12:51:24 -0400 Subject: [PATCH 01/19] update contribution (#193) --- CONTRIBUTING.md | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c39bf203..f495a571 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,13 +12,8 @@ A good bug report makes it easy for everyone to understand what you were trying ## Contributions -Contributing to an Open Liberty guide is simple. All you need to do is create your branch to include your contribution and open a pull request to the `staging` (quality assurance) branch. - -### Text or content contributions - -If you are contributing text or content changes via a pull request, you need to certify that the originality of the work follows the [Developer Certificate of Origin (DCO)](https://developercertificate.org). - -Add a line to the end of the Git commit message to sign your work: +Contributing to an Open Liberty guide is simple. Each guide is maintained in its own GitHub repository. To contribute, just fork from the `prod` branch for your chosen guide. Then create a branch in your forked repository to include your contribution and open a pull request to the `staging` branch for the guide. +Certify the originality of your work by following the [Developer Certificate of Origin (DCO)](https://developercertificate.org) approach and adding a line to the end of the Git commit message to sign your work: ```text Signed-off-by: Jane Williams @@ -30,30 +25,15 @@ Use your real name when you sign. We can't accept pseudonyms or anonymous contri Many Git UI tools have support for adding the `Signed-off-by` line to the end of your commit message. This line can be automatically added by the `git commit` command by using the `-s` option. -If reviewers agree with your change, your change will be merged to the `prod` branch for publishing. - -### Code contributions - -If you are contributing trivial code changes such as typos, redundant spaces, or minor formatting and spelling errors, follow the instructions under [Text or content contributions](./CONTRIBUTING.md#text-or-content-contributions). - -If you are contributing code changes via a pull request for non-trivial changes, you must sign off on the [Individual Contributor License Agreement](https://github.com/OpenLiberty/open-liberty/blob/release/cla/open-liberty-cla-individual.pdf). An example of a non-trivial change could be adding a new -microservice to the backend application of the guide. - -If you are contributing changes as part of your job, you may also wish to have your employer sign a [Corporate Contributor License Agreement](https://github.com/OpenLiberty/open-liberty/blob/release/cla/open-liberty-cla-corporate.pdf). - -Instructions for how to sign and submit these agreements are located at the top of each document. - -After we obtain the signed CLA, you are welcome to open a pull request against the `staging` branch, and the team will be notified for review. We ask you to follow these steps through the submission process: +The team is then notified and your contribution is reviewed according to the following process: -1. Open a pull request against the `staging` branch. -2. A "CLA signed" label will be manually added by the team. -3. The team will be notified and will review your change(s). +1. The team will review your change(s). - If there are further changes to be made, the team will request changes on the pull request. - If the team does not agree with the change, the PR will be closed with an explanation and suggestion for follow-up. -4. If the team approves, a full Open Liberty site build will be run. -5. Based on the results of the build: +2. If the team approves, the team will merge your PR. A full Open Liberty staging site build will be run. +3. Based on the results of the build: - If further review is needed, we will let you know about a pending review from our team and discuss any necessary improvements that need to be made to your change(s). - - If everything is successful, the team will merge your PR. + - If everything is successful, the team will publish your change(s) to the `prod` branch and update the Open Liberty production site, if necessary. ## Questions and concerns From c9f45a2a2aaeaead1666bb22f34b3b80751a3729 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 19 Jan 2023 15:02:51 -0500 Subject: [PATCH 02/19] Create action add-to-projects (#196) --- .github/workflows/add-to-projects.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/add-to-projects.yml diff --git a/.github/workflows/add-to-projects.yml b/.github/workflows/add-to-projects.yml new file mode 100644 index 00000000..e49dc3b8 --- /dev/null +++ b/.github/workflows/add-to-projects.yml @@ -0,0 +1,17 @@ +name: Add issues to Liberty guides backlog project + +on: + issues: + types: + - opened + - transferred + +jobs: + add-to-project: + name: Add issue to backlog + runs-on: ubuntu-latest + steps: + - uses: actions/add-to-project@v0.4.0 + with: + project-url: https://github.com/orgs/OpenLiberty/projects/11 + github-token: ${{ secrets.ADMIN_BACKLOG }} From 72fc9ace0d58689d9a0cd642032d6341ce70485f Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 1 Feb 2023 09:29:14 -0500 Subject: [PATCH 03/19] Create action update-lmp-371 (#198) --- finish/pom.xml | 2 +- start/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/finish/pom.xml b/finish/pom.xml index c3e4f9ba..ba160f5b 100755 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -86,7 +86,7 @@ io.openliberty.tools liberty-maven-plugin - 3.5.1 + 3.7.1 diff --git a/start/pom.xml b/start/pom.xml index 1ca2c91a..c2cd742d 100755 --- a/start/pom.xml +++ b/start/pom.xml @@ -86,7 +86,7 @@ io.openliberty.tools liberty-maven-plugin - 3.5.1 + 3.7.1 From 179bf43735061fa3ebf78175710d0e56b5b2c731 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 10 May 2023 16:42:50 -0400 Subject: [PATCH 04/19] Update to MP6 and JEE10 (#200) * update versions * Adding new lines to fix superlinter failure * Update testApp.sh * Changing URLs to match new REST endpoint for mp metrics * Updating copyright year in readme.adoc --------- Co-authored-by: Jakub Pomykala <56261244+jakub-pomykala@users.noreply.github.com> --- .github/workflows/test.yml | 4 +- LICENSE | 418 +++++++++++------- README.adoc | 10 +- finish/pom.xml | 18 +- .../guides/config/CustomConfigSource.java | 7 +- .../inventory/InventoryApplication.java | 7 +- .../guides/inventory/InventoryConfig.java | 7 +- .../guides/inventory/InventoryManager.java | 7 +- .../guides/inventory/InventoryResource.java | 7 +- .../guides/inventory/InventoryUtils.java | 7 +- .../inventory/client/ExceptionMapper.java | 7 +- .../guides/inventory/client/SystemClient.java | 7 +- .../inventory/client/UnknownUrlException.java | 7 +- .../guides/inventory/model/InventoryList.java | 9 +- .../guides/inventory/model/SystemData.java | 9 +- .../guides/system/SystemApplication.java | 7 +- .../guides/system/SystemConfig.java | 7 +- .../guides/system/SystemResource.java | 7 +- finish/src/main/liberty/config/server.xml | 10 +- finish/src/main/webapp/index.html | 14 +- .../faulttolerance/FaultToleranceIT.java | 7 +- .../guides/inventory/InventoryEndpointIT.java | 7 +- .../guides/system/SystemEndpointIT.java | 7 +- .../openliberty/guides/utils/TestUtils.java | 7 +- scripts/testApp.sh | 2 +- start/pom.xml | 18 +- .../guides/config/CustomConfigSource.java | 7 +- .../inventory/InventoryApplication.java | 7 +- .../guides/inventory/InventoryConfig.java | 7 +- .../guides/inventory/InventoryManager.java | 7 +- .../guides/inventory/InventoryResource.java | 7 +- .../guides/inventory/InventoryUtils.java | 7 +- .../inventory/client/ExceptionMapper.java | 7 +- .../guides/inventory/client/SystemClient.java | 7 +- .../inventory/client/UnknownUrlException.java | 7 +- .../guides/inventory/model/InventoryList.java | 9 +- .../guides/inventory/model/SystemData.java | 9 +- .../guides/system/SystemApplication.java | 7 +- .../guides/system/SystemConfig.java | 7 +- .../guides/system/SystemResource.java | 7 +- start/src/main/liberty/config/server.xml | 10 +- start/src/main/webapp/index.html | 14 +- .../guides/inventory/InventoryEndpointIT.java | 7 +- .../guides/system/SystemEndpointIT.java | 7 +- .../openliberty/guides/utils/TestUtils.java | 7 +- 45 files changed, 405 insertions(+), 366 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8ba98e83..fd07de47 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,10 +46,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 8 + java-version: 11 - run: unset _JAVA_OPTIONS - name: Run tests diff --git a/LICENSE b/LICENSE index 55f40102..371b4b9a 100755 --- a/LICENSE +++ b/LICENSE @@ -1,211 +1,285 @@ -Code and build scripts are licensed under the Eclipse Public License v1 +Code and build scripts are licensed under the Eclipse Public License v2 Documentation files (e.g. files with an adoc file extension) are licensed under Creative Commons Attribution-NoDerivatives 4.0 International (CC BY-ND 4.0) -Eclipse Public License - v 1.0 +Eclipse Public License - v 2.0 -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM -CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS "Contribution" means: -a) in the case of the initial Contributor, the initial code and documentation - distributed under this Agreement, and -b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and - where such changes and/or additions to the Program originate from and are - distributed by that particular Contributor. A Contribution 'originates' - from a Contributor if it was added to the Program by such Contributor - itself or anyone acting on such Contributor's behalf. Contributions do not - include additions to the Program which: (i) are separate modules of - software distributed in conjunction with the Program under their own - license agreement, and (ii) are not derivative works of the Program. + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. -"Contributor" means any person or entity that distributes the Program. +"Contributor" means any person or entity that Distributes the Program. -"Licensed Patents" mean patent claims licensable by a Contributor which are -necessarily infringed by the use or sale of its Contribution alone or when -combined with the Program. +"Licensed Patents" mean patent claims licensable by a Contributor which +are necessarily infringed by the use or sale of its Contribution alone +or when combined with the Program. -"Program" means the Contributions distributed in accordance with this +"Program" means the Contributions Distributed in accordance with this Agreement. -"Recipient" means anyone who receives the Program under this Agreement, -including all Contributors. +"Recipient" means anyone who receives the Program under this Agreement +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. 2. GRANT OF RIGHTS - a) Subject to the terms of this Agreement, each Contributor hereby grants - Recipient a non-exclusive, worldwide, royalty-free copyright license to - reproduce, prepare derivative works of, publicly display, publicly - perform, distribute and sublicense the Contribution of such Contributor, - if any, and such derivative works, in source code and object code form. - b) Subject to the terms of this Agreement, each Contributor hereby grants - Recipient a non-exclusive, worldwide, royalty-free patent license under - Licensed Patents to make, use, sell, offer to sell, import and otherwise - transfer the Contribution of such Contributor, if any, in source code and - object code form. This patent license shall apply to the combination of - the Contribution and the Program if, at the time the Contribution is - added by the Contributor, such addition of the Contribution causes such - combination to be covered by the Licensed Patents. The patent license - shall not apply to any other combinations which include the Contribution. - No hardware per se is licensed hereunder. - c) Recipient understands that although each Contributor grants the licenses - to its Contributions set forth herein, no assurances are provided by any - Contributor that the Program does not infringe the patent or other - intellectual property rights of any other entity. Each Contributor - disclaims any liability to Recipient for claims brought by any other - entity based on infringement of intellectual property rights or - otherwise. As a condition to exercising the rights and licenses granted - hereunder, each Recipient hereby assumes sole responsibility to secure - any other intellectual property rights needed, if any. For example, if a - third party patent license is required to allow Recipient to distribute - the Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - d) Each Contributor represents that to its knowledge it has sufficient - copyright rights in its Contribution, if any, to grant the copyright - license set forth in this Agreement. + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the + rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to grant + the copyright license set forth in this Agreement. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). 3. REQUIREMENTS -A Contributor may choose to distribute the Program in object code form under -its own license agreement, provided that: - - a) it complies with the terms and conditions of this Agreement; and - b) its license agreement: - i) effectively disclaims on behalf of all Contributors all warranties - and conditions, express and implied, including warranties or - conditions of title and non-infringement, and implied warranties or - conditions of merchantability and fitness for a particular purpose; - ii) effectively excludes on behalf of all Contributors all liability for - damages, including direct, indirect, special, incidental and - consequential damages, such as lost profits; - iii) states that any provisions which differ from this Agreement are - offered by that Contributor alone and not by any other party; and - iv) states that source code for the Program is available from such - Contributor, and informs licensees how to obtain it in a reasonable - manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - - a) it must be made available under this Agreement; and - b) a copy of this Agreement must be included with each copy of the Program. - Contributors may not remove or alter any copyright notices contained - within the Program. - -Each Contributor must identify itself as the originator of its Contribution, -if -any, in a manner that reasonably allows subsequent Recipients to identify the -originator of the Contribution. +3.1 If a Contributor Distributes the Program in any form, then: + + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and + + b) a copy of this Agreement must be included with each copy of + the Program. + +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. 4. COMMERCIAL DISTRIBUTION -Commercial distributors of software may accept certain responsibilities with -respect to end users, business partners and the like. While this license is -intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a manner -which does not create potential liability for other Contributors. Therefore, -if a Contributor includes the Program in a commercial product offering, such -Contributor ("Commercial Contributor") hereby agrees to defend and indemnify -every other Contributor ("Indemnified Contributor") against any losses, -damages and costs (collectively "Losses") arising from claims, lawsuits and -other legal actions brought by a third party against the Indemnified -Contributor to the extent caused by the acts or omissions of such Commercial -Contributor in connection with its distribution of the Program in a commercial -product offering. The obligations in this section do not apply to any claims -or Losses relating to any actual or alleged intellectual property -infringement. In order to qualify, an Indemnified Contributor must: -a) promptly notify the Commercial Contributor in writing of such claim, and -b) allow the Commercial Contributor to control, and cooperate with the -Commercial Contributor in, the defense and any related settlement -negotiations. The Indemnified Contributor may participate in any such claim at -its own expense. - -For example, a Contributor might include the Program in a commercial product -offering, Product X. That Contributor is then a Commercial Contributor. If -that Commercial Contributor then makes performance claims, or offers -warranties related to Product X, those performance claims and warranties are -such Commercial Contributor's responsibility alone. Under this section, the -Commercial Contributor would have to defend claims against the other -Contributors related to those performance claims and warranties, and if a -court requires any other Contributor to pay any damages as a result, the -Commercial Contributor must pay those damages. +Commercial distributors of software may accept certain responsibilities +with respect to end users, business partners and the like. While this +license is intended to facilitate the commercial use of the Program, +the Contributor who includes the Program in a commercial product +offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes +the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits +and other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program +in a commercial product offering. The obligations in this section do not +apply to any claims or Losses relating to any actual or alleged +intellectual property infringement. In order to qualify, an Indemnified +Contributor must: a) promptly notify the Commercial Contributor in +writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those performance +claims and warranties, and if a court requires any other Contributor to +pay any damages as a result, the Commercial Contributor must pay +those damages. 5. NO WARRANTY -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each -Recipient is solely responsible for determining the appropriateness of using -and distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to the -risks and costs of program errors, compliance with applicable laws, damage to -or loss of data, programs or equipment, and unavailability or interruption of -operations. +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF +TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR +PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all +risks associated with its exercise of rights under this Agreement, +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs +or equipment, and unavailability or interruption of operations. 6. DISCLAIMER OF LIABILITY -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY -CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION -LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS +SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE -EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY -OF SUCH DAMAGES. +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. 7. GENERAL If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of the -remainder of the terms of this Agreement, and without further action by the -parties hereto, such provision shall be reformed to the minimum extent -necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Program itself -(excluding combinations of the Program with other software or hardware) -infringes such Recipient's patent(s), then such Recipient's rights granted -under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to -comply with any of the material terms or conditions of this Agreement and does -not cure such failure in a reasonable period of time after becoming aware of -such noncompliance. If all Recipient's rights under this Agreement terminate, -Recipient agrees to cease use and distribution of the Program as soon as -reasonably practicable. However, Recipient's obligations under this Agreement -and any licenses granted by Recipient relating to the Program shall continue -and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in -order to avoid inconsistency the Agreement is copyrighted and may only be -modified in the following manner. The Agreement Steward reserves the right to -publish new versions (including revisions) of this Agreement from time to -time. No one other than the Agreement Steward has the right to modify this -Agreement. The Eclipse Foundation is the initial Agreement Steward. The -Eclipse Foundation may assign the responsibility to serve as the Agreement -Steward to a suitable separate entity. Each new version of the Agreement will -be given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version of the -Agreement is published, Contributor may elect to distribute the Program -(including its Contributions) under the new version. Except as expressly -stated in Sections 2(a) and 2(b) above, Recipient receives no rights or -licenses to the intellectual property of any Contributor under this Agreement, -whether expressly, by implication, estoppel or otherwise. All rights in the -Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the -intellectual property laws of the United States of America. No party to this -Agreement will bring a legal action under this Agreement more than one year -after the cause of action arose. Each party waives its rights to a jury trial in -any resulting litigation. +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software +or hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably practicable. +However, Recipient's obligations under this Agreement and any licenses +granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, +but in order to avoid inconsistency the Agreement is copyrighted and +may only be modified in the following manner. The Agreement Steward +reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement +Steward has the right to modify this Agreement. The Eclipse Foundation +is the initial Agreement Steward. The Eclipse Foundation may assign the +responsibility to serve as the Agreement Steward to a suitable separate +entity. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be +Distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to Distribute the Program (including its +Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted +under this Agreement are reserved. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set forth +in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), +version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + + You may add additional accurate notices of copyright ownership. -------------------------------------------------------------------------------- diff --git a/README.adoc b/README.adoc index b94c92b2..820aa1f5 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -// Copyright (c) 2018, 2022 IBM Corporation and others. +// Copyright (c) 2018, 2023 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/ @@ -276,7 +276,7 @@ When the server is running, point your browser to the http://localhost:9080/inve Next, point your browser to the `system` service URL, which is located at http://localhost:9080/system/properties[http://localhost:9080/system/properties^], to retrieve the system properties for the specific localhost. Notice that the results from the two URLs are identical because the `inventory` service gets its results from calling the `system` service. -To see the application metrics, go to the https://localhost:9443/metrics/base[https://localhost:9443/metrics/base^] URL. Log in as the `admin` user, and use `adminpwd` as the password. See the following sample outputs for the `@Fallback` annotated method and the fallback method before a fallback occurs: +To see the application metrics, go to the https://localhost:9443/metrics?scope=base[https://localhost:9443/metrics?scope=base^] URL. Log in as the `admin` user, and use `adminpwd` as the password. See the following sample outputs for the `@Fallback` annotated method and the fallback method before a fallback occurs: endif::[] @@ -298,7 +298,7 @@ Notice that the results from the two URLs are identical because the **inventory* To see the application metrics, run the following curl commmand. This command will Log in using **admin** user, and you will have to enter **adminpwd** as the password. ```bash -curl -k -u admin https://localhost:9443/metrics/base | grep _ft_ +curl -k -u admin https://localhost:9443/metrics?scope=base | grep _ft_ ``` See the following sample outputs for the **@Fallback** annotated method and the fallback method before a fallback occurs: @@ -386,14 +386,14 @@ endif::[] // Following context for the static guide: ifndef::cloud-hosted[] -Go to the https://localhost:9443/metrics/base[https://localhost:9443/metrics/base^] URL again. See the following sample outputs for the `@Fallback` annotated method and the fallback method after a fallback occurs: +Go to the https://localhost:9443/metrics?scope=base[https://localhost:9443/metrics?scope=base^] URL again. See the following sample outputs for the `@Fallback` annotated method and the fallback method after a fallback occurs: endif::[] // Following context for the cloud-hosted guide: ifdef::cloud-hosted[] Run the following curl command again and enter ***adminpwd*** as the password: ```bash -curl -k -u admin https://localhost:9443/metrics/base | grep _ft_ +curl -k -u admin https://localhost:9443/metrics?scope=base | grep _ft_ ``` See the following sample outputs for the ***@Fallback*** annotated method and the fallback method after a fallback occurs: diff --git a/finish/pom.xml b/finish/pom.xml index ba160f5b..119ccf8c 100755 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -11,8 +11,8 @@ UTF-8 UTF-8 - 1.8 - 1.8 + 11 + 11 9080 9443 @@ -23,14 +23,14 @@ jakarta.platform jakarta.jakartaee-api - 9.1.0 + 10.0.0 provided org.eclipse.microprofile microprofile - 5.0 + 6.0 pom provided @@ -39,19 +39,19 @@ org.junit.jupiter junit-jupiter - 5.8.2 + 5.9.2 test org.jboss.resteasy resteasy-client - 6.0.0.Final + 6.2.3.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.0.0.Final + 6.2.3.Final test @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.0.0 @@ -92,7 +92,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.22.2 + 3.0.0 ${liberty.var.default.http.port} diff --git a/finish/src/main/java/io/openliberty/guides/config/CustomConfigSource.java b/finish/src/main/java/io/openliberty/guides/config/CustomConfigSource.java index 5315ff9f..7988fbf5 100755 --- a/finish/src/main/java/io/openliberty/guides/config/CustomConfigSource.java +++ b/finish/src/main/java/io/openliberty/guides/config/CustomConfigSource.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] diff --git a/finish/src/main/java/io/openliberty/guides/inventory/InventoryApplication.java b/finish/src/main/java/io/openliberty/guides/inventory/InventoryApplication.java index a698a92e..df5d9ef2 100755 --- a/finish/src/main/java/io/openliberty/guides/inventory/InventoryApplication.java +++ b/finish/src/main/java/io/openliberty/guides/inventory/InventoryApplication.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2018, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] package io.openliberty.guides.inventory; diff --git a/finish/src/main/java/io/openliberty/guides/inventory/InventoryConfig.java b/finish/src/main/java/io/openliberty/guides/inventory/InventoryConfig.java index 2e84bb47..4396c410 100755 --- a/finish/src/main/java/io/openliberty/guides/inventory/InventoryConfig.java +++ b/finish/src/main/java/io/openliberty/guides/inventory/InventoryConfig.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2018, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] diff --git a/finish/src/main/java/io/openliberty/guides/inventory/InventoryManager.java b/finish/src/main/java/io/openliberty/guides/inventory/InventoryManager.java index 949fee05..1697ccb9 100755 --- a/finish/src/main/java/io/openliberty/guides/inventory/InventoryManager.java +++ b/finish/src/main/java/io/openliberty/guides/inventory/InventoryManager.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] package io.openliberty.guides.inventory; diff --git a/finish/src/main/java/io/openliberty/guides/inventory/InventoryResource.java b/finish/src/main/java/io/openliberty/guides/inventory/InventoryResource.java index 090ce2d6..a2941516 100755 --- a/finish/src/main/java/io/openliberty/guides/inventory/InventoryResource.java +++ b/finish/src/main/java/io/openliberty/guides/inventory/InventoryResource.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] diff --git a/finish/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java b/finish/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java index f9495cf0..d3d81a2c 100644 --- a/finish/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java +++ b/finish/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] package io.openliberty.guides.inventory; diff --git a/finish/src/main/java/io/openliberty/guides/inventory/client/ExceptionMapper.java b/finish/src/main/java/io/openliberty/guides/inventory/client/ExceptionMapper.java index 29eacab3..1e413ff0 100644 --- a/finish/src/main/java/io/openliberty/guides/inventory/client/ExceptionMapper.java +++ b/finish/src/main/java/io/openliberty/guides/inventory/client/ExceptionMapper.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] // tag::mapper[] diff --git a/finish/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java b/finish/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java index b40f3feb..1d5b151e 100644 --- a/finish/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java +++ b/finish/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] // tag::client[] diff --git a/finish/src/main/java/io/openliberty/guides/inventory/client/UnknownUrlException.java b/finish/src/main/java/io/openliberty/guides/inventory/client/UnknownUrlException.java index 45e740b6..d7d6bf39 100644 --- a/finish/src/main/java/io/openliberty/guides/inventory/client/UnknownUrlException.java +++ b/finish/src/main/java/io/openliberty/guides/inventory/client/UnknownUrlException.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] // tag::exception[] diff --git a/finish/src/main/java/io/openliberty/guides/inventory/model/InventoryList.java b/finish/src/main/java/io/openliberty/guides/inventory/model/InventoryList.java index 40469799..157a4e1c 100644 --- a/finish/src/main/java/io/openliberty/guides/inventory/model/InventoryList.java +++ b/finish/src/main/java/io/openliberty/guides/inventory/model/InventoryList.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] package io.openliberty.guides.inventory.model; @@ -29,4 +28,4 @@ public List getSystems() { public int getTotal() { return systems.size(); } -} \ No newline at end of file +} diff --git a/finish/src/main/java/io/openliberty/guides/inventory/model/SystemData.java b/finish/src/main/java/io/openliberty/guides/inventory/model/SystemData.java index 99e90e11..fd11882e 100644 --- a/finish/src/main/java/io/openliberty/guides/inventory/model/SystemData.java +++ b/finish/src/main/java/io/openliberty/guides/inventory/model/SystemData.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] package io.openliberty.guides.inventory.model; @@ -39,4 +38,4 @@ public boolean equals(Object host) { } return false; } -} \ No newline at end of file +} diff --git a/finish/src/main/java/io/openliberty/guides/system/SystemApplication.java b/finish/src/main/java/io/openliberty/guides/system/SystemApplication.java index d3444518..d290f257 100755 --- a/finish/src/main/java/io/openliberty/guides/system/SystemApplication.java +++ b/finish/src/main/java/io/openliberty/guides/system/SystemApplication.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] package io.openliberty.guides.system; diff --git a/finish/src/main/java/io/openliberty/guides/system/SystemConfig.java b/finish/src/main/java/io/openliberty/guides/system/SystemConfig.java index cd141f4a..d66e41b1 100755 --- a/finish/src/main/java/io/openliberty/guides/system/SystemConfig.java +++ b/finish/src/main/java/io/openliberty/guides/system/SystemConfig.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] diff --git a/finish/src/main/java/io/openliberty/guides/system/SystemResource.java b/finish/src/main/java/io/openliberty/guides/system/SystemResource.java index b1b8bfce..d4c84c4f 100755 --- a/finish/src/main/java/io/openliberty/guides/system/SystemResource.java +++ b/finish/src/main/java/io/openliberty/guides/system/SystemResource.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] // tag::503_response[] diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml index 2bac1da7..d4157fb5 100755 --- a/finish/src/main/liberty/config/server.xml +++ b/finish/src/main/liberty/config/server.xml @@ -1,17 +1,17 @@ - restfulWS-3.0 - jsonb-2.0 - jsonp-2.0 - cdi-3.0 + restfulWS-3.1 + jsonb-3.0 + jsonp-2.1 + cdi-4.0 mpConfig-3.0 mpRestClient-3.0 mpFaultTolerance-4.0 - mpMetrics-4.0 + mpMetrics-5.0 diff --git a/finish/src/main/webapp/index.html b/finish/src/main/webapp/index.html index 7f6b9516..84530cc6 100755 --- a/finish/src/main/webapp/index.html +++ b/finish/src/main/webapp/index.html @@ -1,5 +1,5 @@ 9080 9443 @@ -23,7 +23,7 @@ jakarta.platform jakarta.jakartaee-api - 9.1.0 + 10.0.0 provided @@ -31,7 +31,7 @@ microprofile - 5.0 + 6.0 pom provided @@ -39,19 +39,19 @@ org.junit.jupiter junit-jupiter - 5.8.2 + 5.9.2 test org.jboss.resteasy resteasy-client - 6.0.0.Final + 6.2.3.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.0.0.Final + 6.2.3.Final test @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.0.0 @@ -92,7 +92,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.22.2 + 3.0.0 ${liberty.var.default.http.port} diff --git a/start/src/main/java/io/openliberty/guides/config/CustomConfigSource.java b/start/src/main/java/io/openliberty/guides/config/CustomConfigSource.java index 40831b21..0e079182 100644 --- a/start/src/main/java/io/openliberty/guides/config/CustomConfigSource.java +++ b/start/src/main/java/io/openliberty/guides/config/CustomConfigSource.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] diff --git a/start/src/main/java/io/openliberty/guides/inventory/InventoryApplication.java b/start/src/main/java/io/openliberty/guides/inventory/InventoryApplication.java index a698a92e..df5d9ef2 100644 --- a/start/src/main/java/io/openliberty/guides/inventory/InventoryApplication.java +++ b/start/src/main/java/io/openliberty/guides/inventory/InventoryApplication.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2018, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] package io.openliberty.guides.inventory; diff --git a/start/src/main/java/io/openliberty/guides/inventory/InventoryConfig.java b/start/src/main/java/io/openliberty/guides/inventory/InventoryConfig.java index 2e84bb47..4396c410 100644 --- a/start/src/main/java/io/openliberty/guides/inventory/InventoryConfig.java +++ b/start/src/main/java/io/openliberty/guides/inventory/InventoryConfig.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2018, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] diff --git a/start/src/main/java/io/openliberty/guides/inventory/InventoryManager.java b/start/src/main/java/io/openliberty/guides/inventory/InventoryManager.java index ef69cea9..4b39cd54 100644 --- a/start/src/main/java/io/openliberty/guides/inventory/InventoryManager.java +++ b/start/src/main/java/io/openliberty/guides/inventory/InventoryManager.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] package io.openliberty.guides.inventory; diff --git a/start/src/main/java/io/openliberty/guides/inventory/InventoryResource.java b/start/src/main/java/io/openliberty/guides/inventory/InventoryResource.java index 01cc0332..141ca580 100644 --- a/start/src/main/java/io/openliberty/guides/inventory/InventoryResource.java +++ b/start/src/main/java/io/openliberty/guides/inventory/InventoryResource.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] diff --git a/start/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java b/start/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java index ee9f0e9f..ad10aac7 100644 --- a/start/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java +++ b/start/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] package io.openliberty.guides.inventory; diff --git a/start/src/main/java/io/openliberty/guides/inventory/client/ExceptionMapper.java b/start/src/main/java/io/openliberty/guides/inventory/client/ExceptionMapper.java index 02bfc1dd..23743585 100644 --- a/start/src/main/java/io/openliberty/guides/inventory/client/ExceptionMapper.java +++ b/start/src/main/java/io/openliberty/guides/inventory/client/ExceptionMapper.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] // tag::mapper[] diff --git a/start/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java b/start/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java index 30c96263..3eef1747 100644 --- a/start/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java +++ b/start/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] // tag::client[] diff --git a/start/src/main/java/io/openliberty/guides/inventory/client/UnknownUrlException.java b/start/src/main/java/io/openliberty/guides/inventory/client/UnknownUrlException.java index 45e740b6..d7d6bf39 100644 --- a/start/src/main/java/io/openliberty/guides/inventory/client/UnknownUrlException.java +++ b/start/src/main/java/io/openliberty/guides/inventory/client/UnknownUrlException.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] // tag::exception[] diff --git a/start/src/main/java/io/openliberty/guides/inventory/model/InventoryList.java b/start/src/main/java/io/openliberty/guides/inventory/model/InventoryList.java index 40469799..157a4e1c 100644 --- a/start/src/main/java/io/openliberty/guides/inventory/model/InventoryList.java +++ b/start/src/main/java/io/openliberty/guides/inventory/model/InventoryList.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] package io.openliberty.guides.inventory.model; @@ -29,4 +28,4 @@ public List getSystems() { public int getTotal() { return systems.size(); } -} \ No newline at end of file +} diff --git a/start/src/main/java/io/openliberty/guides/inventory/model/SystemData.java b/start/src/main/java/io/openliberty/guides/inventory/model/SystemData.java index 99e90e11..fd11882e 100644 --- a/start/src/main/java/io/openliberty/guides/inventory/model/SystemData.java +++ b/start/src/main/java/io/openliberty/guides/inventory/model/SystemData.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2018 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] package io.openliberty.guides.inventory.model; @@ -39,4 +38,4 @@ public boolean equals(Object host) { } return false; } -} \ No newline at end of file +} diff --git a/start/src/main/java/io/openliberty/guides/system/SystemApplication.java b/start/src/main/java/io/openliberty/guides/system/SystemApplication.java index d3444518..d290f257 100644 --- a/start/src/main/java/io/openliberty/guides/system/SystemApplication.java +++ b/start/src/main/java/io/openliberty/guides/system/SystemApplication.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] package io.openliberty.guides.system; diff --git a/start/src/main/java/io/openliberty/guides/system/SystemConfig.java b/start/src/main/java/io/openliberty/guides/system/SystemConfig.java index cd141f4a..d66e41b1 100644 --- a/start/src/main/java/io/openliberty/guides/system/SystemConfig.java +++ b/start/src/main/java/io/openliberty/guides/system/SystemConfig.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] diff --git a/start/src/main/java/io/openliberty/guides/system/SystemResource.java b/start/src/main/java/io/openliberty/guides/system/SystemResource.java index 2867468a..bc14a6d7 100644 --- a/start/src/main/java/io/openliberty/guides/system/SystemResource.java +++ b/start/src/main/java/io/openliberty/guides/system/SystemResource.java @@ -2,12 +2,11 @@ /******************************************************************************* * Copyright (c) 2017, 2022 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * http://www.eclipse.org/legal/epl-2.0/ * - * Contributors: - * IBM Corporation - Initial implementation + * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ // end::copyright[] // tag::503_response[] diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml index 2bac1da7..d4157fb5 100755 --- a/start/src/main/liberty/config/server.xml +++ b/start/src/main/liberty/config/server.xml @@ -1,17 +1,17 @@ - restfulWS-3.0 - jsonb-2.0 - jsonp-2.0 - cdi-3.0 + restfulWS-3.1 + jsonb-3.0 + jsonp-2.1 + cdi-4.0 mpConfig-3.0 mpRestClient-3.0 mpFaultTolerance-4.0 - mpMetrics-4.0 + mpMetrics-5.0 diff --git a/start/src/main/webapp/index.html b/start/src/main/webapp/index.html index 7f6b9516..84530cc6 100644 --- a/start/src/main/webapp/index.html +++ b/start/src/main/webapp/index.html @@ -1,5 +1,5 @@ diff --git a/start/pom.xml b/start/pom.xml index 28645ea4..b5a8a35f 100755 --- a/start/pom.xml +++ b/start/pom.xml @@ -86,7 +86,7 @@ io.openliberty.tools liberty-maven-plugin - 3.7.1 + 3.8.2 From d39f559d39f29275cd5094c38bfc4380a8370356 Mon Sep 17 00:00:00 2001 From: saumyapandyaa <64671058+saumyapandyaa@users.noreply.github.com> Date: Fri, 13 Oct 2023 12:21:59 -0400 Subject: [PATCH 06/19] updated to use quit-ctrlc (#205) Co-authored-by: Gilbert Kwan --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 433b27a2..c4c0e1dd 100644 --- a/README.adoc +++ b/README.adoc @@ -503,7 +503,7 @@ Tests run: 6, Failures: 0, Errors: 0, Skipped: 0 To see if the tests detect a failure, comment out the [hotspot=changeSystemProperty1 hotspot=changeSystemProperty2]`changeSystemProperty()` methods in the [hotspot]`FaultToleranceIT.java` file. Rerun the tests to see that a test failure occurs for the [hotspot=testFallbackForGet]`testFallbackForGet()` and [hotspot=testFallbackSkipForGet]`testFallbackSkipForGet()` test cases. [role='command'] -include::{common-includes}/devmode-quit.adoc[] +include::{common-includes}/devmode-quit-ctrlc.adoc[] // ================================================================================================= // Great work! You're done! From 8d551249b6510b701e40b479e2d90acb0c244c78 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 14 Feb 2024 18:01:33 -0500 Subject: [PATCH 07/19] Update to MP6.1 (#207) * update versions * update versions --- .github/dependabot.yml | 7 ++++++ finish/pom.xml | 22 +++++++++---------- .../guides/inventory/InventoryUtils.java | 6 ++--- finish/src/main/liberty/config/server.xml | 12 +++++----- finish/src/main/webapp/index.html | 8 +++---- start/pom.xml | 20 ++++++++--------- .../guides/inventory/InventoryUtils.java | 6 ++--- start/src/main/liberty/config/server.xml | 12 +++++----- start/src/main/webapp/index.html | 8 +++---- 9 files changed, 54 insertions(+), 47 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..00dad748 --- /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/finish/pom.xml b/finish/pom.xml index b4f6d580..ca849c5a 100755 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -14,8 +14,8 @@ 11 11 - 9080 - 9443 + 9080 + 9443 @@ -30,7 +30,7 @@ org.eclipse.microprofile microprofile - 6.0 + 6.1 pom provided @@ -39,19 +39,19 @@ org.junit.jupiter junit-jupiter - 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 @@ -64,7 +64,7 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.14.0 @@ -80,22 +80,22 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.2.5 io.openliberty.tools liberty-maven-plugin - 3.8.2 + 3.10 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/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java b/finish/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java index d3d81a2c..8bf8c69c 100644 --- a/finish/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java +++ b/finish/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2022 IBM Corporation and others. + * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -25,12 +25,12 @@ public class InventoryUtils { - private final String DEFAULT_PORT = System.getProperty("default.http.port", "9080"); + private final String HTTP_PORT = System.getProperty("http.port", "9080"); // tag::builder[] public Properties getProperties(String hostname) throws IOException { - String customURLString = "http://" + hostname + ":" + DEFAULT_PORT + "/system"; + String customURLString = "http://" + hostname + ":" + HTTP_PORT + "/system"; URL customURL; try { customURL = new URL(customURLString); diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml index d4157fb5..0fc30343 100755 --- a/finish/src/main/liberty/config/server.xml +++ b/finish/src/main/liberty/config/server.xml @@ -5,25 +5,25 @@ jsonb-3.0 jsonp-2.1 cdi-4.0 - mpConfig-3.0 + mpConfig-3.1 mpRestClient-3.0 mpFaultTolerance-4.0 - mpMetrics-5.0 + mpMetrics-5.1 - - + + - + diff --git a/finish/src/main/webapp/index.html b/finish/src/main/webapp/index.html index 84530cc6..15c97869 100755 --- a/finish/src/main/webapp/index.html +++ b/finish/src/main/webapp/index.html @@ -1,5 +1,5 @@ - 9080 - 9443 + 9080 + 9443 @@ -39,19 +39,19 @@ org.junit.jupiter junit-jupiter - 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 @@ -64,7 +64,7 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.14.0 @@ -80,22 +80,22 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.2.5 io.openliberty.tools liberty-maven-plugin - 3.8.2 + 3.10 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/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java b/start/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java index ad10aac7..46165fe5 100644 --- a/start/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java +++ b/start/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java @@ -1,6 +1,6 @@ // tag::copyright[] /******************************************************************************* - * Copyright (c) 2017, 2022 IBM Corporation and others. + * Copyright (c) 2017, 2024 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -25,12 +25,12 @@ public class InventoryUtils { - private final String DEFAULT_PORT = System.getProperty("default.http.port", "9080"); + private final String HTTP_PORT = System.getProperty("http.port", "9080"); // tag::builder[] public Properties getProperties(String hostname) throws IOException { - String customURLString = "http://" + hostname + ":" + DEFAULT_PORT + "/system"; + String customURLString = "http://" + hostname + ":" + HTTP_PORT + "/system"; URL customURL; try { customURL = new URL(customURLString); diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml index d4157fb5..0fc30343 100755 --- a/start/src/main/liberty/config/server.xml +++ b/start/src/main/liberty/config/server.xml @@ -5,25 +5,25 @@ jsonb-3.0 jsonp-2.1 cdi-4.0 - mpConfig-3.0 + mpConfig-3.1 mpRestClient-3.0 mpFaultTolerance-4.0 - mpMetrics-5.0 + mpMetrics-5.1 - - + + - + diff --git a/start/src/main/webapp/index.html b/start/src/main/webapp/index.html index 84530cc6..15c97869 100644 --- a/start/src/main/webapp/index.html +++ b/start/src/main/webapp/index.html @@ -1,5 +1,5 @@ @@ -86,7 +86,7 @@ io.openliberty.tools liberty-maven-plugin - 3.10 + 3.10.2 diff --git a/start/pom.xml b/start/pom.xml old mode 100755 new mode 100644 index 377ee457..28f2e5f8 --- a/start/pom.xml +++ b/start/pom.xml @@ -31,7 +31,7 @@ microprofile - 6.0 + 6.1 pom provided @@ -39,7 +39,7 @@ org.junit.jupiter junit-jupiter - 5.10.1 + 5.10.2 test @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-war-plugin - 3.3.2 + 3.4.0 @@ -86,7 +86,7 @@ io.openliberty.tools liberty-maven-plugin - 3.10 + 3.10.2 From 977716658e859109f70e33b8c7ff65b19ab3fd49 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Tue, 2 Apr 2024 12:23:57 -0400 Subject: [PATCH 11/19] Dependabot Bump (#226) * Bump org.jboss.resteasy:resteasy-client in /finish Bumps [org.jboss.resteasy:resteasy-client](https://github.com/resteasy/resteasy) from 6.2.7.Final to 6.2.8.Final. - [Release notes](https://github.com/resteasy/resteasy/releases) - [Commits](https://github.com/resteasy/resteasy/compare/6.2.7.Final...6.2.8.Final) --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-client dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-json-binding-provider in /finish Bumps org.jboss.resteasy:resteasy-json-binding-provider from 6.2.7.Final to 6.2.8.Final. --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-json-binding-provider dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-client in /start Bumps [org.jboss.resteasy:resteasy-client](https://github.com/resteasy/resteasy) from 6.2.7.Final to 6.2.8.Final. - [Release notes](https://github.com/resteasy/resteasy/releases) - [Commits](https://github.com/resteasy/resteasy/compare/6.2.7.Final...6.2.8.Final) --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-client dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-json-binding-provider in /start Bumps org.jboss.resteasy:resteasy-json-binding-provider from 6.2.7.Final to 6.2.8.Final. --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-json-binding-provider dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- finish/pom.xml | 4 ++-- start/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/finish/pom.xml b/finish/pom.xml index d4c6343b..ad8d2313 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -45,13 +45,13 @@ org.jboss.resteasy resteasy-client - 6.2.7.Final + 6.2.8.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.7.Final + 6.2.8.Final test diff --git a/start/pom.xml b/start/pom.xml index 28f2e5f8..76d0bfa6 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -45,13 +45,13 @@ org.jboss.resteasy resteasy-client - 6.2.7.Final + 6.2.8.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.7.Final + 6.2.8.Final test From 92b6594929796f17a94cfabaa43b93450c727f3f Mon Sep 17 00:00:00 2001 From: Siwan Yang <123605713+siwany@users.noreply.github.com> Date: Tue, 28 May 2024 13:47:23 -0400 Subject: [PATCH 12/19] Update test.yml (#228) * update the superlinter to latest Signed-off-by: Siwan Yang * remove file Signed-off-by: Siwan Yang --------- Signed-off-by: Siwan Yang Co-authored-by: Gilbert Kwan --- .github/workflows/add-pr-to-project.yml | 18 ------------------ .github/workflows/test.yml | 12 ++++++------ 2 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 .github/workflows/add-pr-to-project.yml diff --git a/.github/workflows/add-pr-to-project.yml b/.github/workflows/add-pr-to-project.yml deleted file mode 100644 index 0b1643a7..00000000 --- a/.github/workflows/add-pr-to-project.yml +++ /dev/null @@ -1,18 +0,0 @@ -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/.github/workflows/test.yml b/.github/workflows/test.yml index fd07de47..86de6647 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,18 +22,18 @@ jobs: shell: bash run: bash ./tools/pr-checker/checker.sh ${{ github.repository }} ${{ github.event.pull_request.number }} | tee checker.log - id: Lint-Code-Base - if: always() - uses: github/super-linter@v3.17.0 + if: "! github.event.pull_request.head.repo.fork" + uses: github/super-linter@latest env: VALIDATE_ALL_CODEBASE: false GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} LINTER_RULES_PATH: ./tools/pr-checker/linters/ DEFAULT_BRANCH: prod - name: Summary - if: always() + if: "! github.event.pull_request.head.repo.fork" run: | - cat ./checker.log | tail -n +2; echo "====== Super Linter ======" - cat ./super-linter.log | sed -n '/.*The script has completed.*/,$p' | tail -n +4 | sed 's/.*\(\[[A-Z]\+\]\)/\1/' + < ./checker.log tail -n +2; echo "====== Super Linter ======" + < ./super-linter.log sed -n '/.*The script has completed.*/,$p' | tail -n +4 | sed 's/.*\(\[[A-Z]\+\]\)/\1/' echo "====== Examine logs in Checker and Super-Linter steps for more details ======" if [ '${{ steps.Checker.outcome }}' != 'success' ] || [ '${{ steps.Lint-Code-Base.outcome }}' != 'success' ]; then exit 1; fi test-app: @@ -59,7 +59,7 @@ jobs: if: always() run: | logsPath=$(sudo find . -name "console.log"); - sudo cat $logsPath | sudo grep Launching + sudo cat "$logsPath" | sudo grep Launching - name: Archive server logs if failed if: failure() From e74c134acfa8c4538fea4e60e8e90b535fa979c8 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Fri, 7 Jun 2024 12:13:12 -0400 Subject: [PATCH 13/19] Dependabot Bump (#236) * Bump org.jboss.resteasy:resteasy-client in /start Bumps [org.jboss.resteasy:resteasy-client](https://github.com/resteasy/resteasy) from 6.2.8.Final to 6.2.9.Final. - [Release notes](https://github.com/resteasy/resteasy/releases) - [Commits](https://github.com/resteasy/resteasy/compare/6.2.8.Final...6.2.9.Final) --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-client dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump io.openliberty.tools:liberty-maven-plugin in /start Bumps [io.openliberty.tools:liberty-maven-plugin](https://github.com/OpenLiberty/ci.maven) from 3.10.2 to 3.10.3. - [Release notes](https://github.com/OpenLiberty/ci.maven/releases) - [Commits](https://github.com/OpenLiberty/ci.maven/compare/liberty-maven-3.10.2...liberty-maven-3.10.3) --- updated-dependencies: - dependency-name: io.openliberty.tools:liberty-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-json-binding-provider in /start Bumps org.jboss.resteasy:resteasy-json-binding-provider from 6.2.8.Final to 6.2.9.Final. --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-json-binding-provider dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump io.openliberty.tools:liberty-maven-plugin in /finish Bumps [io.openliberty.tools:liberty-maven-plugin](https://github.com/OpenLiberty/ci.maven) from 3.10.2 to 3.10.3. - [Release notes](https://github.com/OpenLiberty/ci.maven/releases) - [Commits](https://github.com/OpenLiberty/ci.maven/compare/liberty-maven-3.10.2...liberty-maven-3.10.3) --- updated-dependencies: - dependency-name: io.openliberty.tools:liberty-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-json-binding-provider in /finish Bumps org.jboss.resteasy:resteasy-json-binding-provider from 6.2.8.Final to 6.2.9.Final. --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-json-binding-provider dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-client in /finish Bumps [org.jboss.resteasy:resteasy-client](https://github.com/resteasy/resteasy) from 6.2.8.Final to 6.2.9.Final. - [Release notes](https://github.com/resteasy/resteasy/releases) - [Commits](https://github.com/resteasy/resteasy/compare/6.2.8.Final...6.2.9.Final) --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-client dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- finish/pom.xml | 6 +++--- start/pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/finish/pom.xml b/finish/pom.xml index ad8d2313..d16b51ee 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -45,13 +45,13 @@ org.jboss.resteasy resteasy-client - 6.2.8.Final + 6.2.9.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.8.Final + 6.2.9.Final test @@ -86,7 +86,7 @@ io.openliberty.tools liberty-maven-plugin - 3.10.2 + 3.10.3 diff --git a/start/pom.xml b/start/pom.xml index 76d0bfa6..880a4da4 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -45,13 +45,13 @@ org.jboss.resteasy resteasy-client - 6.2.8.Final + 6.2.9.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.8.Final + 6.2.9.Final test @@ -86,7 +86,7 @@ io.openliberty.tools liberty-maven-plugin - 3.10.2 + 3.10.3 From 39266613fa33bbe4c4beabeb7f0f282fd23efd98 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 4 Jul 2024 12:11:56 -0400 Subject: [PATCH 14/19] Dependabot Bump (#244) * Bump org.apache.maven.plugins:maven-surefire-plugin in /finish Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.5...surefire-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.junit.jupiter:junit-jupiter from 5.10.2 to 5.10.3 in /finish Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-failsafe-plugin in /finish Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.5...surefire-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-surefire-plugin in /start Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.5...surefire-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.junit.jupiter:junit-jupiter from 5.10.2 to 5.10.3 in /start Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.2...r5.10.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-failsafe-plugin in /start Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.5...surefire-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- finish/pom.xml | 6 +++--- start/pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/finish/pom.xml b/finish/pom.xml index d16b51ee..5ca5233b 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -39,7 +39,7 @@ org.junit.jupiter junit-jupiter - 5.10.2 + 5.10.3 test @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.3.0 @@ -92,7 +92,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.2.5 + 3.3.0 ${liberty.var.http.port} diff --git a/start/pom.xml b/start/pom.xml index 880a4da4..8897f958 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -39,7 +39,7 @@ org.junit.jupiter junit-jupiter - 5.10.2 + 5.10.3 test @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.3.0 @@ -92,7 +92,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.2.5 + 3.3.0 ${liberty.var.http.port} From 30f08daa7c9ea0eb6b3ca4718bf0b79081a25696 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 7 Aug 2024 16:39:15 -0400 Subject: [PATCH 15/19] Dependabot Bump (#252) * Bump org.apache.maven.plugins:maven-surefire-plugin in /finish Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-failsafe-plugin in /finish Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0 in /finish Bumps org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-surefire-plugin in /start Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-failsafe-plugin in /start Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.0...surefire-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0 in /start Bumps org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- finish/pom.xml | 6 +++--- start/pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/finish/pom.xml b/finish/pom.xml index 5ca5233b..ff7c33e6 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -64,7 +64,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.15.0 @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + 3.3.1 @@ -92,7 +92,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.3.0 + 3.3.1 ${liberty.var.http.port} diff --git a/start/pom.xml b/start/pom.xml index 8897f958..e5090955 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -64,7 +64,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.15.0 @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + 3.3.1 @@ -92,7 +92,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.3.0 + 3.3.1 ${liberty.var.http.port} From 32de727d41b33c3e28a6b2e95499f1480f67e618 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 4 Sep 2024 16:11:58 -0400 Subject: [PATCH 16/19] Dependabot Bump (#268) * Bump org.apache.maven.plugins:maven-failsafe-plugin in /finish Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.1...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-surefire-plugin in /finish Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.1...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-client in /finish Bumps [org.jboss.resteasy:resteasy-client](https://github.com/resteasy/resteasy) from 6.2.9.Final to 6.2.10.Final. - [Release notes](https://github.com/resteasy/resteasy/releases) - [Commits](https://github.com/resteasy/resteasy/compare/6.2.9.Final...6.2.10.Final) --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-client dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-json-binding-provider in /finish Bumps org.jboss.resteasy:resteasy-json-binding-provider from 6.2.9.Final to 6.2.10.Final. --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-json-binding-provider dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.junit.jupiter:junit-jupiter from 5.10.3 to 5.11.0 in /finish Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.3 to 5.11.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0 in /finish Bumps org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-surefire-plugin in /start Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.1...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.junit.jupiter:junit-jupiter from 5.10.3 to 5.11.0 in /start Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.3 to 5.11.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.3...r5.11.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-failsafe-plugin in /start Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.1...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-json-binding-provider in /start Bumps org.jboss.resteasy:resteasy-json-binding-provider from 6.2.9.Final to 6.2.10.Final. --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-json-binding-provider dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0 in /start Bumps org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-client in /start Bumps [org.jboss.resteasy:resteasy-client](https://github.com/resteasy/resteasy) from 6.2.9.Final to 6.2.10.Final. - [Release notes](https://github.com/resteasy/resteasy/releases) - [Commits](https://github.com/resteasy/resteasy/compare/6.2.9.Final...6.2.10.Final) --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-client dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * update upload-artifact to v4 and restore reactive dependencies Signed-off-by: Gilbert Kwan --------- Signed-off-by: dependabot[bot] Signed-off-by: Gilbert Kwan Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 2 +- finish/pom.xml | 12 ++++++------ start/pom.xml | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 86de6647..283aa65a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,7 +63,7 @@ jobs: - name: Archive server logs if failed if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: server-logs path: finish/target/liberty/wlp/usr/servers/defaultServer/logs/ diff --git a/finish/pom.xml b/finish/pom.xml index ff7c33e6..7d419942 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -39,19 +39,19 @@ org.junit.jupiter junit-jupiter - 5.10.3 + 5.11.0 test org.jboss.resteasy resteasy-client - 6.2.9.Final + 6.2.10.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.9.Final + 6.2.10.Final test @@ -64,7 +64,7 @@ org.apache.commons commons-lang3 - 3.15.0 + 3.17.0 @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.1 + 3.5.0 @@ -92,7 +92,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.3.1 + 3.5.0 ${liberty.var.http.port} diff --git a/start/pom.xml b/start/pom.xml index e5090955..cf3bfcb1 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -39,19 +39,19 @@ org.junit.jupiter junit-jupiter - 5.10.3 + 5.11.0 test org.jboss.resteasy resteasy-client - 6.2.9.Final + 6.2.10.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.9.Final + 6.2.10.Final test @@ -64,7 +64,7 @@ org.apache.commons commons-lang3 - 3.15.0 + 3.17.0 @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.1 + 3.5.0 @@ -92,7 +92,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.3.1 + 3.5.0 ${liberty.var.http.port} From 9f0ed8600377365fb96449ebb112a7604184bcf7 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 2 Oct 2024 17:05:40 -0400 Subject: [PATCH 17/19] Dependabot Bump (#272) * Bump org.junit.jupiter:junit-jupiter from 5.11.0 to 5.11.1 in /finish Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.11.0 to 5.11.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.0...r5.11.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.junit.jupiter:junit-jupiter from 5.11.0 to 5.11.1 in /start Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.11.0 to 5.11.1. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.0...r5.11.1) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- finish/pom.xml | 2 +- start/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/finish/pom.xml b/finish/pom.xml index 7d419942..3c8eea69 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -39,7 +39,7 @@ org.junit.jupiter junit-jupiter - 5.11.0 + 5.11.1 test diff --git a/start/pom.xml b/start/pom.xml index cf3bfcb1..7de6fa72 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -39,7 +39,7 @@ org.junit.jupiter junit-jupiter - 5.11.0 + 5.11.1 test From 0ce6a7e2ad4e6978bb89059f5c282534f898c322 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Tue, 5 Nov 2024 11:39:14 -0500 Subject: [PATCH 18/19] Dependabot Bump (#282) * Bump org.apache.maven.plugins:maven-failsafe-plugin in /finish Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.0...surefire-3.5.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-surefire-plugin in /finish Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.0...surefire-3.5.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump io.openliberty.tools:liberty-maven-plugin in /finish Bumps [io.openliberty.tools:liberty-maven-plugin](https://github.com/OpenLiberty/ci.maven) from 3.10.3 to 3.11.1. - [Release notes](https://github.com/OpenLiberty/ci.maven/releases) - [Commits](https://github.com/OpenLiberty/ci.maven/compare/liberty-maven-3.10.3...liberty-maven-3.11.1) --- updated-dependencies: - dependency-name: io.openliberty.tools:liberty-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump org.junit.jupiter:junit-jupiter from 5.11.1 to 5.11.3 in /finish Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.11.1 to 5.11.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.1...r5.11.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.junit.jupiter:junit-jupiter from 5.11.1 to 5.11.3 in /start Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.11.1 to 5.11.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.1...r5.11.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-failsafe-plugin in /start Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.0...surefire-3.5.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-surefire-plugin in /start Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.0...surefire-3.5.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump io.openliberty.tools:liberty-maven-plugin in /start Bumps [io.openliberty.tools:liberty-maven-plugin](https://github.com/OpenLiberty/ci.maven) from 3.10.3 to 3.11.1. - [Release notes](https://github.com/OpenLiberty/ci.maven/releases) - [Commits](https://github.com/OpenLiberty/ci.maven/compare/liberty-maven-3.10.3...liberty-maven-3.11.1) --- updated-dependencies: - dependency-name: io.openliberty.tools:liberty-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- finish/pom.xml | 8 ++++---- start/pom.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/finish/pom.xml b/finish/pom.xml index 3c8eea69..4bfa302d 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -39,7 +39,7 @@ org.junit.jupiter junit-jupiter - 5.11.1 + 5.11.3 test @@ -80,19 +80,19 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.0 + 3.5.1 io.openliberty.tools liberty-maven-plugin - 3.10.3 + 3.11.1 org.apache.maven.plugins maven-failsafe-plugin - 3.5.0 + 3.5.1 ${liberty.var.http.port} diff --git a/start/pom.xml b/start/pom.xml index 7de6fa72..a37cdba7 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -39,7 +39,7 @@ org.junit.jupiter junit-jupiter - 5.11.1 + 5.11.3 test @@ -80,19 +80,19 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.0 + 3.5.1 io.openliberty.tools liberty-maven-plugin - 3.10.3 + 3.11.1 org.apache.maven.plugins maven-failsafe-plugin - 3.5.0 + 3.5.1 ${liberty.var.http.port} From b06c261b335fbb1298c057c70a9120b9841720e5 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Tue, 3 Dec 2024 17:47:47 -0500 Subject: [PATCH 19/19] Dependabot Bump (#293) * Bump org.jboss.resteasy:resteasy-client in /start Bumps [org.jboss.resteasy:resteasy-client](https://github.com/resteasy/resteasy) from 6.2.10.Final to 6.2.11.Final. - [Release notes](https://github.com/resteasy/resteasy/releases) - [Commits](https://github.com/resteasy/resteasy/compare/6.2.10.Final...6.2.11.Final) --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-client dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-surefire-plugin in /start Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-failsafe-plugin in /start Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-json-binding-provider in /start Bumps org.jboss.resteasy:resteasy-json-binding-provider from 6.2.10.Final to 6.2.11.Final. --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-json-binding-provider dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-failsafe-plugin in /finish Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-client in /finish Bumps [org.jboss.resteasy:resteasy-client](https://github.com/resteasy/resteasy) from 6.2.10.Final to 6.2.11.Final. - [Release notes](https://github.com/resteasy/resteasy/releases) - [Commits](https://github.com/resteasy/resteasy/compare/6.2.10.Final...6.2.11.Final) --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-client dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-surefire-plugin in /finish Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.jboss.resteasy:resteasy-json-binding-provider in /finish Bumps org.jboss.resteasy:resteasy-json-binding-provider from 6.2.10.Final to 6.2.11.Final. --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-json-binding-provider dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- finish/pom.xml | 8 ++++---- start/pom.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/finish/pom.xml b/finish/pom.xml index 4bfa302d..161bf6db 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -45,13 +45,13 @@ org.jboss.resteasy resteasy-client - 6.2.10.Final + 6.2.11.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.10.Final + 6.2.11.Final test @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.1 + 3.5.2 @@ -92,7 +92,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.1 + 3.5.2 ${liberty.var.http.port} diff --git a/start/pom.xml b/start/pom.xml index a37cdba7..f0509519 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -45,13 +45,13 @@ org.jboss.resteasy resteasy-client - 6.2.10.Final + 6.2.11.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.10.Final + 6.2.11.Final test @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.1 + 3.5.2 @@ -92,7 +92,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.1 + 3.5.2 ${liberty.var.http.port}