From fee90ed1a15348f43a28b1855e311f5bb137d578 Mon Sep 17 00:00:00 2001 From: Dave Nice Date: Wed, 26 Jan 2022 10:40:03 +0000 Subject: [PATCH 01/13] version number to 1.0.3 for release, SMSSJ doc updates Signed-off-by: Dave Nice Signed-off-by: Dave Nice --- ARCHETYPES-README.md | 6 +- README.md | 18 +- cics-bundle-deploy-reactor-archetype/pom.xml | 2 +- cics-bundle-maven-plugin/pom.xml | 4 +- .../com/ibm/cics/cbmp/BundleDeployMojo.java | 4 +- cics-bundle-maven-site/LICENSE.txt | 277 ++++++++++++++++++ cics-bundle-maven-site/pom.xml | 2 +- cics-bundle-reactor-archetype/pom.xml | 2 +- pom.xml | 2 +- samples/LICENSE.txt | 277 ++++++++++++++++++ .../bundle-reactor-deploy/demo-bundle/pom.xml | 2 +- samples/bundle-war-deploy/README.md | 2 +- samples/bundle-war-deploy/demo-war/pom.xml | 2 +- samples/pom.xml | 4 +- 14 files changed, 581 insertions(+), 23 deletions(-) create mode 100644 cics-bundle-maven-site/LICENSE.txt create mode 100644 samples/LICENSE.txt diff --git a/ARCHETYPES-README.md b/ARCHETYPES-README.md index 9585bb27..d8d05fe6 100644 --- a/ARCHETYPES-README.md +++ b/ARCHETYPES-README.md @@ -4,12 +4,12 @@ Another way to get started with the plugin is to use one of the provided archety By using `cics-bundle-reactor-archetype`, you are provided with a reactor (multi-module build) module, containing a CICS bundle module and a dynamic Web (WAR) module. The CICS bundle is preconfigured to depend on the WAR module. Building the reactor module builds both the children, so you end up with a CICS bundle that contains the built WAR file. If you use the `cics-bundle-deploy-reactor-archetype` archetype, this is extended to install the CICS bundle in CICS using the CICS bundle deployment API. -1. Create a Maven module by referring to the either the [`com.ibm.cics:cics-bundle-reactor-archetype`](https://search.maven.org/artifact/com.ibm.cics/cics-bundle-reactor-archetype/1.0.2/maven-archetype) or [`com.ibm.cics:cics-bundle-deploy-reactor-archetype`](https://search.maven.org/artifact/com.ibm.cics/cics-bundle-deploy-reactor-archetype/1.0.2/maven-archetype) artifact: +1. Create a Maven module by referring to the either the [`com.ibm.cics:cics-bundle-reactor-archetype`](https://search.maven.org/artifact/com.ibm.cics/cics-bundle-reactor-archetype/1.0.3/maven-archetype) or [`com.ibm.cics:cics-bundle-deploy-reactor-archetype`](https://search.maven.org/artifact/com.ibm.cics/cics-bundle-deploy-reactor-archetype/1.0.3/maven-archetype) artifact: * ![On command line](images/cmd.png) On command line: ``` - mvn archetype:generate -DarchetypeGroupId=com.ibm.cics -DarchetypeArtifactId=cics-bundle-deploy-reactor-archetype -DarchetypeVersion=1.0.2 -DgroupId= -DartifactId= + mvn archetype:generate -DarchetypeGroupId=com.ibm.cics -DarchetypeArtifactId=cics-bundle-deploy-reactor-archetype -DarchetypeVersion=1.0.3 -DgroupId= -DartifactId= ``` In the pom.xml file of the bundle module there will be default values for each of the following parameters which you will need to set: `defaultjvmserver`, `bunddef`, `csdgroup`, `username`, `password`, `deployURL`, `cicsplex`, `region` @@ -22,7 +22,7 @@ By using `cics-bundle-reactor-archetype`, you are provided with a reactor (multi Archetype Group Id: `com.ibm.cics` Archetype Artifact Id: `cics-bundle-deploy-reactor-archetype` - Archetype Version: `1.0.2` + Archetype Version: `1.0.3` Then hit **OK**. 1. From the archetype list, select `cics-bundle-deploy-reactor-archetype` and hit **Next**.  diff --git a/README.md b/README.md index 727cb37f..0090f646 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ The plugin builds CICS bundles for any in-service version of CICS Transaction Se However, if you are using the `deploy` goal of the plugin to deploy bundles to CICS, you must enable the CICS bundle deployment API. The CICS bundle deployment API is supported by the CMCI JVM server that must be set up in a WUI region or a single CICS region. See the [CICS TS doc](https://www.ibm.com/docs/en/cics-ts/6.1_beta?topic=suc-configuring-cmci-jvm-server-cics-bundle-deployment-api) for details. To use the `deploy` goal, make sure that: * For a CICSPlex SM environment, set up the CMCI JVM server in the WUI region of the CICSplex that contains the deployment target region. The WUI region must be at CICS TS 5.6 or later. - * For a single CICS region environment (SMSS), set up the CMCI JVM server in the deployment target region. The region must be at CICS TS open beta or later. + * For a single CICS region environment (SMSS), set up the CMCI JVM server in the deployment target region. The region must be at CICS TS 5.6 with APAR PH35122 applied, or later. ## Create a CICS bundle (in a separate module) using `cics-bundle-maven-plugin` @@ -91,7 +91,7 @@ To create a CICS bundle in this way: com.ibm.cics cics-bundle-maven-plugin - 1.0.2 + 1.0.3 true @@ -127,7 +127,7 @@ To create a CICS bundle in this way: com.ibm.cics cics-bundle-maven-plugin - 1.0.2 + 1.0.3 true DFHWLP @@ -159,7 +159,7 @@ To create a CICS bundle in this way: com.ibm.cics cics-bundle-maven-plugin - 1.0.2 + 1.0.3 @@ -192,7 +192,7 @@ The bundle directory of the BUNDLE definition should be set as follows: ` com.ibm.cics cics-bundle-maven-plugin - 1.0.2 + 1.0.3 @@ -200,6 +200,10 @@ The bundle directory of the BUNDLE definition should be set as follows: `deploy + DFHWLP http://yourcicsurl.com:9080 ${cics-user-id} @@ -222,8 +226,8 @@ The bundle directory of the BUNDLE definition should be set as follows: ` com.ibm.cics cics-bundle-maven - 1.0.3-SNAPSHOT + 1.0.3 cics-bundle-deploy-reactor-archetype diff --git a/cics-bundle-maven-plugin/pom.xml b/cics-bundle-maven-plugin/pom.xml index 5981da84..3808b7a5 100644 --- a/cics-bundle-maven-plugin/pom.xml +++ b/cics-bundle-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.ibm.cics cics-bundle-maven - 1.0.3-SNAPSHOT + 1.0.3 cics-bundle-maven-plugin @@ -21,7 +21,7 @@ com.ibm.cics cics-bundle-common - 1.0.3-SNAPSHOT + 1.0.3 diff --git a/cics-bundle-maven-plugin/src/main/java/com/ibm/cics/cbmp/BundleDeployMojo.java b/cics-bundle-maven-plugin/src/main/java/com/ibm/cics/cbmp/BundleDeployMojo.java index b59a186a..abdb508d 100644 --- a/cics-bundle-maven-plugin/src/main/java/com/ibm/cics/cbmp/BundleDeployMojo.java +++ b/cics-bundle-maven-plugin/src/main/java/com/ibm/cics/cbmp/BundleDeployMojo.java @@ -73,7 +73,7 @@ public class BundleDeployMojo extends AbstractMojo { private String serverId; /** - * Required for a CICSPlex SM environment. + * Required for a CICSPlex SM environment, ignored in an SMSS environment. * The name of the CICSplex the bundle should be installed into. * Specifying this parameter overrides any value provided within a Maven settings server entry. */ @@ -81,7 +81,7 @@ public class BundleDeployMojo extends AbstractMojo { private String cicsplex; /** - * Required for a CICSPlex SM environment. + * Required for a CICSPlex SM environment, ignored in an SMSS environment. * The name of the region the bundle should be installed into. * Specifying this parameter overrides any value provided within a Maven settings server entry. */ diff --git a/cics-bundle-maven-site/LICENSE.txt b/cics-bundle-maven-site/LICENSE.txt new file mode 100644 index 00000000..d3087e4c --- /dev/null +++ b/cics-bundle-maven-site/LICENSE.txt @@ -0,0 +1,277 @@ +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. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + + 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. + +"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 +Agreement. + +"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. + + 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 + +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. + +5. NO WARRANTY + +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, 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. + +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. 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/cics-bundle-maven-site/pom.xml b/cics-bundle-maven-site/pom.xml index bf04c7d9..5f4f0add 100644 --- a/cics-bundle-maven-site/pom.xml +++ b/cics-bundle-maven-site/pom.xml @@ -5,7 +5,7 @@ com.ibm.cics cics-bundle-maven - 1.0.3-SNAPSHOT + 1.0.3 cics-bundle-maven-site pom diff --git a/cics-bundle-reactor-archetype/pom.xml b/cics-bundle-reactor-archetype/pom.xml index cb1c6dcf..ef387493 100644 --- a/cics-bundle-reactor-archetype/pom.xml +++ b/cics-bundle-reactor-archetype/pom.xml @@ -4,7 +4,7 @@ com.ibm.cics cics-bundle-maven - 1.0.3-SNAPSHOT + 1.0.3 cics-bundle-reactor-archetype diff --git a/pom.xml b/pom.xml index 8968b3d5..88ad1083 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.ibm.cics cics-bundle-maven - 1.0.3-SNAPSHOT + 1.0.3 pom CICS Bundle Maven Parent diff --git a/samples/LICENSE.txt b/samples/LICENSE.txt new file mode 100644 index 00000000..d3087e4c --- /dev/null +++ b/samples/LICENSE.txt @@ -0,0 +1,277 @@ +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. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + + 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. + +"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 +Agreement. + +"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. + + 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 + +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. + +5. NO WARRANTY + +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, 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. + +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. 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/samples/bundle-reactor-deploy/demo-bundle/pom.xml b/samples/bundle-reactor-deploy/demo-bundle/pom.xml index bc636847..781d181c 100644 --- a/samples/bundle-reactor-deploy/demo-bundle/pom.xml +++ b/samples/bundle-reactor-deploy/demo-bundle/pom.xml @@ -30,7 +30,7 @@ com.ibm.cics cics-bundle-maven-plugin - 1.0.2 + 1.0.3 true diff --git a/samples/bundle-war-deploy/README.md b/samples/bundle-war-deploy/README.md index ee12365e..26b568ff 100644 --- a/samples/bundle-war-deploy/README.md +++ b/samples/bundle-war-deploy/README.md @@ -24,7 +24,7 @@ If you have an existing Java Maven project, add the snippet shown below to the p com.ibm.cics cics-bundle-maven-plugin - 1.0.2 + 1.0.3 diff --git a/samples/bundle-war-deploy/demo-war/pom.xml b/samples/bundle-war-deploy/demo-war/pom.xml index 7a71a123..188a481e 100644 --- a/samples/bundle-war-deploy/demo-war/pom.xml +++ b/samples/bundle-war-deploy/demo-war/pom.xml @@ -57,7 +57,7 @@ com.ibm.cics cics-bundle-maven-plugin - 1.0.2 + 1.0.3 diff --git a/samples/pom.xml b/samples/pom.xml index 71347399..6579d8bc 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -8,7 +8,7 @@ com.ibm.cics cics-bundle-maven - 1.0.3-SNAPSHOT + 1.0.3 @@ -16,7 +16,7 @@ com.ibm.cics cics-bundle-maven-plugin - 1.0.2 + 1.0.3 From 0d54819738df10e39b0bfe8b6cd1ab58ac47fd77 Mon Sep 17 00:00:00 2001 From: Dave Nice Date: Wed, 2 Feb 2022 14:23:29 +0000 Subject: [PATCH 02/13] use the new build of common Signed-off-by: Dave Nice Signed-off-by: Dave Nice --- cics-bundle-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cics-bundle-maven-plugin/pom.xml b/cics-bundle-maven-plugin/pom.xml index 3808b7a5..77df7fd0 100644 --- a/cics-bundle-maven-plugin/pom.xml +++ b/cics-bundle-maven-plugin/pom.xml @@ -21,7 +21,7 @@ com.ibm.cics cics-bundle-common - 1.0.3 + 1.0.4 From 45c3f1c22bd8195bcb98519ffffb1b9bb6dc74dc Mon Sep 17 00:00:00 2001 From: Ledina Hido-Evans Date: Thu, 27 Jan 2022 20:42:43 +0000 Subject: [PATCH 03/13] Updates plugins and dependencies to latest Fix Maven version to 5.4 Signed-off-by: Ledina Hido-Evans Signed-off-by: Dave Nice --- cics-bundle-deploy-reactor-archetype/pom.xml | 8 ++- cics-bundle-maven-plugin/pom.xml | 54 ++++++++++++-------- cics-bundle-maven-site/pom.xml | 11 +++- cics-bundle-reactor-archetype/pom.xml | 8 ++- pom.xml | 50 ++++++++++++++---- samples/pom.xml | 15 ++++-- 6 files changed, 108 insertions(+), 38 deletions(-) diff --git a/cics-bundle-deploy-reactor-archetype/pom.xml b/cics-bundle-deploy-reactor-archetype/pom.xml index 37b68a97..7f8b8500 100644 --- a/cics-bundle-deploy-reactor-archetype/pom.xml +++ b/cics-bundle-deploy-reactor-archetype/pom.xml @@ -35,7 +35,7 @@ maven-resources-plugin - 3.1.0 + 3.2.0 \ @@ -47,7 +47,11 @@ org.apache.maven.plugins maven-archetype-plugin - 3.1.0 + 3.2.1 + + + maven-site-plugin + 3.10.0 diff --git a/cics-bundle-maven-plugin/pom.xml b/cics-bundle-maven-plugin/pom.xml index 77df7fd0..29f29a27 100644 --- a/cics-bundle-maven-plugin/pom.xml +++ b/cics-bundle-maven-plugin/pom.xml @@ -33,33 +33,33 @@ org.codehaus.plexus plexus-archiver - 3.6.0 + 4.2.7 org.apache.maven maven-core - 3.5.0 + 3.8.4 com.google.guava guava - 30.1.1-jre + 31.0.1-jre org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 org.apache.maven.plugin-tools maven-plugin-annotations - 3.5.2 + 3.6.4 provided @@ -67,50 +67,45 @@ junit junit - 4.13.1 + 4.13.2 test org.hamcrest hamcrest - 2.1 + 2.2 test org.mockito mockito-all - 1.10.19 + 2.0.1 test com.github.tomakehurst wiremock-jre8 - 2.26.3 + 2.32.0 test org.xmlunit xmlunit-matchers - 2.6.3 + 2.9.0 test - - - 3.0 - - org.apache.maven.plugins maven-plugin-plugin - 3.6.0 + 3.6.4 maven-compiler-plugin - 3.8.1 + 3.9.0 1.8 1.8 @@ -119,7 +114,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 @@ -137,7 +132,7 @@ org.apache.maven.plugins maven-invoker-plugin - 3.2.0 + 3.2.2 false src/it @@ -169,14 +164,31 @@ org.sonatype.plugins nexus-staging-maven-plugin + + maven-jar-plugin + 3.2.2 + + + maven-resources-plugin + 3.2.0 + + + maven-site-plugin + 3.10.0 + + + maven-surefire-plugin + 3.0.0-M5 + + org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.2 @@ -188,7 +200,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.6.0 + 3.6.4 diff --git a/cics-bundle-maven-site/pom.xml b/cics-bundle-maven-site/pom.xml index 5f4f0add..73587229 100644 --- a/cics-bundle-maven-site/pom.xml +++ b/cics-bundle-maven-site/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.1.0 + 3.2.0 copy-index @@ -46,6 +46,15 @@ + + + + + maven-site-plugin + 3.10.0 + + + \ No newline at end of file diff --git a/cics-bundle-reactor-archetype/pom.xml b/cics-bundle-reactor-archetype/pom.xml index ef387493..85c2126a 100644 --- a/cics-bundle-reactor-archetype/pom.xml +++ b/cics-bundle-reactor-archetype/pom.xml @@ -36,7 +36,7 @@ maven-resources-plugin - 3.1.0 + 3.2.0 \ @@ -48,7 +48,11 @@ org.apache.maven.plugins maven-archetype-plugin - 3.1.0 + 3.2.1 + + + maven-site-plugin + 3.10.0 diff --git a/pom.xml b/pom.xml index 88ad1083..981b5e67 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 1.20 + 2.0.0 @@ -60,21 +60,41 @@ - + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0 + + + enforce-maven + + enforce + + + + + 3.5.4 + + + + + + + org.apache.maven.plugins maven-site-plugin - 3.8.2 + 3.10.0 org.apache.maven.doxia doxia-module-markdown - 1.6 + 2.0.0-M1 false - + org.codehaus.mojo license-maven-plugin @@ -99,7 +119,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 --pinentry-mode @@ -117,7 +137,7 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + 3.2.1 @@ -129,7 +149,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.0 + 3.3.1 @@ -149,6 +169,18 @@ 2f4e6a35b09f57 + + maven-clean-plugin + 3.1.0 + + + maven-deploy-plugin + 3.0.0-M2 + + + maven-install-plugin + 3.0.0-M1 + @@ -244,7 +276,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.6.0 + 3.6.4 org.apache.maven.plugins diff --git a/samples/pom.xml b/samples/pom.xml index 6579d8bc..dfb4757c 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -24,7 +24,7 @@ maven-invoker-plugin - 3.2.0 + 3.2.2 true true @@ -47,7 +47,7 @@ uk.co.automatictester wiremock-maven-plugin - 5.0.0 + 7.0.0 @@ -64,11 +64,20 @@ com.github.tomakehurst wiremock - 2.25.0 + 2.27.2 + + + + + maven-site-plugin + 3.10.0 + + + From 5b825a55aba975853687632402f4df3784a64745 Mon Sep 17 00:00:00 2001 From: Ledina Hido-Evans Date: Thu, 27 Jan 2022 21:16:47 +0000 Subject: [PATCH 04/13] Move to mockito-core Signed-off-by: Ledina Hido-Evans Signed-off-by: Dave Nice --- cics-bundle-maven-plugin/pom.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/cics-bundle-maven-plugin/pom.xml b/cics-bundle-maven-plugin/pom.xml index 29f29a27..54dcb071 100644 --- a/cics-bundle-maven-plugin/pom.xml +++ b/cics-bundle-maven-plugin/pom.xml @@ -36,6 +36,12 @@ 4.2.7 + + org.codehaus.plexus + plexus-utils + 3.3.0 + + org.apache.maven maven-core @@ -52,7 +58,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.0.0 @@ -78,8 +84,8 @@ org.mockito - mockito-all - 2.0.1 + mockito-core + 4.3.1 test @@ -114,7 +120,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.0.0 From a979184779435371d85f31c394ce4ba93e54a483 Mon Sep 17 00:00:00 2001 From: Ledina Hido-Evans Date: Thu, 27 Jan 2022 22:06:21 +0000 Subject: [PATCH 05/13] Moved fixing versions of jars under pluginManagement Signed-off-by: Ledina Hido-Evans Signed-off-by: Dave Nice --- cics-bundle-maven-plugin/pom.xml | 35 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/cics-bundle-maven-plugin/pom.xml b/cics-bundle-maven-plugin/pom.xml index 54dcb071..4427448b 100644 --- a/cics-bundle-maven-plugin/pom.xml +++ b/cics-bundle-maven-plugin/pom.xml @@ -39,7 +39,7 @@ org.codehaus.plexus plexus-utils - 3.3.0 + 3.4.1 @@ -170,25 +170,26 @@ org.sonatype.plugins nexus-staging-maven-plugin - - maven-jar-plugin - 3.2.2 - - - maven-resources-plugin - 3.2.0 - - - maven-site-plugin - 3.10.0 - - - maven-surefire-plugin - 3.0.0-M5 - + + + + maven-jar-plugin + 3.2.2 + + + maven-resources-plugin + 3.2.0 + + + maven-surefire-plugin + 3.0.0-M5 + + + + From be539fa0df0a8b86edb93c4f80992088bdbbebc0 Mon Sep 17 00:00:00 2001 From: Ledina Hido-Evans Date: Thu, 27 Jan 2022 22:13:47 +0000 Subject: [PATCH 06/13] Moved maven-site-plugin to parent pom pluginManagement Signed-off-by: Ledina Hido-Evans Signed-off-by: Dave Nice --- cics-bundle-deploy-reactor-archetype/pom.xml | 4 ---- cics-bundle-maven-site/pom.xml | 9 --------- cics-bundle-reactor-archetype/pom.xml | 4 ---- pom.xml | 4 ++++ samples/pom.xml | 9 --------- 5 files changed, 4 insertions(+), 26 deletions(-) diff --git a/cics-bundle-deploy-reactor-archetype/pom.xml b/cics-bundle-deploy-reactor-archetype/pom.xml index 7f8b8500..f1d7f728 100644 --- a/cics-bundle-deploy-reactor-archetype/pom.xml +++ b/cics-bundle-deploy-reactor-archetype/pom.xml @@ -49,10 +49,6 @@ maven-archetype-plugin 3.2.1 - - maven-site-plugin - 3.10.0 - diff --git a/cics-bundle-maven-site/pom.xml b/cics-bundle-maven-site/pom.xml index 73587229..8e7eb079 100644 --- a/cics-bundle-maven-site/pom.xml +++ b/cics-bundle-maven-site/pom.xml @@ -46,15 +46,6 @@ - - - - - maven-site-plugin - 3.10.0 - - - \ No newline at end of file diff --git a/cics-bundle-reactor-archetype/pom.xml b/cics-bundle-reactor-archetype/pom.xml index 85c2126a..ebcf0a6e 100644 --- a/cics-bundle-reactor-archetype/pom.xml +++ b/cics-bundle-reactor-archetype/pom.xml @@ -50,10 +50,6 @@ maven-archetype-plugin 3.2.1 - - maven-site-plugin - 3.10.0 - diff --git a/pom.xml b/pom.xml index 981b5e67..d49d42ab 100644 --- a/pom.xml +++ b/pom.xml @@ -173,6 +173,10 @@ maven-clean-plugin 3.1.0 + + maven-site-plugin + 3.10.0 + maven-deploy-plugin 3.0.0-M2 diff --git a/samples/pom.xml b/samples/pom.xml index dfb4757c..fa11d8f2 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -69,15 +69,6 @@ - - - - - maven-site-plugin - 3.10.0 - - - From 75d6ec125cf94ab21036731092dafdf4f8537662 Mon Sep 17 00:00:00 2001 From: Ledina Hido-Evans Date: Mon, 31 Jan 2022 10:16:49 +0000 Subject: [PATCH 07/13] Change maven-core to match the Maven version we enforce Signed-off-by: Ledina Hido-Evans Signed-off-by: Dave Nice --- cics-bundle-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cics-bundle-maven-plugin/pom.xml b/cics-bundle-maven-plugin/pom.xml index 4427448b..6f49a5fd 100644 --- a/cics-bundle-maven-plugin/pom.xml +++ b/cics-bundle-maven-plugin/pom.xml @@ -45,7 +45,7 @@ org.apache.maven maven-core - 3.8.4 + 3.5.4 From eb664ba8b3a98c198a8d0090f2db547a188a2b72 Mon Sep 17 00:00:00 2001 From: Ledina Hido-Evans Date: Mon, 31 Jan 2022 17:18:05 +0000 Subject: [PATCH 08/13] Changed scope of maven plugins to provided and add commons-lang Signed-off-by: Ledina Hido-Evans Signed-off-by: Dave Nice --- cics-bundle-maven-plugin/pom.xml | 53 ++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/cics-bundle-maven-plugin/pom.xml b/cics-bundle-maven-plugin/pom.xml index 6f49a5fd..9b407156 100644 --- a/cics-bundle-maven-plugin/pom.xml +++ b/cics-bundle-maven-plugin/pom.xml @@ -23,38 +23,39 @@ cics-bundle-common 1.0.4 - org.sonatype.plexus plexus-build-api 0.0.7 - org.codehaus.plexus plexus-archiver 4.2.7 - org.codehaus.plexus plexus-utils 3.4.1 - org.apache.maven maven-core 3.5.4 + provided - + + org.apache.commons + commons-lang3 + 3.12.0 + + com.google.guava guava 31.0.1-jre - org.codehaus.mojo build-helper-maven-plugin @@ -102,6 +103,46 @@ + + + + org.apache.maven + maven-model + provided + + + org.apache.maven + maven-settings + provided + + + org.apache.maven + maven-builder-support + provided + + + org.apache.maven + maven-artifact + provided + + + org.apache.maven + maven-plugin-api + provided + + + org.apache.maven + maven-model-builder + provided + + + org.apache.maven + maven-compat + provided + + + + From aac843d8e89cb826fbee93835b223982f06bbad1 Mon Sep 17 00:00:00 2001 From: Ledina Hido-Evans Date: Mon, 31 Jan 2022 19:41:21 +0000 Subject: [PATCH 09/13] Update samples to use latest CICS TS server libs Signed-off-by: Ledina Hido-Evans Signed-off-by: Dave Nice --- samples/bundle-reactor-deploy/demo-war/pom.xml | 2 +- samples/bundle-war-deploy/demo-war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/bundle-reactor-deploy/demo-war/pom.xml b/samples/bundle-reactor-deploy/demo-war/pom.xml index 9cf8ad44..f059b7f4 100644 --- a/samples/bundle-reactor-deploy/demo-war/pom.xml +++ b/samples/bundle-reactor-deploy/demo-war/pom.xml @@ -29,7 +29,7 @@ com.ibm.cics com.ibm.cics.server - 1.700.0-5.5-PH10453 + 1.800.1-5.6-PH34012 provided diff --git a/samples/bundle-war-deploy/demo-war/pom.xml b/samples/bundle-war-deploy/demo-war/pom.xml index 188a481e..949766d4 100644 --- a/samples/bundle-war-deploy/demo-war/pom.xml +++ b/samples/bundle-war-deploy/demo-war/pom.xml @@ -25,7 +25,7 @@ com.ibm.cics com.ibm.cics.server - 1.700.0-5.5-PH10453 + 1.800.1-5.6-PH34012 provided From 8417a4a5e51a9987ca7921a99f7c55d67d0789a0 Mon Sep 17 00:00:00 2001 From: Ledina Hido-Evans Date: Mon, 31 Jan 2022 21:21:51 +0000 Subject: [PATCH 10/13] Comment out Sonatype so snapshots are ignored by default Signed-off-by: Ledina Hido-Evans Signed-off-by: Dave Nice --- samples/bundle-reactor-deploy/pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/samples/bundle-reactor-deploy/pom.xml b/samples/bundle-reactor-deploy/pom.xml index 9c3c1a29..15c7a79e 100644 --- a/samples/bundle-reactor-deploy/pom.xml +++ b/samples/bundle-reactor-deploy/pom.xml @@ -7,8 +7,15 @@ 0.0.1-SNAPSHOT pom - - + + + demo-war + demo-bundle + + + + - - demo-war - demo-bundle - + \ No newline at end of file From bc5a04b8e71210f158925010b1d8134e80bfb091 Mon Sep 17 00:00:00 2001 From: Ledina Hido-Evans Date: Tue, 1 Feb 2022 15:41:28 +0000 Subject: [PATCH 11/13] Added integration tests for SMSS Testing missing region, missing CICSplex and missing both in combination of SMSS and CPSM environments Signed-off-by: Ledina Hido-Evans Signed-off-by: Dave Nice --- .../test-bundle-deploy-neither-smss/pom.xml | 49 +++++++++ .../postbuild.bsh | 0 .../prebuild.bsh | 1 + .../test-app-bundle-0.0.1-SNAPSHOT.zip | Bin 0 -> 3358 bytes .../invoker.properties | 15 +++ .../src/it/test-bundle-deploy-neither/pom.xml | 6 +- .../postbuild.groovy | 23 ++++ .../test-bundle-deploy-neither/prebuild.bsh | 2 +- .../invoker.properties | 15 +++ .../it/test-bundle-deploy-noCICSplex/pom.xml | 6 +- .../postbuild.bsh | 1 - .../postbuild.groovy | 22 ++++ .../invoker.properties | 15 +++ .../it/test-bundle-deploy-noRegion/pom.xml | 6 +- .../test-bundle-deploy-noRegion/postbuild.bsh | 1 - .../postbuild.groovy | 22 ++++ .../test-bundle-deploy-noRegion/prebuild.bsh | 2 +- .../com/ibm/cics/cbmp/DeployPreBuild.java | 99 ++++++++++++++++-- 18 files changed, 261 insertions(+), 24 deletions(-) create mode 100644 cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/pom.xml rename cics-bundle-maven-plugin/src/it/{test-bundle-deploy-neither => test-bundle-deploy-neither-smss}/postbuild.bsh (100%) create mode 100644 cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/prebuild.bsh create mode 100644 cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/test-app-bundle-0.0.1-SNAPSHOT.zip create mode 100644 cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/invoker.properties create mode 100644 cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/postbuild.groovy create mode 100644 cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/invoker.properties delete mode 100644 cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/postbuild.bsh create mode 100644 cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/postbuild.groovy create mode 100644 cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/invoker.properties delete mode 100644 cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/postbuild.bsh create mode 100644 cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/postbuild.groovy diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/pom.xml b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/pom.xml new file mode 100644 index 00000000..b8a13bb4 --- /dev/null +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/pom.xml @@ -0,0 +1,49 @@ + + + 4.0.0 + + com.ibm.cics.test-bundle-deploy-neither-smss + test-bundle-deploy-neither-smss + Example CICS bundle + 0.0.1-SNAPSHOT + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + true + + + deploy + verify + + deploy + + + neither + bundle + BAR + ${basedir}/test-app-bundle-0.0.1-SNAPSHOT.zip + + + + + + + + diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/postbuild.bsh b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/postbuild.bsh similarity index 100% rename from cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/postbuild.bsh rename to cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/postbuild.bsh diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/prebuild.bsh b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/prebuild.bsh new file mode 100644 index 00000000..61445190 --- /dev/null +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/prebuild.bsh @@ -0,0 +1 @@ +context.put("wireMockServer", com.ibm.cics.cbmp.DeployPreBuild.setupSMSSWiremock(Integer.parseInt(wiremockPort))); \ No newline at end of file diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/test-app-bundle-0.0.1-SNAPSHOT.zip b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/test-app-bundle-0.0.1-SNAPSHOT.zip new file mode 100644 index 0000000000000000000000000000000000000000..5338f17b3629a682faf6cdbe569d4037e2a9d4b0 GIT binary patch literal 3358 zcma)9byO5;7M~#=-6f#X&JY9A42YD33=BvLNT-A%Fm!heNJ)36(ntyjNJ&aacY}0~ zEbN}Q%iD9_+5LUzetGYA?!D*!@w>_}bPQYo02=@}fiJ)TcYt%VSCm$hfINrGa4G*& z4I3L9kl?xwr$J@Kc-=hv-w4Z%IGEZyKn!hdAx?&NkjI>lIk_RKa0z8qIVCmDn=2#4 z8xw0&f<72w8$B^#&_hYWjA%GDY`Bw;hJQb%O80Y)snO%de9FbMdW3s=qwY<{?42g) ztl$8QKt4?4jY5NUB6mCvND|V~M;VA|v6*$TF4WvDWb$bggmh6Z^TOZB6-})?JLeV> zi8}eokwE!zEz!IqH!^E^2I2H8qV}NxVjoKxhJ}6C@4rUGlLz%D2Lb@AH$rkZaO2m; z_MFZ()*qsDU|+?F1LiK-<2>eIk{x->tP~Vgl#@h-g{DbS? zk>NH*3=vRUO~n=E=2eecj~n*ubX%%p)wuIk0Flj`sm|4&z~+`KZ?&BrLKayQ&!W6R zZ){sh%AlirtXlIED~xT>gQoIrhFGiMMJ+ZWgc>cj&e%|a1Bi0+1FI5G+W-!o+HGLp_r@RULZ-hP};I+=;eT@3Q` zN{JJV$fr8&UfH2An+covEo=IV>^7x$6ZhAY;*LO6wQh=tnE(Kw``<;98t3*T_9xvp z^DaciRRU5((T+O4wNFkh*(!nBFUqakRMPC8+4P3*E35!Hf5s0z_3i%n^(74q!zzkh z{v~l;a2zYEQu=}&LzH{kFZ=$}l*1Ys`?o-Jz}1!aAxVq|!XGz~7Xa9M z)iCY~e5ooTMS#c7D>OFP)7D4+Ha~a3b>aBE^*YP?+3w zz>f#!@5}1|V^($8A6L-MV)5p~9_^WOZW&S=4hZ;{B7pZ5!kfuh4y0p2L#dJs%D)+C zuEH$_0K;Nn6M+}RZPU+97=g{_Z`nL$pEF|k^HFWJ6vN3w zH$mj%;p|i5d#(*CWg}USsae|Doh8Qiw@b17RERxGjdsV!%y;J4T83XucAqzBQ&`rR z#j3kb)nz-DsK|osc@f{kG(9MtHIa43-nRG_`k#Dr5T}KM@+IsjxIYf_6V4^SSJNn0 zutP5&^N6Hl+5%YD=B=ld57y8Fs%Gu4@%XZRTa;C5IALK zz-2x3J-&xDfQzP88oAOxgkJrCMGMj=LMo_EGmT$#nN@Eg{9Ak#qtWZ3Or#*;Q$7-c zQ4ixx&*5jA$bsLzfv+K@efpuiTS8OR5B)x$h%8#K38f`hmFETSolX;%j%9BY^+f&L zCUr&cgmI`$1t3^|jyrG;$5 z7%zrv%n@YQDF$zXTJzPeS(5l9qc(ao?eliWwNw zxS^hy0(x5T8$WbEN{#vfJ$Y)f0lu^jrNp8*C#IlE_k@&dMV(nO)?)v|b)hqPw}zMz z1h)>AMlR#d^SC6Pu07xb(I|AW?Urm$%fe8Xdz`ezlW*Nx>+d6KHJA<#kgeI8jmNLM zI{1nd#8pT5hh$4RLb<$_>lSjlO~$%G!eS#*#}A)OU8a?1ue$n3UpGtQU0zn#h9*U` zWtI4b$CB3WyN$FeW#}ErWwLHayHUwrkhJg2`5G@~%ZCrj<7|Z6J;?e*dE9Fw2Pf?R z02CSrVOs?HUi3(;l?DZo&0bV-UmYLe+NI(7b`Df+F1!*#8Wpa8$dT40PPGFGsIP|0 z<{it*dL2Pj-D}((gTm>8!^yn9KI(;i6SWJS8LGZmY{T)~@t}CFU6J+dMER@Iev{^E zYRTl4J9MN#7X0)aJiENolF4T`%P2*^#cHFkpwG&)5E~I88Q+8|&x3cqsC*xPj8!jP zPbr4P^<@*v;KTBHN4QI>BcqjNS3A+(W)(CW@+|d4T$;1z+=M8`EXUxf zUI)|c>mv$LFmf<&LB`dQ&jB<6LPaAocg%F#R2r^>VouVz+&uxB1J#H*K zXUX|RU!32-E17DY*9t==x^XB9ijOKL#=$BoD7(?b^5XTd)XC}p~g^iKAXd(UdMZ4mltr_kxz zH|ZQ9-y$%BcUdbLL6j4rRMerB^gPepV~=n#EdW;AQw^Fx2lCmg{w+k$(ok+X)I0); zFUCcKiyvk4>&13os8<|S4@Ti$J|y#8=s3Sann^`Aq9&;bHL=D`vTbSQ)4bX!L@nzZ zsUVgjFVa~AQ)J`pM5Xn7%3lw#=0Fmg=P7PcD0Vr}y_|?iOkS`%BQUFxg1OWPu&<<8 zMd~jp_*^#HsE}XqDJl34p-!~?G8;zS^>SvlPoe#C?!F&AJBo5pI9n87dJ&+J@)42F z_Ba0Rw7a}{m6T|wMg{0vOoMe(c8vF3MsvsC6n*|#=v0@2qEm(bnl2H{P01>AO)XA4j@g8^~_{71iu|6(4}+~WjE|=`vrTpV{dbHN**)1lAue5 z#g<-$Rkmfv?Gb+NU9+?tUC{;mhORlY@z59nt8zdC|{dGenx?{djo68 - + @project.groupId@ @project.artifactId@ @@ -35,10 +35,8 @@ deploy - serverId + neither bundle - cicsplex - region BAR ${basedir}/test-app-bundle-0.0.1-SNAPSHOT.zip diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/postbuild.groovy b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/postbuild.groovy new file mode 100644 index 00000000..e688de8b --- /dev/null +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/postbuild.groovy @@ -0,0 +1,23 @@ +/*- + * #%L + * CICS Bundle Maven Plugin + * %% + * Copyright (C) 2019 IBM Corp. + * %% + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * #L% + */ +import com.ibm.cics.cbmp.DeployPreBuild + +context.get("wireMockServer").shutdownServer() + +File buildLog = new File(basedir, 'build.log') + +assert buildLog.exists() +assert buildLog.text.contains("[ERROR] Failed to execute goal com.ibm.cics:cics-bundle-maven-plugin:") +assert buildLog.text.contains("com.ibm.cics.bundle.deploy.BundleDeployException: Some of the supplied parameters were invalid") +assert buildLog.text.contains("- cicsplex: CICSplex could not be found") \ No newline at end of file diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/prebuild.bsh b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/prebuild.bsh index f4680d0e..60e6e892 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/prebuild.bsh +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/prebuild.bsh @@ -1 +1 @@ -context.put("wireMockServer", com.ibm.cics.cbmp.DeployPreBuild.setupWiremock(Integer.parseInt(wiremockPort))); \ No newline at end of file +context.put("wireMockServer", com.ibm.cics.cbmp.DeployPreBuild.setupWiremockNoCICSplexRegion(Integer.parseInt(wiremockPort))); \ No newline at end of file diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/invoker.properties b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/invoker.properties new file mode 100644 index 00000000..f46ab66f --- /dev/null +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/invoker.properties @@ -0,0 +1,15 @@ +### +# #%L +# CICS Bundle Maven Plugin +# %% +# Copyright (C) 2019 IBM Corp. +# %% +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# #L% +### +# The expected result of the build, possible values are "success" (default) and "failure" +invoker.buildResult = failure diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/pom.xml b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/pom.xml index c3f4a082..83b3aec6 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/pom.xml +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/pom.xml @@ -21,7 +21,8 @@ - + + @project.groupId@ @project.artifactId@ @@ -35,8 +36,7 @@ deploy - cicsplex - serverId + noCICSplex bundle BAR ${basedir}/test-app-bundle-0.0.1-SNAPSHOT.zip diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/postbuild.bsh b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/postbuild.bsh deleted file mode 100644 index d93e6103..00000000 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/postbuild.bsh +++ /dev/null @@ -1 +0,0 @@ -context.get("wireMockServer").shutdownServer(); \ No newline at end of file diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/postbuild.groovy b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/postbuild.groovy new file mode 100644 index 00000000..20eb3e34 --- /dev/null +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/postbuild.groovy @@ -0,0 +1,22 @@ +/*- + * #%L + * CICS Bundle Maven Plugin + * %% + * Copyright (C) 2019 IBM Corp. + * %% + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * #L% + */ +import com.ibm.cics.cbmp.DeployPreBuild + +context.get("wireMockServer").shutdownServer() + +File buildLog = new File(basedir, 'build.log') + +assert buildLog.exists() +assert buildLog.text.contains("[ERROR] Failed to execute goal com.ibm.cics:cics-bundle-maven-plugin:") +assert buildLog.text.contains("(deploy) on project test-bundle-deploy-noCICSplex: Specify both or neither of cicsplex and region in plugin configuration or server configuration") diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/invoker.properties b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/invoker.properties new file mode 100644 index 00000000..f46ab66f --- /dev/null +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/invoker.properties @@ -0,0 +1,15 @@ +### +# #%L +# CICS Bundle Maven Plugin +# %% +# Copyright (C) 2019 IBM Corp. +# %% +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# #L% +### +# The expected result of the build, possible values are "success" (default) and "failure" +invoker.buildResult = failure diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/pom.xml b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/pom.xml index 515b70be..d91cb397 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/pom.xml +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/pom.xml @@ -20,7 +20,8 @@ - + + @project.groupId@ @project.artifactId@ @@ -34,9 +35,8 @@ deploy - serverId + noRegion bundle - region BAR ${basedir}/test-app-bundle-0.0.1-SNAPSHOT.zip diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/postbuild.bsh b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/postbuild.bsh deleted file mode 100644 index d93e6103..00000000 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/postbuild.bsh +++ /dev/null @@ -1 +0,0 @@ -context.get("wireMockServer").shutdownServer(); \ No newline at end of file diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/postbuild.groovy b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/postbuild.groovy new file mode 100644 index 00000000..997b9f05 --- /dev/null +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/postbuild.groovy @@ -0,0 +1,22 @@ +/*- + * #%L + * CICS Bundle Maven Plugin + * %% + * Copyright (C) 2019 IBM Corp. + * %% + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * #L% + */ +import com.ibm.cics.cbmp.DeployPreBuild + +context.get("wireMockServer").shutdownServer() + +File buildLog = new File(basedir, 'build.log') + +assert buildLog.exists() +assert buildLog.text.contains("[ERROR] Failed to execute goal com.ibm.cics:cics-bundle-maven-plugin:") +assert buildLog.text.contains("(deploy) on project test-bundle-deploy-noRegion: Specify both or neither of cicsplex and region in plugin configuration or server configuration") diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/prebuild.bsh b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/prebuild.bsh index f4680d0e..61445190 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/prebuild.bsh +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/prebuild.bsh @@ -1 +1 @@ -context.put("wireMockServer", com.ibm.cics.cbmp.DeployPreBuild.setupWiremock(Integer.parseInt(wiremockPort))); \ No newline at end of file +context.put("wireMockServer", com.ibm.cics.cbmp.DeployPreBuild.setupSMSSWiremock(Integer.parseInt(wiremockPort))); \ No newline at end of file diff --git a/cics-bundle-maven-plugin/src/test/java/com/ibm/cics/cbmp/DeployPreBuild.java b/cics-bundle-maven-plugin/src/test/java/com/ibm/cics/cbmp/DeployPreBuild.java index 48401cd0..57f2f57d 100644 --- a/cics-bundle-maven-plugin/src/test/java/com/ibm/cics/cbmp/DeployPreBuild.java +++ b/cics-bundle-maven-plugin/src/test/java/com/ibm/cics/cbmp/DeployPreBuild.java @@ -77,17 +77,17 @@ static WireMockServer setupWiremock(int port, Protocol protocol) { .withName("region") .withBody(equalTo("region"))) .withMultipartRequestBody( - aMultipart() - .withName("bunddef") - .withBody(equalTo("bundle"))) + aMultipart() + .withName("bunddef") + .withBody(equalTo("bundle"))) .withMultipartRequestBody( - aMultipart() - .withName("csdgroup") - .withBody(equalTo("BAR"))) + aMultipart() + .withName("csdgroup") + .withBody(equalTo("BAR"))) .withMultipartRequestBody( - aMultipart() - .withName("bundle") - .withBody(WireMock.binaryEqualTo(bundleBinary))) + aMultipart() + .withName("bundle") + .withBody(WireMock.binaryEqualTo(bundleBinary))) .willReturn( aResponse() .withStatus(200) @@ -95,9 +95,88 @@ static WireMockServer setupWiremock(int port, Protocol protocol) { .withBody("Some content") ) ); + return wireMockServer; } - + + static WireMockServer setupWiremockNoCICSplexRegion(int port) { + ClassLoader ccl = Thread.currentThread().getContextClassLoader(); + + try { + Thread.currentThread().setContextClassLoader(WireMock.class.getClassLoader()); + wireMockServer = new WireMockServer(WireMockConfiguration.options().port(port)); + } finally { + Thread.currentThread().setContextClassLoader(ccl); + } + + wireMockServer.start(); + + wireMockServer + .stubFor( + post(urlEqualTo("/managedcicsbundles")) + .withMultipartRequestBody( + aMultipart() + .withName("bunddef") + .withBody(equalTo("bundle"))) + .withMultipartRequestBody( + aMultipart() + .withName("csdgroup") + .withBody(equalTo("BAR"))) + .withMultipartRequestBody( + aMultipart() + .withName("bundle") + .withBody(WireMock.binaryEqualTo(bundleBinary))) + .willReturn( + aResponse() + .withStatus(400) + .withHeader("Content-Type", "text/plain") + .withBody("com.ibm.cics.bundle.deploy.BundleDeployException: Some of the supplied parameters were invalid:\n" + + " - cicsplex: CICSplex could not be found") + ) + ); + + return wireMockServer; + } + + + static WireMockServer setupSMSSWiremock(int port) { + ClassLoader ccl = Thread.currentThread().getContextClassLoader(); + + try { + Thread.currentThread().setContextClassLoader(WireMock.class.getClassLoader()); + wireMockServer = new WireMockServer(WireMockConfiguration.options().port(port)); + } finally { + Thread.currentThread().setContextClassLoader(ccl); + } + + wireMockServer.start(); + + wireMockServer + .stubFor( + post(urlEqualTo("/managedcicsbundles")) + .withMultipartRequestBody( + aMultipart() + .withName("bunddef") + .withBody(equalTo("bundle"))) + .withMultipartRequestBody( + aMultipart() + .withName("csdgroup") + .withBody(equalTo("BAR"))) + .withMultipartRequestBody( + aMultipart() + .withName("bundle") + .withBody(WireMock.binaryEqualTo(bundleBinary))) + .willReturn( + aResponse() + .withStatus(200) + .withHeader("Content-Type", "text/plain") + .withBody("Some content") + ) + ); + return wireMockServer; + } + + /* * Used by test-reactor-war-deploy which builds the bundle and then tests deploying it, so we can't check for a specific binary for the bundle */ From 185900673b15bf3f1e232044b887e51a6011e441 Mon Sep 17 00:00:00 2001 From: Ledina Hido-Evans Date: Wed, 2 Feb 2022 13:46:35 +0000 Subject: [PATCH 12/13] Update copyrights to 2022 for files changed Signed-off-by: Ledina Hido-Evans Signed-off-by: Dave Nice --- .../src/it/test-bundle-deploy-neither-smss/pom.xml | 2 +- .../src/it/test-bundle-deploy-neither/invoker.properties | 2 +- .../src/it/test-bundle-deploy-neither/pom.xml | 2 +- .../src/it/test-bundle-deploy-neither/postbuild.groovy | 2 +- .../src/it/test-bundle-deploy-noCICSplex/invoker.properties | 2 +- .../src/it/test-bundle-deploy-noCICSplex/pom.xml | 2 +- .../src/it/test-bundle-deploy-noCICSplex/postbuild.groovy | 2 +- .../src/it/test-bundle-deploy-noRegion/invoker.properties | 2 +- .../src/it/test-bundle-deploy-noRegion/pom.xml | 2 +- .../src/it/test-bundle-deploy-noRegion/postbuild.groovy | 2 +- .../src/main/java/com/ibm/cics/cbmp/BundleDeployMojo.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/pom.xml b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/pom.xml index b8a13bb4..00b1e6e2 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/pom.xml +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither-smss/pom.xml @@ -2,7 +2,7 @@ #%L CICS Bundle Maven Plugin %% - Copyright (C) 2019 IBM Corp. + Copyright (C) 2022 IBM Corp. %% This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/invoker.properties b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/invoker.properties index f46ab66f..3c5a6cf9 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/invoker.properties +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/invoker.properties @@ -2,7 +2,7 @@ # #%L # CICS Bundle Maven Plugin # %% -# Copyright (C) 2019 IBM Corp. +# Copyright (C) 2022 IBM Corp. # %% # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/pom.xml b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/pom.xml index 01c81880..6290e571 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/pom.xml +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/pom.xml @@ -2,7 +2,7 @@ #%L CICS Bundle Maven Plugin %% - Copyright (C) 2019 IBM Corp. + Copyright (C) 2019,2022 IBM Corp. %% This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/postbuild.groovy b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/postbuild.groovy index e688de8b..5dbb4dde 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/postbuild.groovy +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-neither/postbuild.groovy @@ -2,7 +2,7 @@ * #%L * CICS Bundle Maven Plugin * %% - * Copyright (C) 2019 IBM Corp. + * Copyright (C) 2022 IBM Corp. * %% * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/invoker.properties b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/invoker.properties index f46ab66f..3c5a6cf9 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/invoker.properties +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/invoker.properties @@ -2,7 +2,7 @@ # #%L # CICS Bundle Maven Plugin # %% -# Copyright (C) 2019 IBM Corp. +# Copyright (C) 2022 IBM Corp. # %% # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/pom.xml b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/pom.xml index 83b3aec6..b2de7116 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/pom.xml +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/pom.xml @@ -2,7 +2,7 @@ #%L CICS Bundle Maven Plugin %% - Copyright (C) 2019 IBM Corp. + Copyright (C) 2019,2022 IBM Corp. %% This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/postbuild.groovy b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/postbuild.groovy index 20eb3e34..8e393198 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/postbuild.groovy +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noCICSplex/postbuild.groovy @@ -2,7 +2,7 @@ * #%L * CICS Bundle Maven Plugin * %% - * Copyright (C) 2019 IBM Corp. + * Copyright (C) 2022 IBM Corp. * %% * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/invoker.properties b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/invoker.properties index f46ab66f..3c5a6cf9 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/invoker.properties +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/invoker.properties @@ -2,7 +2,7 @@ # #%L # CICS Bundle Maven Plugin # %% -# Copyright (C) 2019 IBM Corp. +# Copyright (C) 2022 IBM Corp. # %% # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/pom.xml b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/pom.xml index d91cb397..b3bc0663 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/pom.xml +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/pom.xml @@ -2,7 +2,7 @@ #%L CICS Bundle Maven Plugin %% - Copyright (C) 2019 IBM Corp. + Copyright (C) 2019,2022 IBM Corp. %% This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 diff --git a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/postbuild.groovy b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/postbuild.groovy index 997b9f05..921759b1 100644 --- a/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/postbuild.groovy +++ b/cics-bundle-maven-plugin/src/it/test-bundle-deploy-noRegion/postbuild.groovy @@ -2,7 +2,7 @@ * #%L * CICS Bundle Maven Plugin * %% - * Copyright (C) 2019 IBM Corp. + * Copyright (C) 2022 IBM Corp. * %% * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 diff --git a/cics-bundle-maven-plugin/src/main/java/com/ibm/cics/cbmp/BundleDeployMojo.java b/cics-bundle-maven-plugin/src/main/java/com/ibm/cics/cbmp/BundleDeployMojo.java index abdb508d..ad59da46 100644 --- a/cics-bundle-maven-plugin/src/main/java/com/ibm/cics/cbmp/BundleDeployMojo.java +++ b/cics-bundle-maven-plugin/src/main/java/com/ibm/cics/cbmp/BundleDeployMojo.java @@ -4,7 +4,7 @@ * #%L * CICS Bundle Maven Plugin * %% - * Copyright (C) 2019 IBM Corp. + * Copyright (C) 2019,2022 IBM Corp. * %% * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 From 8334ce12bf13e421d8a01bb209708d2d97742749 Mon Sep 17 00:00:00 2001 From: Ledina Hido-Evans Date: Wed, 2 Feb 2022 15:39:07 +0000 Subject: [PATCH 13/13] Downgraded some of the plugins from milestones to releases maven-deploy-plugin and maven-install-plugin were agreed with Stew to be left at 3.0.0-M1 as that looks to be a major milestone/release Signed-off-by: Ledina Hido-Evans Signed-off-by: Dave Nice --- cics-bundle-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cics-bundle-maven-plugin/pom.xml b/cics-bundle-maven-plugin/pom.xml index 9b407156..086ed5ba 100644 --- a/cics-bundle-maven-plugin/pom.xml +++ b/cics-bundle-maven-plugin/pom.xml @@ -225,7 +225,7 @@ maven-surefire-plugin - 3.0.0-M5 + 2.22.2 diff --git a/pom.xml b/pom.xml index d49d42ab..4225faf8 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ org.apache.maven.doxia doxia-module-markdown - 2.0.0-M1 + 1.11.1 @@ -179,7 +179,7 @@ maven-deploy-plugin - 3.0.0-M2 + 3.0.0-M1 maven-install-plugin