Merge pull request #185 from davenice/update-for-103

Update for 103
IBM · Feb 4, 2022 · 9184624 · 9184624
2 parents 03e9af5 + 9c8a6bc
commit 9184624
Show file tree

Hide file tree

Showing 14 changed files with 581 additions and 23 deletions.
diff --git 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=<my-groupid> -DartifactId=<my-artifactId>
+         mvn archetype:generate -DarchetypeGroupId=com.ibm.cics -DarchetypeArtifactId=cics-bundle-deploy-reactor-archetype -DarchetypeVersion=1.0.3 -DgroupId=<my-groupid> -DartifactId=<my-artifactId>
          ```
          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
@@ -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:
         <plugin>
           <groupId>com.ibm.cics</groupId>
           <artifactId>cics-bundle-maven-plugin</artifactId>
-          <version>1.0.2</version>
+          <version>1.0.3</version>
           <extensions>true</extensions>
         </plugin>
       </plugins>
@@ -127,7 +127,7 @@ To create a CICS bundle in this way:
         <plugin>
           <groupId>com.ibm.cics</groupId>
           <artifactId>cics-bundle-maven-plugin</artifactId>
-          <version>1.0.2</version>
+          <version>1.0.3</version>
           <extensions>true</extensions>
           <configuration>
             <defaultjvmserver>DFHWLP</defaultjvmserver>
@@ -159,7 +159,7 @@ To create a CICS bundle in this way:
         <plugin>
           <groupId>com.ibm.cics</groupId>
           <artifactId>cics-bundle-maven-plugin</artifactId>
-          <version>1.0.2</version>
+          <version>1.0.3</version>
           <executions>
             <execution>
               <goals>
@@ -192,14 +192,18 @@ The bundle directory of the BUNDLE definition should be set as follows: `<bundle
         <plugin>
           <groupId>com.ibm.cics</groupId>
           <artifactId>cics-bundle-maven-plugin</artifactId>
-          <version>1.0.2</version>
+          <version>1.0.3</version>
           <executions>
             <execution>
               <goals>
                 <goal>bundle-war</goal>
                 <goal>deploy</goal>
               </goals>
               <configuration>
+                <!-- if you are deploying a Java module that also builds the CICS bundle,
+                     you must specify the artifact with the cics-bundle classifier to be deployed.
+                <classifier>cics-bundle</classifier>
+                -->
                 <defaultjvmserver>DFHWLP</defaultjvmserver>
                 <url>http://yourcicsurl.com:9080</url>
                 <username>${cics-user-id}</username>
@@ -222,8 +226,8 @@ The bundle directory of the BUNDLE definition should be set as follows: `<bundle
    * `username` & `password` - These are your credentials for CICS. Use Maven's password encryption, or supply your credentials using environment variables or properties
    * `bunddef` - The name of the BUNDLE definition to be installed
    * `csdgroup` - The name of the CSD group that contains the BUNDLE definition
-   * `cicsplex` - The name of  the CICSplex that the target region belongs to
-   * `region` - The name of the region that the bundle should be installed to
+   * `cicsplex` - The name of the CICSplex that the target region belongs to. This value is ignored in a single CICS region environment (SMSS).
+   * `region` - The name of the region that the bundle should be installed to. This value is ignored in a single CICS region environment (SMSS).
 
   Now if you run the Maven build it will create the CICS bundle as above, and install this in CICS. If you run into an `unable to find valid certification path to requested target` error during deployment, see [Troubleshooting](#troubleshooting) for a fix.
 

diff --git a/cics-bundle-deploy-reactor-archetype/pom.xml b/cics-bundle-deploy-reactor-archetype/pom.xml
@@ -4,7 +4,7 @@
   <parent>
   	<groupId>com.ibm.cics</groupId>
     <artifactId>cics-bundle-maven</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
   </parent>
 
   <artifactId>cics-bundle-deploy-reactor-archetype</artifactId>

diff --git a/cics-bundle-maven-plugin/pom.xml b/cics-bundle-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.ibm.cics</groupId>
     <artifactId>cics-bundle-maven</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
   </parent>
 
   <artifactId>cics-bundle-maven-plugin</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.ibm.cics</groupId>
       <artifactId>cics-bundle-common</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
+      <version>1.0.4</version>
     </dependency>
     <dependency>
       <groupId>org.sonatype.plexus</groupId>

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
@@ -73,15 +73,15 @@ 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.
 	 */
 	@Parameter(property="cicsbundle.cicsplex")
 	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.
 	 */