From 3e044a2852bef8708003dd6319ab08cfb0c4e08e Mon Sep 17 00:00:00 2001 From: zowe-robot Date: Thu, 6 Jun 2019 16:04:09 +0000 Subject: [PATCH 01/14] 0.2.5 Signed-off-by: zowe-robot --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ff8010c2..f9a7bdb8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ artifactoryPublishingMavenRepo=https://gizaartifactory.jfrog.io/gizaartifactory/ artifactoryPublishingMavenSnapshotRepo=https://gizaartifactory.jfrog.io/gizaartifactory/libs-snapshot-local # Artifacts version -version=0.2.4 +version=0.2.5 defaultSpringBootVersion=2.0.2.RELEASE defaultSpringBootCloudVersion=2.0.0.RELEASE From ad84b56f5c1d7a3d85c3d7d8882a12b99f98f873 Mon Sep 17 00:00:00 2001 From: "Jack (T.) Jia" Date: Thu, 13 Jun 2019 15:14:47 -0400 Subject: [PATCH 02/14] add more admins Signed-off-by: Jack (T.) Jia --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ca6cf295..f223e6eb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ node('ibm-jenkins-slave-nvm') { def pipeline = lib.pipelines.gradle.GradlePipeline.new(this) - pipeline.admins.add("jackjia") + pipeline.admins.add("jackjia", "jcain", "stevenh") // we have extra parameters for integration test pipeline.addBuildParameters( From ad657735e8a7747189ff78c570dc43abece66484 Mon Sep 17 00:00:00 2001 From: Yan Li Date: Tue, 18 Jun 2019 13:47:49 -0400 Subject: [PATCH 03/14] adding AppScan config file Signed-off-by: Yan Li --- jobs.ppf | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 jobs.ppf diff --git a/jobs.ppf b/jobs.ppf new file mode 100644 index 00000000..b230e9e8 --- /dev/null +++ b/jobs.ppf @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + From a0118f656632524513746c67b81c77414c25cb26 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Wed, 19 Jun 2019 11:38:48 +0100 Subject: [PATCH 04/14] Update properites in start script Signed-off-by: stevenhorsman --- .../scripts/jobs-api-server-start.sh | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh index a18886a3..390a96b2 100644 --- a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh +++ b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh @@ -1,13 +1,13 @@ # Variables to be replaced: -# - JAVA_SETUP -- sets JAVA_HOME by ZOWE_JAVA_HOME -# - SERVER_PORT - The port the jobs server will use +# - ZOWE_JAVA_HOME - JAVA_HOME that zowe is using +# - JOBS_API_PORT - The port the data sets server will use # - KEYSTORE - The keystore to use for SSL certificates # - KEYSTORE_PASSWORD - The password to access the keystore supplied by KEYSTORE # - KEY_ALIAS - The alias of the key within the keystore -# - ZOSMF_HTTPS_PORT - The SSL port z/OSMF is listening on. -# - ZOSMF_IP - The IP Address z/OSMF can be reached +# - ZOSMF_PORT - The SSL port z/OSMF is listening on. +# - ZOSMF_IP_ADDRESS - The IP Address z/OSMF can be reached -**JAVA_SETUP** +export JAVA_HOME=$ZOWE_JAVA_HOME if [[ ":$PATH:" == *":$JAVA_HOME/bin:"* ]]; then echo "ZOWE_JAVA_HOME already exists on the PATH" else @@ -20,11 +20,11 @@ DIR=`dirname $0` java -Xms16m -Xmx512m -Dibm.serversocket.recover=true -Dfile.encoding=UTF-8 \ -Djava.io.tmpdir=/tmp -Xquickstart \ - -Dserver.port=**SERVER_PORT** \ - -Dserver.ssl.keyAlias=**KEY_ALIAS** \ - -Dserver.ssl.keyStore=**KEYSTORE** \ - -Dserver.ssl.keyStorePassword=**KEYSTORE_PASSWORD** \ + -Dserver.port=${JOBS_API_PORT} \ + -Dserver.ssl.keyAlias=${KEY_ALIAS} \ + -Dserver.ssl.keyStore=${KEYSTORE} \ + -Dserver.ssl.keyStorePassword=${KEYSTORE_PASSWORD} \ -Dserver.ssl.keyStoreType=PKCS12 \ - -Dzosmf.httpsPort=**ZOSMF_HTTPS_PORT** \ - -Dzosmf.ipAddress=**ZOSMF_IP** \ - -jar $DIR/../**JOBS_JAR** & + -Dzosmf.httpsPort=${ZOSMF_PORT} \ + -Dzosmf.ipAddress=${ZOSMF_IP_ADDRESS} \ + -jar $DIR/../{{jar_name}} & From 93840829ac2ba5c324562708e75859b4780fc2ff Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Wed, 19 Jun 2019 15:59:25 +0100 Subject: [PATCH 05/14] Update jar injection Signed-off-by: stevenhorsman --- .../src/main/resources/scripts/jobs-api-server-start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh index 390a96b2..a36a0930 100644 --- a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh +++ b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh @@ -27,4 +27,4 @@ java -Xms16m -Xmx512m -Dibm.serversocket.recover=true -Dfile.encoding=UTF-8 \ -Dserver.ssl.keyStoreType=PKCS12 \ -Dzosmf.httpsPort=${ZOSMF_PORT} \ -Dzosmf.ipAddress=${ZOSMF_IP_ADDRESS} \ - -jar $DIR/../{{jar_name}} & + -jar {{jar_path}} & From 854486f2da297e0d3fca82e98efc945a26bf6b16 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Fri, 21 Jun 2019 14:19:40 +0100 Subject: [PATCH 06/14] Add script to setup api-defs Signed-off-by: stevenhorsman --- .../src/main/resources/scripts/configure.sh | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 jobs-zowe-server-package/src/main/resources/scripts/configure.sh diff --git a/jobs-zowe-server-package/src/main/resources/scripts/configure.sh b/jobs-zowe-server-package/src/main/resources/scripts/configure.sh new file mode 100644 index 00000000..f9dec1aa --- /dev/null +++ b/jobs-zowe-server-package/src/main/resources/scripts/configure.sh @@ -0,0 +1,27 @@ +# Add static definition for jobs-api +cat <${STATIC_DEF_CONFIG_DIR}/jobs-api.ebcidic.yml +# +services: + - serviceId: jobs + title: IBM z/OS Jobs + description: IBM z/OS Jobs REST API service + catalogUiTileId: jobs + instanceBaseUrls: + - https://${ZOWE_EXPLORER_HOST}:${JOBS_API_PORT}/ + homePageRelativeUrl: + routedServices: + - gatewayUrl: api/v1 + serviceRelativeUrl: api/v1/jobs + apiInfo: + - apiId: com.ibm.jobs + gatewayUrl: api/v1 + version: 1.0.0 + documentationUrl: https://${ZOWE_EXPLORER_HOST}:${JOBS_API_PORT}/swagger-ui.html +catalogUiTiles: + jobs: + title: z/OS Jobs services + description: IBM z/OS Jobs REST services +EOF +iconv -f IBM-1047 -t IBM-850 ${STATIC_DEF_CONFIG_DIR}/jobs-api.ebcidic.yml > $STATIC_DEF_CONFIG_DIR/jobs-api.yml +rm ${STATIC_DEF_CONFIG_DIR}/jobs-api.ebcidic.yml +chmod 755 $STATIC_DEF_CONFIG_DIR/jobs-api.yml \ No newline at end of file From fd25e689ea243a3622d96f774233db98c878d915 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Fri, 21 Jun 2019 14:20:22 +0100 Subject: [PATCH 07/14] Remove unneeded file Signed-off-by: stevenhorsman --- .../src/main/resources/scripts/jobs-api-server-start.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh index a36a0930..eb20e820 100644 --- a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh +++ b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh @@ -16,8 +16,6 @@ else echo "Done." fi -DIR=`dirname $0` - java -Xms16m -Xmx512m -Dibm.serversocket.recover=true -Dfile.encoding=UTF-8 \ -Djava.io.tmpdir=/tmp -Xquickstart \ -Dserver.port=${JOBS_API_PORT} \ From f4aff2b22e4b6cb4c0880c773f2d7e9199e2773e Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Mon, 24 Jun 2019 11:08:34 +0100 Subject: [PATCH 08/14] Give the api scripts unique names based on component id Signed-off-by: stevenhorsman --- .../resources/scripts/{configure.sh => jobs-api-configure.sh} | 0 .../scripts/{jobs-api-server-start.sh => jobs-api-start.sh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename jobs-zowe-server-package/src/main/resources/scripts/{configure.sh => jobs-api-configure.sh} (100%) rename jobs-zowe-server-package/src/main/resources/scripts/{jobs-api-server-start.sh => jobs-api-start.sh} (100%) diff --git a/jobs-zowe-server-package/src/main/resources/scripts/configure.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh similarity index 100% rename from jobs-zowe-server-package/src/main/resources/scripts/configure.sh rename to jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh diff --git a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh similarity index 100% rename from jobs-zowe-server-package/src/main/resources/scripts/jobs-api-server-start.sh rename to jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh From 948625bb958078bb4ed917e716e14e6d38801325 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Mon, 24 Jun 2019 11:48:27 +0100 Subject: [PATCH 09/14] Add new scripts to gradle build Signed-off-by: stevenhorsman --- jobs-zowe-server-package/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jobs-zowe-server-package/build.gradle b/jobs-zowe-server-package/build.gradle index f3813f77..965e1d76 100644 --- a/jobs-zowe-server-package/build.gradle +++ b/jobs-zowe-server-package/build.gradle @@ -20,13 +20,14 @@ task packageJobsApiServer(type: Zip) { } into('scripts/') { - from "$buildDir/convert/jobs-api-server-start.sh" + from "$buildDir/convert/jobs-api-start.sh", "$buildDir/convert/jobs-api-configure.sh" } } packageJobsApiServer.doFirst { List scriptFiles = new ArrayList() {{ - add(file('src/main/resources/scripts/jobs-api-server-start.sh')); + add(file('src/main/resources/scripts/jobs-api-start.sh')); + add(file('src/main/resources/scripts/jobs-api-configure.sh')); }}; for (File scriptFile : scriptFiles){ def inputStream = new InputStreamReader(new FileInputStream(scriptFile), "ISO-8859-1"); From b3c21a186c6fd7fd395ccb0d3009b8b82288ed72 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Thu, 11 Jul 2019 16:16:37 +0100 Subject: [PATCH 10/14] Attempt to add BPX_JOBNAME in start script Signed-off-by: stevenhorsman --- .../src/main/resources/scripts/jobs-api-start.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh index eb20e820..880305c0 100644 --- a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh +++ b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh @@ -16,7 +16,8 @@ else echo "Done." fi -java -Xms16m -Xmx512m -Dibm.serversocket.recover=true -Dfile.encoding=UTF-8 \ +ZOWE_EXPL_JOBS=EAJ1 +_BPX_JOBNAME=${ZOWE_PREFIX}${COMPONENT_CODE} java -Xms16m -Xmx512m -Dibm.serversocket.recover=true -Dfile.encoding=UTF-8 \ -Djava.io.tmpdir=/tmp -Xquickstart \ -Dserver.port=${JOBS_API_PORT} \ -Dserver.ssl.keyAlias=${KEY_ALIAS} \ From 24dae4f1a323951fdcc91be916d07aaac5e68336 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Tue, 13 Aug 2019 11:42:43 +0100 Subject: [PATCH 11/14] Update permissions Signed-off-by: stevenhorsman --- .../src/main/resources/scripts/jobs-api-configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh index 46a85252..a2eb4dfc 100644 --- a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh +++ b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh @@ -24,7 +24,7 @@ catalogUiTiles: EOF iconv -f IBM-1047 -t IBM-850 ${STATIC_DEF_CONFIG_DIR}/jobs-api.ebcidic.yml > $STATIC_DEF_CONFIG_DIR/jobs-api.yml rm ${STATIC_DEF_CONFIG_DIR}/jobs-api.ebcidic.yml -chmod 755 $STATIC_DEF_CONFIG_DIR/jobs-api.yml +chmod 770 $STATIC_DEF_CONFIG_DIR/jobs-api.yml #Make sure Java is available on the path - TODO needed at all, move to a all zowe setup/validate? export JAVA_HOME=$ZOWE_JAVA_HOME From 7594f42565a5ef42af31e29cbd81b244df4c25a8 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Tue, 20 Aug 2019 14:57:42 +0100 Subject: [PATCH 12/14] Add copyright Signed-off-by: stevenhorsman --- .../resources/scripts/jobs-api-configure.sh | 10 ++++++ .../main/resources/scripts/jobs-api-start.sh | 17 ++++++++-- .../resources/scripts/jobs-api-validate.sh | 34 +++++++++++++++++++ 3 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 jobs-zowe-server-package/src/main/resources/scripts/jobs-api-validate.sh diff --git a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh index a2eb4dfc..9269f259 100644 --- a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh +++ b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh @@ -1,3 +1,13 @@ +################################################################################ +# This program and the accompanying materials are made available under the terms of the +# Eclipse Public License v2.0 which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-v20.html +# +# SPDX-License-Identifier: EPL-2.0 +# +# Copyright IBM Corporation 2019 +################################################################################ + # Add static definition for jobs-api cat <${STATIC_DEF_CONFIG_DIR}/jobs-api.ebcidic.yml # diff --git a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh index 88cf6164..c915f7ab 100644 --- a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh +++ b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh @@ -1,13 +1,24 @@ -# Variables to be replaced: -# - ZOWE_JAVA_HOME - JAVA_HOME that zowe is using +################################################################################ +# This program and the accompanying materials are made available under the terms of the +# Eclipse Public License v2.0 which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-v20.html +# +# SPDX-License-Identifier: EPL-2.0 +# +# Copyright IBM Corporation 2018, 2019 +################################################################################ + +# Variables required on shell: +# - ZOWE_PREFIX # - JOBS_API_PORT - The port the data sets server will use +# - KEY_ALIAS # - KEYSTORE - The keystore to use for SSL certificates # - KEYSTORE_PASSWORD - The password to access the keystore supplied by KEYSTORE # - KEY_ALIAS - The alias of the key within the keystore # - ZOSMF_PORT - The SSL port z/OSMF is listening on. # - ZOSMF_IP_ADDRESS - The IP Address z/OSMF can be reached -ZOWE_EXPL_JOBS=EAJ1 +COMPONENT_CODE=EAJ1 _BPX_JOBNAME=${ZOWE_PREFIX}${COMPONENT_CODE} java -Xms16m -Xmx512m -Dibm.serversocket.recover=true -Dfile.encoding=UTF-8 \ -Djava.io.tmpdir=/tmp -Xquickstart \ -Dserver.port=${JOBS_API_PORT} \ diff --git a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-validate.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-validate.sh new file mode 100644 index 00000000..11eef5a5 --- /dev/null +++ b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-validate.sh @@ -0,0 +1,34 @@ +################################################################################ +# This program and the accompanying materials are made available under the terms of the +# Eclipse Public License v2.0 which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-v20.html +# +# SPDX-License-Identifier: EPL-2.0 +# +# Copyright IBM Corporation 2019 +################################################################################ + +#Configure and start require: +# - ZOWE_PREFIX +# - JOBS_API_PORT - The port the data sets server will use +# - KEY_ALIAS +# - KEYSTORE - The keystore to use for SSL certificates +# - KEYSTORE_PASSWORD - The password to access the keystore supplied by KEYSTORE +# - KEY_ALIAS - The alias of the key within the keystore +# - ZOSMF_PORT - The SSL port z/OSMF is listening on. +# - ZOSMF_IP_ADDRESS - The IP Address z/OSMF can be reached +# - STATIC_DEF_CONFIG_DIR +# - ZOWE_EXPLORER_HOST +# - ZOWE_JAVA_HOME + + + +#Make sure Java is available on the path - TODO needed at all, move to a all zowe setup/validate? +export JAVA_HOME=$ZOWE_JAVA_HOME +if [[ ":$PATH:" == *":$JAVA_HOME/bin:"* ]]; then + echo "ZOWE_JAVA_HOME already exists on the PATH" +else + echo "Appending ZOWE_JAVA_HOME/bin to the PATH..." + export PATH=$PATH:$JAVA_HOME/bin + echo "Done." +fi \ No newline at end of file From c6ed2146d9ee1adcadd151cf37770bd2a7608fd2 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Mon, 2 Sep 2019 15:45:01 +0100 Subject: [PATCH 13/14] Update comp code Signed-off-by: stevenhorsman --- .../resources/scripts/jobs-api-configure.sh | 2 ++ .../main/resources/scripts/jobs-api-start.sh | 4 ++- .../resources/scripts/jobs-api-validate.sh | 34 ------------------- 3 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 jobs-zowe-server-package/src/main/resources/scripts/jobs-api-validate.sh diff --git a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh index 9269f259..37d9ca70 100644 --- a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh +++ b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-configure.sh @@ -1,3 +1,5 @@ +#!/bin/sh + ################################################################################ # This program and the accompanying materials are made available under the terms of the # Eclipse Public License v2.0 which accompanies this distribution, and is available at diff --git a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh index c915f7ab..2e01f3b1 100644 --- a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh +++ b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-start.sh @@ -1,3 +1,5 @@ +#!/bin/sh + ################################################################################ # This program and the accompanying materials are made available under the terms of the # Eclipse Public License v2.0 which accompanies this distribution, and is available at @@ -18,7 +20,7 @@ # - ZOSMF_PORT - The SSL port z/OSMF is listening on. # - ZOSMF_IP_ADDRESS - The IP Address z/OSMF can be reached -COMPONENT_CODE=EAJ1 +COMPONENT_CODE=EJ _BPX_JOBNAME=${ZOWE_PREFIX}${COMPONENT_CODE} java -Xms16m -Xmx512m -Dibm.serversocket.recover=true -Dfile.encoding=UTF-8 \ -Djava.io.tmpdir=/tmp -Xquickstart \ -Dserver.port=${JOBS_API_PORT} \ diff --git a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-validate.sh b/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-validate.sh deleted file mode 100644 index 11eef5a5..00000000 --- a/jobs-zowe-server-package/src/main/resources/scripts/jobs-api-validate.sh +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# This program and the accompanying materials are made available under the terms of the -# Eclipse Public License v2.0 which accompanies this distribution, and is available at -# https://www.eclipse.org/legal/epl-v20.html -# -# SPDX-License-Identifier: EPL-2.0 -# -# Copyright IBM Corporation 2019 -################################################################################ - -#Configure and start require: -# - ZOWE_PREFIX -# - JOBS_API_PORT - The port the data sets server will use -# - KEY_ALIAS -# - KEYSTORE - The keystore to use for SSL certificates -# - KEYSTORE_PASSWORD - The password to access the keystore supplied by KEYSTORE -# - KEY_ALIAS - The alias of the key within the keystore -# - ZOSMF_PORT - The SSL port z/OSMF is listening on. -# - ZOSMF_IP_ADDRESS - The IP Address z/OSMF can be reached -# - STATIC_DEF_CONFIG_DIR -# - ZOWE_EXPLORER_HOST -# - ZOWE_JAVA_HOME - - - -#Make sure Java is available on the path - TODO needed at all, move to a all zowe setup/validate? -export JAVA_HOME=$ZOWE_JAVA_HOME -if [[ ":$PATH:" == *":$JAVA_HOME/bin:"* ]]; then - echo "ZOWE_JAVA_HOME already exists on the PATH" -else - echo "Appending ZOWE_JAVA_HOME/bin to the PATH..." - export PATH=$PATH:$JAVA_HOME/bin - echo "Done." -fi \ No newline at end of file From 75ed3a2b0db1b0ff1a8886200b6f1bdb610e34ec Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Mon, 2 Sep 2019 15:48:30 +0100 Subject: [PATCH 14/14] Bump version Signed-off-by: stevenhorsman --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ab0af593..479d361c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ artifactoryPublishingMavenRepo=https://gizaartifactory.jfrog.io/gizaartifactory/ artifactoryPublishingMavenSnapshotRepo=https://gizaartifactory.jfrog.io/gizaartifactory/libs-snapshot-local # Artifacts version -version=0.2.6 +version=0.2.7 defaultSpringBootVersion=2.0.2.RELEASE defaultSpringBootCloudVersion=2.0.0.RELEASE