Merge branch 'v3.x/staging' into user/markackert/holddata-automation

zowe · Jan 29, 2025 · 3dee4eb · 3dee4eb
2 parents 98b2e38 + 2b50022
commit 3dee4eb
Show file tree

Hide file tree

Showing 6 changed files with 1,479 additions and 5 deletions.
diff --git a/bin/commands/support/verify-fingerprints/.help b/bin/commands/support/verify-fingerprints/.help
@@ -0,0 +1,13 @@
+This command will gather the hash (fingerprint) of every file in the `zowe.runtimeDirectory`.
+The result is then compared with existing hashes.
+
+For best results, it is recommended to set all directories in the `zowe.yaml` configuration file
+which reside outside the `zowe.runtimeDirectory`. These are typically `zowe.workspaceDirectory`, 
+`zowe.logDirectory` and certificates directories.
+
+Java is required to run the hash utility. Make sure one of the following is set:
+* Environment variable `JAVA_HOME`
+* Environment variable `PATH` which includes `java`.
+
+Note: The `JAVA_HOME` path is the directory containing `bin/java`.
+For example, if java is at '/usr/lpp/java/current/bin/java', then set `JAVA_HOME` to '/usr/lpp/java/current'.
diff --git a/bin/libs/java.ts b/bin/libs/java.ts
@@ -102,8 +102,9 @@ export function validateJavaHome(javaHome:string|undefined=std.getenv("JAVA_HOME
     let versionLines = (version as string).split('\n'); // valid because of above rc check
     for (let i = 0; i < versionLines.length; i++) {
       if ((index = versionLines[i].indexOf('java version')) != -1) {
-        //format of: java version "1.8.0_321"
-        javaVersionShort=versionLines[i].substring(index+('java version'.length)+2, versionLines[i].length-1);
+        //format of: java version "1.8.0_321" OR java version "17.0.10" 2024-01-02
+        javaVersionShort = versionLines[i].substring(index+('java version'.length)+2);
+        javaVersionShort = javaVersionShort.replace(/"/g, '');
         break;
       } else if ((index = versionLines[i].indexOf('openjdk version')) != -1) {
         javaVersionShort=versionLines[i].substring(index+('openjdk version'.length)+2, versionLines[i].length-1);

diff --git a/files/defaults.yaml b/files/defaults.yaml
@@ -192,9 +192,9 @@ components:
       infinispan:
         # this is required if storage mode is infinispan
         jgroups:
-          port: 7600
+          port: 7098
           keyExchange:
-            port: 7601
+            port: 7099
 
   # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   app-server:

diff --git a/pswi/03_create.sh b/pswi/03_create.sh
@@ -29,7 +29,8 @@ echo "z/OSMF version     :" $ZOSMF_V
 ADD_SWI_JSON='{"name":"'${SWI_NAME}'","system":"'${ZOSMF_SYSTEM}'","description":"ZOWE v'${VERSION}' Portable Software Instance",
 "globalzone":"'${GLOBAL_ZONE}'","targetzones":["'${TZONE}'"],"workflows":[{"name":"ZOWE Mount Workflow","description":"This workflow performs mount action of ZOWE zFS.",
 "location": {"dsname":"'${WORKFLOW_DSN}'(ZWEWRF02)"}},{"name":"ZOWE Configuration of Zowe 3.0","description":"This workflow configures Zowe v3.0.",
-"location": {"dsname":"'${WORKFLOW_DSN}'(ZWECONF)"}},{"name":"ZOWE Creation of CSR request workflow","description":"This workflow creates a certificate sign request.",
+"location": {"dsname":"'${WORKFLOW_DSN}'(ZWECONF)"}},{"name":"ZOWE APIML optimized Configuration","description":"This simplified workflow configures APIML for Zowe 3.0.",
+"location": {"dsname":"'${WORKFLOW_DSN}'(ZWEAMLCF)"}},{"name":"ZOWE Creation of CSR request workflow","description":"This workflow creates a certificate sign request.",
 "location": {"dsname":"'${WORKFLOW_DSN}'(ZWECRECR)"}},{"name":"ZOWE Sign a CSR request","description":"This workflow signs the certificate sign request by a local CA.",
 "location": {"dsname":"'${WORKFLOW_DSN}'(ZWESIGNC)"}},{"name":"ZOWE Load Authentication Certificate into ESM","description":"This workflow loads a signed client authentication certificate to the ESM.",
 "location": {"dsname":"'${WORKFLOW_DSN}'(ZWELOADC)"}},{"name":"ZOWE Define key ring and certificates","description":"This workflow defines key ring and certificates for Zowe.",
@@ -145,6 +146,11 @@ echo "target=\"//'${WORKFLOW_DSN}(ZWESIGNC)'\";" >>JCL
 echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWESIGNC;" >>JCL
 echo "sed 's|UTF-8|IBM-1047|g' _ZWESIGNC > ZWESIGNC;" >>JCL
 echo "cp -T ZWESIGNC \$target;" >>JCL
+echo "source=\"${ZOWE_MOUNT}files/workflows/ZWEAMLCF.xml\";" >>JCL
+echo "target=\"//'${WORKFLOW_DSN}(ZWEAMLCF)'\";" >>JCL
+echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWEAMLCF;" >>JCL
+echo "sed 's|UTF-8|IBM-1047|g' _ZWEAMLCF > ZWEAMLCF;" >>JCL
+echo "cp -T ZWEAMLCF \$target;" >>JCL
 echo "source=\"${ZOWE_MOUNT}files/workflows/ZWECONF.xml\";" >>JCL
 echo "target=\"//'${WORKFLOW_DSN}(ZWECONF)'\";" >>JCL
 echo "iconv -f ISO8859-1 -t IBM-1047 \$source > _ZWECONF;" >>JCL

diff --git a/pswi/scripts/deploy_test_2_3.py b/pswi/scripts/deploy_test_2_3.py
@@ -315,6 +315,9 @@ def create_swi(self):
         {"name": "ZOWE Configuration of Zowe 3.0",
          "description": "This workflow configures Zowe v3.0.",
          "location": {"dsname": self.hlq + ".WORKFLOW(ZWECONF)"}},
+         {"name": "ZOWE APIML optimized Configuration",
+         "description": "This simplified workflow configures APIML for Zowe 3.0.",
+         "location": {"dsname": self.hlq + ".WORKFLOW(ZWEAMLCF)"}},
         {"name": "ZOWE Creation of CSR request workflow",
          "description": "This workflow creates a certificate sign request.",
          "location": {"dsname": self.hlq + ".WORKFLOW(ZWECRECR)"}},