diff --git a/example-zowe.yaml b/example-zowe.yaml
index 79aec60b1b..5cb1ec46f8 100644
--- a/example-zowe.yaml
+++ b/example-zowe.yaml
@@ -40,27 +40,27 @@ zowe:
dataset:
# **COMMONLY_CUSTOMIZED**
# where Zowe MVS data sets will be installed
- prefix: IBMUSER.ZWEV2
+ prefix: IBMUSER.ZWEV3
# **COMMONLY_CUSTOMIZED**
# PROCLIB where Zowe STCs will be copied over
proclib: USER.PROCLIB
# **COMMONLY_CUSTOMIZED**
# Zowe PARMLIB
- parmlib: IBMUSER.ZWEV2.CUST.PARMLIB
+ parmlib: IBMUSER.ZWEV3.CUST.PARMLIB
# Holds Zowe PARMLIB members for plugins
parmlibMembers:
# For ZIS plugins
zis: ZWESIP00
# **COMMONLY_CUSTOMIZED**
# JCL library where Zowe will store temporary JCLs during initialization
- jcllib: IBMUSER.ZWEV2.CUST.JCLLIB
+ jcllib: IBMUSER.ZWEV3.CUST.JCLLIB
# Utilities for use by Zowe and extensions
- loadlib: IBMUSER.ZWEV2.SZWELOAD
+ loadlib: IBMUSER.ZWEV3.SZWELOAD
# APF authorized LOADLIB for Zowe
- authLoadlib: IBMUSER.ZWEV2.SZWEAUTH
+ authLoadlib: IBMUSER.ZWEV3.SZWEAUTH
# **COMMONLY_CUSTOMIZED**
# APF authorized LOADLIB for Zowe ZIS Plugins
- authPluginLib: IBMUSER.ZWEV2.CUST.ZWESAPL
+ authPluginLib: IBMUSER.ZWEV3.CUST.ZWESAPL
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
# # Security related configurations. This setup is optional.
diff --git a/manifest.json.template b/manifest.json.template
index 2311a20676..b4ba678504 100644
--- a/manifest.json.template
+++ b/manifest.json.template
@@ -44,10 +44,10 @@
"artifact": "*.pax"
},
"org.zowe.explorer-jes": {
- "version": "^3.0.0-PR-389"
+ "version": "^3.0.0-SNAPSHOT"
},
"org.zowe.explorer-mvs": {
- "version": "^3.0.0-PR-263"
+ "version": "^3.0.0-SNAPSHOT"
},
"org.zowe.explorer-uss": {
"version": "^3.0.0-SNAPSHOT"
@@ -109,7 +109,7 @@
"artifact": "*.pax"
},
"org.zowe.launcher": {
- "version": "^2.0.0-STAGING"
+ "version": "^3.0.0-STAGING"
},
"org.zowe.keyring-utilities": {
"version": "1.0.4",
diff --git a/pswi/03_create.sh b/pswi/03_create.sh
index 724ab7ad61..6feb2d56a7 100644
--- a/pswi/03_create.sh
+++ b/pswi/03_create.sh
@@ -28,7 +28,7 @@ echo "z/OSMF version :" $ZOSMF_V
# JSONs
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 2.0","description":"This workflow configures Zowe v2.0.",
+"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}'(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.",
diff --git a/pswi/scripts/base_diff.txt b/pswi/scripts/base_diff.txt
index d23d5ebdc1..ad4425a61f 100644
--- a/pswi/scripts/base_diff.txt
+++ b/pswi/scripts/base_diff.txt
@@ -1,7 +1,7 @@
-483c
+471c
home: "#delete_me#"
.
-468c
+456c
home: "#delete_me#"
.
281c
diff --git a/pswi/scripts/deploy_test_2_3.py b/pswi/scripts/deploy_test_2_3.py
index f06a631379..7163577ce5 100644
--- a/pswi/scripts/deploy_test_2_3.py
+++ b/pswi/scripts/deploy_test_2_3.py
@@ -196,8 +196,8 @@ def create_swi(self):
{"name": "ZOWE Mount Workflow",
"description": "This workflow performs mount action of ZOWE zFS.",
"location": {"dsname": self.hlq + ".WORKFLOW(ZWEWRF02)"}},
- {"name": "ZOWE Configuration of Zowe 2.0",
- "description": "This workflow configures Zowe v2.0.",
+ {"name": "ZOWE Configuration of Zowe 3.0",
+ "description": "This workflow configures Zowe v3.0.",
"location": {"dsname": self.hlq + ".WORKFLOW(ZWECONF)"}},
{"name":"ZOWE Creation of CSR request workflow",
"description":"This workflow creates a certificate sign request.",
diff --git a/workflows/files/ZWECONF.properties b/workflows/files/ZWECONF.properties
index ccf3efc3a8..be0fd50ae0 100644
--- a/workflows/files/ZWECONF.properties
+++ b/workflows/files/ZWECONF.properties
@@ -612,14 +612,6 @@ components_zss_port=7557
# Name for the ZSS cross memory server
components_zss_crossMemoryServerName=ZWESIS_STD
-# components_zss_tls
-# Label: ZSS TLS
-# Abstract: Check this to enable TLS on ZSS
-# Category: components
-# Description:
-# Check this to enable TLS on ZSS
-components_zss_tls=true
-
# components_zss_agent_jwt_fallback
# Label: ZSS JWT fallback
# Abstract: Check this to enable fallback
@@ -660,14 +652,6 @@ components_explorer_mvs_enabled=true
# Check this option to enable the USS explorer.
components_explorer_uss_enabled=true
-# useconfig_manager_enabled
-# Label: Enable Zowe configuration manager
-# Abstract: Check this option to enable Zowe configuration manager
-# Category: configManager
-# Description:
-# Check this option to enable Zowe configuration manager.
-useconfig_manager_enabled=true
-
# config_manager_validation
# Label: Zowe configuration manager validation type
# Abstract: STRICT or COMPONENT-COMPAT validation type
@@ -675,7 +659,7 @@ useconfig_manager_enabled=true
# Description:
# STRICT=quit on any error, COMPONENT-COMPAT=if component missing schema, skip it with warning instead of quit
# Choices: COMPONENT-COMPAT,STRICT
-config_manager_validation=COMPONENT-COMPAT
+config_manager_validation=STRICT
# zowe_rbacProfileId
# Label: Zowe Profile Identifier
@@ -774,4 +758,4 @@ zowe_setup_security_stcs_aux=ZWESASTC
# Check this option to enable the optional workflow step with zwe install command. After Zowe convenience build is extracted,
# you can enable this flag to run the zwe install command to install MVS data sets within this workflow run.
# This option is for convenience build only. SMP/E installs the MVS data sets during installation.
-zowe_setup_installStep_enabled=false
\ No newline at end of file
+zowe_setup_installStep_enabled=false
diff --git a/workflows/files/ZWECONF.xml b/workflows/files/ZWECONF.xml
index b9a54cde87..db0a2ce898 100644
--- a/workflows/files/ZWECONF.xml
+++ b/workflows/files/ZWECONF.xml
@@ -867,17 +867,6 @@ How we want to verify SSL certificates of services. Valid values are:
ZWESIS_STD
-
-
- Check this to enable TLS on ZSS
- Check this to enable TLS on ZSS
- components
-
-
-
- true
-
-
Check this to enable fallback
@@ -933,17 +922,6 @@ How we want to verify SSL certificates of services. Valid values are:
true
-
-
- Check this option to enable Zowe configuration manager
- Check this option to enable Zowe configuration manager.
- configManager
-
-
-
- true
-
-
STRICT or COMPONENT-COMPAT validation type
@@ -954,7 +932,7 @@ How we want to verify SSL certificates of services. Valid values are:
COMPONENT-COMPAT
STRICT
- COMPONENT-COMPAT
+ STRICT
@@ -1155,7 +1133,6 @@ How we want to verify SSL certificates of services. Valid values are:
-
@@ -1419,7 +1396,6 @@ How we want to verify SSL certificates of services. Valid values are:
-
Run this step to specify the values for the ZSS variables
@@ -1756,18 +1732,6 @@ echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.ya
echo ' # Where extensions are installed' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' extensionDirectory: $!{instance-zowe_extensionDirectory}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo '' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' # **COMMONLY_CUSTOMIZED**' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' useConfigmgr: $!{instance-useconfig_manager_enabled}' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' # Setting to true will enable:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' # * schema-backed validation of zowe.yaml' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' # * should greatly improve startup time.' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' # * can supply multiple zowe.yaml as defaults & overrides in the format of' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' # FILE(/my/customizations.yaml):PARMLIB(MYORG.ZOWE(YAML)):FILE(/zowe/defaults.yaml)' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' # * allows templating in zowe.yaml by putting references within ${{ }} blocks such as' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' # rewriting the job section below as' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' # job:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' # name: ${{ zowe.job.prefix }}SV' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' # prefix: ZWE1' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' configmgr:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # STRICT=quit on any error, including missing schema' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' # COMPONENT-COMPAT=if component missing schema, skip it with warning instead of quit' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
@@ -2009,7 +1973,7 @@ echo ' security:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' auth:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' provider: zosmf' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' zosmf:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
-echo ' jwtAutoconfiguration: auto' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
+echo ' jwtAutoconfiguration: jwt' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' serviceId: ibmzosmf' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' authorization:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"
echo ' endpoint:' >> "${instance-zowe_runtimeDirectory}/zowe.yaml"