From 9396ca1831ae4a085d3d0da6ed1a609f30ff3ad1 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Wed, 30 Jun 2021 14:35:23 +0100
Subject: [PATCH 01/26] Update 20200316.md

---
 Documentation/meetings/20200316.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/meetings/20200316.md b/Documentation/meetings/20200316.md
index 0db189c..fd1613d 100644
--- a/Documentation/meetings/20200316.md
+++ b/Documentation/meetings/20200316.md
@@ -23,4 +23,4 @@ Meeting notes:
   - Discussion about developing for Polycephaly project
 - Developing or adding to the Issue's log, with various tags, like #NewFeature, #Bug, etc
 - Added Meeting information to the README.md, along with information about how to contribute, get involved, etc.
-- Clean up the various documentation
+- Clean up the various documentation.

From dad23fc1b9a6c8796cff33d5af4b330b79f92123 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Fri, 16 Jul 2021 23:58:34 +0100
Subject: [PATCH 02/26] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4c20da5..769cdf9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
 		srcGroovyPrgUtil	= 'src/main/groovy/com/zos/program/utilities'
 
         javaHome			= '/usr/lpp/java/J8.0_64/bin'
-		groovyHome			= '/u/jerrye/bin'
+		groovyHome			= '/u/jerrye/Jenkins/groovy/bin'
         groovyzHome			= '/opt/lpp/IBM/dbb/bin'
 		DBB_HOME			= '/opt/lpp/IBM/dbb'
 		DBB_CONF			= "${WORKSPACE}/conf"

From 67f0b187f0f690e901ef2e17ec505d25bbd1abde Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Sat, 17 Jul 2021 00:05:03 +0100
Subject: [PATCH 03/26] Set Debug varialble to true

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 769cdf9..0e699bb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
         projectClean		= 'true'
         DBBClean			= 'false'
         projectDelete		= 'false'
-        Debug				= 'false'
+        Debug				= 'true'
         CollectionName		= 'Polycephaly'
         libDir				= 'lib'
 		classesDir			= 'classes'

From 93fb14ae9c8a4098e79376ed7a50da4b784596cc Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Sat, 17 Jul 2021 08:13:49 +0100
Subject: [PATCH 04/26] Added Groovy_HOME variable to environment

---
 Jenkinsfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0e699bb..43c6824 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,8 +18,10 @@ pipeline {
 		srcGroovyPrgUtil	= 'src/main/groovy/com/zos/program/utilities'
 
         javaHome			= '/usr/lpp/java/J8.0_64/bin'
-		groovyHome			= '/u/jerrye/Jenkins/groovy/bin'
-        groovyzHome			= '/opt/lpp/IBM/dbb/bin'
+		groovyHome			= '/opt/lpp/IBM/dbb/groovy-2.4.12/'
+	    	GROOVY_HOME		='/opt/lpp/IBM/dbb/groovy-2.4.12/'
+        //groovyzHome			= '/opt/lpp/IBM/dbb/bin'
+	  groovyzhome			='/u/jerrye/bin'
 		DBB_HOME			= '/opt/lpp/IBM/dbb'
 		DBB_CONF			= "${WORKSPACE}/conf"
 

From 16e6d62cded779b6b4791c454915571e40189634 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Sun, 18 Jul 2021 19:13:17 +0100
Subject: [PATCH 05/26] Made little changes to the Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 43c6824..07651cf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
         javaHome			= '/usr/lpp/java/J8.0_64/bin'
 		groovyHome			= '/opt/lpp/IBM/dbb/groovy-2.4.12/'
 	    	GROOVY_HOME		='/opt/lpp/IBM/dbb/groovy-2.4.12/'
-        //groovyzHome			= '/opt/lpp/IBM/dbb/bin'
+        groovyzHome			= '/opt/lpp/IBM/dbb/bin'
 	  groovyzhome			='/u/jerrye/bin'
 		DBB_HOME			= '/opt/lpp/IBM/dbb'
 		DBB_CONF			= "${WORKSPACE}/conf"

From ce30a0986b8d5b5b8b0b6edad0ef71d2f20abf61 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Fri, 23 Jul 2021 12:45:36 +0100
Subject: [PATCH 06/26] Update Tools.groovy and removed def.

---
 src/main/groovy/com/zos/groovy/utilities/Tools.groovy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/groovy/com/zos/groovy/utilities/Tools.groovy b/src/main/groovy/com/zos/groovy/utilities/Tools.groovy
index 96738ba..af1ef87 100644
--- a/src/main/groovy/com/zos/groovy/utilities/Tools.groovy
+++ b/src/main/groovy/com/zos/groovy/utilities/Tools.groovy
@@ -164,15 +164,15 @@ class Tools {
 		 * get the Project Build Directory and File location
 		 * Load Project properties
 		 */
-		def properties.ProjectBuildDirectory = System.getenv("ProjectBuildDirectory")
+		properties.ProjectBuildDirectory = System.getenv("ProjectBuildDirectory")
 		if (properties.ProjectBuildDirectory == null)
 			new exception('Project Build Directory missing')
 			
-		def properties.ProjectBuildFile = System.getenv("ProjectBuildFile")
+		properties.ProjectBuildFile = System.getenv("ProjectBuildFile")
 		if (properties.ProjectBuildFile == null)
 			new exception('Project Build File missing')
 			
-		def buildProjectPropFile = new File("properties.ProjectBuildDirectory/properties.ProjectBuildFile")
+		buildProjectPropFile = new File("properties.ProjectBuildDirectory/properties.ProjectBuildFile")
 		if (properties.debug) println("buildProjectPropFile = $buildProjectPropFile")
 		if (buildProjectPropFile.exists()) {
 		   properties.load(new File("${buildProjectPropFile}"))

From 12ea4de186cdbf7d5f2bc805752ff026773d0085 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Fri, 23 Jul 2021 13:00:57 +0100
Subject: [PATCH 07/26] Update Jenkinsfile

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 07651cf..ba4f75b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
         javaHome			= '/usr/lpp/java/J8.0_64/bin'
 		groovyHome			= '/opt/lpp/IBM/dbb/groovy-2.4.12/'
 	    	GROOVY_HOME		='/opt/lpp/IBM/dbb/groovy-2.4.12/'
-        groovyzHome			= '/opt/lpp/IBM/dbb/bin'
+        
 	  groovyzhome			='/u/jerrye/bin'
 		DBB_HOME			= '/opt/lpp/IBM/dbb'
 		DBB_CONF			= "${WORKSPACE}/conf"
@@ -91,6 +91,7 @@ pipeline {
         }
         stage('Build Groovy zOS Utilities') {
             steps {
+		    sh "env"
                 sh "${env.groovyHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGrovoyZosUtil}/*.groovy"
             }
         }

From 7228eed0bb161062a3e0b1b4f2b7ce276bc5f94a Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Wed, 28 Jul 2021 02:46:54 +0100
Subject: [PATCH 08/26] Updated Tools.groovy

---
 src/main/groovy/com/zos/groovy/utilities/Tools.groovy | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/groovy/com/zos/groovy/utilities/Tools.groovy b/src/main/groovy/com/zos/groovy/utilities/Tools.groovy
index af1ef87..3560222 100644
--- a/src/main/groovy/com/zos/groovy/utilities/Tools.groovy
+++ b/src/main/groovy/com/zos/groovy/utilities/Tools.groovy
@@ -144,11 +144,11 @@ class Tools {
 		 */
 		def properties.PolycephalyBuildDirectory = System.getenv("PolycephalyBuildDirectory")
 		if (properties.PolycephalyBuildDirectory == null) 
-			new exception('Polycephaly Build Directory missing')
+			println('Polycephaly Build Directory missing')
 			
 		def properties.PolycephalyBuildFile = System.getenv("PolycephalyBuildFile")
 		if (properties.PolycephalyBuildFile == null)
-			new exception('Polycephaly Build File missing')
+			println('Polycephaly Build File missing')
 			
 		def buildPolycephalyPropFile = new File("properties.PolycephalyBuildDirectory/properties.PolycephalyBuildFile")
 		if (properties.debug) println("buildPolycephalyPropFile = $buildPolycephalyPropFile")
@@ -166,11 +166,11 @@ class Tools {
 		 */
 		properties.ProjectBuildDirectory = System.getenv("ProjectBuildDirectory")
 		if (properties.ProjectBuildDirectory == null)
-			new exception('Project Build Directory missing')
+			println('Project Build Directory missing')
 			
 		properties.ProjectBuildFile = System.getenv("ProjectBuildFile")
 		if (properties.ProjectBuildFile == null)
-			new exception('Project Build File missing')
+			println('Project Build File missing')
 			
 		buildProjectPropFile = new File("properties.ProjectBuildDirectory/properties.ProjectBuildFile")
 		if (properties.debug) println("buildProjectPropFile = $buildProjectPropFile")

From 1f9359aba0310317815aa7069e98dc73a5403e12 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Fri, 30 Jul 2021 17:29:42 +0100
Subject: [PATCH 09/26] Updated groovyz to groovy

---
 Jenkinsfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ba4f75b..2e245ba 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -128,7 +128,8 @@ pipeline {
             steps {
             	sh "export DBB_HOME=${env.DBB_HOME}"
             	sh "export DBB_CONF=${env.DBB_CONF}"
-                sh "${env.groovyzHome}/groovyz --classpath .:${env.groovyLibPath} ${env.polyBuildGroovy}  --collection ${env.CollectionName} --debug --sourceDir ${env.polySrcPackage}"
+		sh "export GROOVY_HOME=${env.GROOVY_HOME}"
+                sh "${env.groovyzHome}/groovy --classpath .:${env.groovyLibPath} ${env.polyBuildGroovy}  --collection ${env.CollectionName} --debug --sourceDir ${env.polySrcPackage}"
             }
         }
         stage("Test") {
@@ -138,7 +139,8 @@ pipeline {
             steps {
             	sh "export DBB_HOME=${env.DBB_HOME}"
             	sh "export DBB_CONF=${env.DBB_CONF}"
-                sh "${env.groovyzHome}/groovyz --classpath .:${env.groovyLibPath} ${env.polyBuildGroovy}  --collection ${env.CollectionName} --sourceDir ${env.polySrcPackage}"
+		sh "export GROOVY_HOME=${env.GROOVY_HOME}"
+                sh "${env.groovyzHome}/groovy --classpath .:${env.groovyLibPath} ${env.polyBuildGroovy}  --collection ${env.CollectionName} --sourceDir ${env.polySrcPackage}"
             }
         }
         stage("Deploy") {

From 6d22614a71250144bf61593009fbc15dbc085437 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Sat, 31 Jul 2021 02:01:18 +0100
Subject: [PATCH 10/26] Fixed typo in Build Groovy Groovy zOS Utility stage

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2e245ba..ecefcd1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -92,7 +92,7 @@ pipeline {
         stage('Build Groovy zOS Utilities') {
             steps {
 		    sh "env"
-                sh "${env.groovyHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGrovoyZosUtil}/*.groovy"
+                sh "${env.groovyHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
             }
         }
         stage('Add Groovy ZOS Utilities to JAR') {

From e4a00cd0938d81fae163f58e5ab01d3a71ee5a57 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Sat, 31 Jul 2021 02:14:05 +0100
Subject: [PATCH 11/26] Set debug to false, and removed sh "env"

---
 Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ecefcd1..2da5373 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
         projectClean		= 'true'
         DBBClean			= 'false'
         projectDelete		= 'false'
-        Debug				= 'true'
+        Debug				= 'false'
         CollectionName		= 'Polycephaly'
         libDir				= 'lib'
 		classesDir			= 'classes'
@@ -91,7 +91,6 @@ pipeline {
         }
         stage('Build Groovy zOS Utilities') {
             steps {
-		    sh "env"
                 sh "${env.groovyHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
             }
         }

From 8572176f7ce0f70de71a5a25e45da67270cbc8c7 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Tue, 3 Aug 2021 11:23:48 +0100
Subject: [PATCH 12/26] Added groovyjar environment variable

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2da5373..4a18071 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,8 +20,7 @@ pipeline {
         javaHome			= '/usr/lpp/java/J8.0_64/bin'
 		groovyHome			= '/opt/lpp/IBM/dbb/groovy-2.4.12/'
 	    	GROOVY_HOME		='/opt/lpp/IBM/dbb/groovy-2.4.12/'
-        
-	  groovyzhome			='/u/jerrye/bin'
+        groovyzhome			='/u/jerrye/bin'
 		DBB_HOME			= '/opt/lpp/IBM/dbb'
 		DBB_CONF			= "${WORKSPACE}/conf"
 
@@ -31,6 +30,7 @@ pipeline {
 		DBBhtmlJar			= '/opt/lpp/IBM/dbb/lib/dbb.html_1.0.6.jar'
 		ibmjzos				= '/usr/lpp/java/J8.0_64/lib/ext/ibmjzos.jar'
 		dbbJNI 				= '/opt/lpp/IBM/dbb/lib/libDBB_JNI64.so'
+	    	groovyJar			= '/opt/lpp/IBM/dbb/groovy-2.4.12/lib/groovy-2.4.12.jar'
 
 		polycephalyJar		= "${WORKSPACE}/${env.libDir}/polycephaly.jar"
 		javaClassPath		= "${env.ibmjzos}:${env.DBBcoreJar}:${env.DBBhtmlJar}"

From 73df85c0dfd41a62ba172a139b58877f7a7185e0 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Thu, 5 Aug 2021 08:47:52 +0100
Subject: [PATCH 13/26] Changed groovy command to groovyzhome

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4a18071..b988250 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -91,7 +91,7 @@ pipeline {
         }
         stage('Build Groovy zOS Utilities') {
             steps {
-                sh "${env.groovyHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
+                sh "${env.groovyzhome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
             }
         }
         stage('Add Groovy ZOS Utilities to JAR') {
@@ -101,7 +101,7 @@ pipeline {
         }
         stage('Build Groovy Language Utilities') {
             steps {
-                sh "${env.groovyHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosLang}/*.groovy"
+                sh "${env.groovyzhome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosLang}/*.groovy"
             }
         }
         stage('Add Groovy Language Utilities to JAR') {
@@ -111,7 +111,7 @@ pipeline {
         }
         stage('Build Groovy Program Utilities') {
             steps {
-                sh "${env.groovyHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyPrgUtil}/*.groovy"
+                sh "${env.groovyzhome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyPrgUtil}/*.groovy"
             }
         }
         stage('Add Groovy Program Utilities to JAR') {

From 177885c34fe86976e93a041dd2765a286f534164 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Thu, 5 Aug 2021 08:56:51 +0100
Subject: [PATCH 14/26] Changed Build groovy zos utility command to groovyHome

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b988250..5a8b129 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
 		srcGroovyPrgUtil	= 'src/main/groovy/com/zos/program/utilities'
 
         javaHome			= '/usr/lpp/java/J8.0_64/bin'
-		groovyHome			= '/opt/lpp/IBM/dbb/groovy-2.4.12/'
+		groovyHome			= '/opt/lpp/IBM/dbb/groovy-2.4.12/bin'
 	    	GROOVY_HOME		='/opt/lpp/IBM/dbb/groovy-2.4.12/'
         groovyzhome			='/u/jerrye/bin'
 		DBB_HOME			= '/opt/lpp/IBM/dbb'
@@ -91,7 +91,7 @@ pipeline {
         }
         stage('Build Groovy zOS Utilities') {
             steps {
-                sh "${env.groovyzhome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
+                sh "${env.groovyHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
             }
         }
         stage('Add Groovy ZOS Utilities to JAR') {

From 219076df4aac3aa0652d0b9627927b53b37e1371 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Tue, 17 Aug 2021 14:52:06 +0100
Subject: [PATCH 15/26] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5a8b129..f947737 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 		srcJavaZosUtil		= 'src/main/java/com/zos/java/utilities'
 		srcZosResbiuld		= 'src/main/zOS/com.zos.resbuild'
 		srcGroovyZosLang	= 'src/main/groovy/com/zos/language'
-		srcGrovoyZosUtil	= 'src/main/groovy/com/zos/groovy/utilities'
+		srcGroovyZosUtil	= 'src/main/groovy/com/zos/groovy/utilities'
 		srcGroovyPrgUtil	= 'src/main/groovy/com/zos/program/utilities'
 
         javaHome			= '/usr/lpp/java/J8.0_64/bin'

From 8cfec32087dd2988657582f854f6280da5bc7c47 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Tue, 17 Aug 2021 14:59:09 +0100
Subject: [PATCH 16/26] Changed cp to scp

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f947737..6b6f495 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -91,7 +91,7 @@ pipeline {
         }
         stage('Build Groovy zOS Utilities') {
             steps {
-                sh "${env.groovyHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
+                sh "${env.groovyHome}/groovyc -scp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
             }
         }
         stage('Add Groovy ZOS Utilities to JAR') {

From 7532b2d8fbe862d61201aaeced21ed4774c6e554 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Wed, 18 Aug 2021 18:15:34 +0100
Subject: [PATCH 17/26] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6b6f495..53e3943 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -91,7 +91,7 @@ pipeline {
         }
         stage('Build Groovy zOS Utilities') {
             steps {
-                sh "${env.groovyHome}/groovyc -scp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
+                sh "${env.groovyzhome}/groovyc -scp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
             }
         }
         stage('Add Groovy ZOS Utilities to JAR') {

From a874d881474d2ce282aaaf6e35579e28e6125f3f Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Wed, 18 Aug 2021 18:18:30 +0100
Subject: [PATCH 18/26] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 53e3943..3eb8714 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -91,7 +91,7 @@ pipeline {
         }
         stage('Build Groovy zOS Utilities') {
             steps {
-                sh "${env.groovyzhome}/groovyc -scp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
+                sh "${env.groovyzhome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
             }
         }
         stage('Add Groovy ZOS Utilities to JAR') {

From 46d7843ba726754881eb98a37c4d6b1321d2caae Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Wed, 18 Aug 2021 19:08:51 +0100
Subject: [PATCH 19/26] Update Jenkinsfile

---
 Jenkinsfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3eb8714..df5a9fd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,6 +40,9 @@ pipeline {
 		polyBuildGroovy  	= "$WORKSPACE/build/build.groovy"
 		polySrcPackage		= "$WORKSPACE/conf/package.txt"
 		polyRuntime			= "/u/jerrye"
+	    
+	    	PolycephalyBuildDirectory	= "$WORKSPACE/conf/"
+		PolycephalyBuildFile 		= "package.txt"
 
     }
 

From 0cad3cb016471bd8d7f82c9e3054ffe95c6917ad Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Wed, 18 Aug 2021 19:14:58 +0100
Subject: [PATCH 20/26] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index df5a9fd..1a984ec 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,7 @@ pipeline {
 		polySrcPackage		= "$WORKSPACE/conf/package.txt"
 		polyRuntime			= "/u/jerrye"
 	    
-	    	PolycephalyBuildDirectory	= "$WORKSPACE/conf/"
+	    PolycephalyBuildDirectory	= "${WORKSPACE}/conf/"
 		PolycephalyBuildFile 		= "package.txt"
 
     }

From e224ba4485498982f212555a65e525f4c0f07107 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Thu, 19 Aug 2021 18:09:46 +0100
Subject: [PATCH 21/26] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1a984ec..0f5370c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,7 @@ pipeline {
 		polySrcPackage		= "$WORKSPACE/conf/package.txt"
 		polyRuntime			= "/u/jerrye"
 	    
-	    PolycephalyBuildDirectory	= "${WORKSPACE}/conf/"
+	    PolycephalyBuildDirectory	= "$WORKSPACE/conf/"
 		PolycephalyBuildFile 		= "package.txt"
 
     }

From d0d185db1886eef94416ddf8aed2449c790ab118 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Mon, 23 Aug 2021 07:34:15 +0100
Subject: [PATCH 22/26] Update Jenkinsfile

---
 Jenkinsfile | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0f5370c..c4e5b69 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,13 +14,13 @@ pipeline {
 		srcJavaZosUtil		= 'src/main/java/com/zos/java/utilities'
 		srcZosResbiuld		= 'src/main/zOS/com.zos.resbuild'
 		srcGroovyZosLang	= 'src/main/groovy/com/zos/language'
-		srcGroovyZosUtil	= 'src/main/groovy/com/zos/groovy/utilities'
+		srcGrovoyZosUtil	= 'src/main/groovy/com/zos/groovy/utilities'
 		srcGroovyPrgUtil	= 'src/main/groovy/com/zos/program/utilities'
 
         javaHome			= '/usr/lpp/java/J8.0_64/bin'
-		groovyHome			= '/opt/lpp/IBM/dbb/groovy-2.4.12/bin'
-	    	GROOVY_HOME		='/opt/lpp/IBM/dbb/groovy-2.4.12/'
-        groovyzhome			='/u/jerrye/bin'
+		groovyHome			= '/opt/lpp/IBM/dbb/groovy-2.4.12/'
+		GROOVY_HOME         = '/opt/lpp/IBM/dbb/groovy-2.4.12/'
+        groovyzHome			= '/u/jerrye/bin'
 		DBB_HOME			= '/opt/lpp/IBM/dbb'
 		DBB_CONF			= "${WORKSPACE}/conf"
 
@@ -30,7 +30,7 @@ pipeline {
 		DBBhtmlJar			= '/opt/lpp/IBM/dbb/lib/dbb.html_1.0.6.jar'
 		ibmjzos				= '/usr/lpp/java/J8.0_64/lib/ext/ibmjzos.jar'
 		dbbJNI 				= '/opt/lpp/IBM/dbb/lib/libDBB_JNI64.so'
-	    	groovyJar			= '/opt/lpp/IBM/dbb/groovy-2.4.12/lib/groovy-2.4.12.jar'
+		groovyJar			= '/opt/lpp/IBM/dbb/groovy-2.4.12/lib/groovy-2.4.12.jar'
 
 		polycephalyJar		= "${WORKSPACE}/${env.libDir}/polycephaly.jar"
 		javaClassPath		= "${env.ibmjzos}:${env.DBBcoreJar}:${env.DBBhtmlJar}"
@@ -39,9 +39,9 @@ pipeline {
 		polyClassPath		= "${env.polycephalyJar}:${env.ibmjzosJar}:${env.DBBLib}"
 		polyBuildGroovy  	= "$WORKSPACE/build/build.groovy"
 		polySrcPackage		= "$WORKSPACE/conf/package.txt"
-		polyRuntime			= "/u/jerrye"
-	    
-	    PolycephalyBuildDirectory	= "$WORKSPACE/conf/"
+		polyRuntime			= "/u/jerrye/polyRuntime"
+		
+		PolycephalyBuildDirectory	= "$WORKSPACE/conf/"
 		PolycephalyBuildFile 		= "package.txt"
 
     }
@@ -94,7 +94,8 @@ pipeline {
         }
         stage('Build Groovy zOS Utilities') {
             steps {
-                sh "${env.groovyzhome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosUtil}/*.groovy"
+            	sh "env"
+                sh "${env.groovyzHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGrovoyZosUtil}/*.groovy"
             }
         }
         stage('Add Groovy ZOS Utilities to JAR') {
@@ -104,7 +105,7 @@ pipeline {
         }
         stage('Build Groovy Language Utilities') {
             steps {
-                sh "${env.groovyzhome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosLang}/*.groovy"
+                sh "${env.groovyzHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyZosLang}/*.groovy"
             }
         }
         stage('Add Groovy Language Utilities to JAR') {
@@ -114,7 +115,7 @@ pipeline {
         }
         stage('Build Groovy Program Utilities') {
             steps {
-                sh "${env.groovyzhome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyPrgUtil}/*.groovy"
+                sh "${env.groovyzHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGroovyPrgUtil}/*.groovy"
             }
         }
         stage('Add Groovy Program Utilities to JAR') {
@@ -130,7 +131,7 @@ pipeline {
             steps {
             	sh "export DBB_HOME=${env.DBB_HOME}"
             	sh "export DBB_CONF=${env.DBB_CONF}"
-		sh "export GROOVY_HOME=${env.GROOVY_HOME}"
+            	sh "export GROOVY_HOME=${env.GROOVY_HOME}"
                 sh "${env.groovyzHome}/groovy --classpath .:${env.groovyLibPath} ${env.polyBuildGroovy}  --collection ${env.CollectionName} --debug --sourceDir ${env.polySrcPackage}"
             }
         }
@@ -141,7 +142,7 @@ pipeline {
             steps {
             	sh "export DBB_HOME=${env.DBB_HOME}"
             	sh "export DBB_CONF=${env.DBB_CONF}"
-		sh "export GROOVY_HOME=${env.GROOVY_HOME}"
+            	sh "export GROOVY_HOME=${env.GROOVY_HOME}"
                 sh "${env.groovyzHome}/groovy --classpath .:${env.groovyLibPath} ${env.polyBuildGroovy}  --collection ${env.CollectionName} --sourceDir ${env.polySrcPackage}"
             }
         }
@@ -163,7 +164,8 @@ pipeline {
             	sh 'printf "running DBB delete collection"'
             	sh "export DBB_HOME=${env.DBB_HOME}"
             	sh "export DBB_CONF=${env.DBB_CONF}"
-            	sh "${env.groovyzHome}/groovyz --classpath .:${env.polyClassPath} ${env.polyBuildGroovy} --clean --collection ${env.CollectionName}"
+            	sh "export GROOVY_HOME=${env.GROOVY_HOME}"
+            	sh "${env.groovyzHome}/groovy --classpath .:${env.polyClassPath} ${env.polyBuildGroovy} --clean --collection ${env.CollectionName}"
             }
         }
     }

From 2e1d8b79fdeabc6b73beb72a58b3a7e9e1dabcbb Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Mon, 23 Aug 2021 07:47:26 +0100
Subject: [PATCH 23/26] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c4e5b69..39f2e76 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,7 +94,7 @@ pipeline {
         }
         stage('Build Groovy zOS Utilities') {
             steps {
-            	sh "env"
+            	
                 sh "${env.groovyzHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGrovoyZosUtil}/*.groovy"
             }
         }

From 061472ca356c55e1629a175a1fcb2cebdbc03940 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Thu, 26 Aug 2021 23:18:01 +0100
Subject: [PATCH 24/26] Update Tools.groovy

---
 src/main/groovy/com/zos/groovy/utilities/Tools.groovy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/groovy/com/zos/groovy/utilities/Tools.groovy b/src/main/groovy/com/zos/groovy/utilities/Tools.groovy
index 3560222..785da93 100644
--- a/src/main/groovy/com/zos/groovy/utilities/Tools.groovy
+++ b/src/main/groovy/com/zos/groovy/utilities/Tools.groovy
@@ -142,15 +142,15 @@ class Tools {
 		 * get the Polcephaly Build Directory and File location
 		 * Load Polycephaly properties
 		 */
-		def properties.PolycephalyBuildDirectory = System.getenv("PolycephalyBuildDirectory")
+		properties.PolycephalyBuildDirectory = System.getenv("PolycephalyBuildDirectory")
 		if (properties.PolycephalyBuildDirectory == null) 
 			println('Polycephaly Build Directory missing')
 			
-		def properties.PolycephalyBuildFile = System.getenv("PolycephalyBuildFile")
+		properties.PolycephalyBuildFile = System.getenv("PolycephalyBuildFile")
 		if (properties.PolycephalyBuildFile == null)
 			println('Polycephaly Build File missing')
 			
-		def buildPolycephalyPropFile = new File("properties.PolycephalyBuildDirectory/properties.PolycephalyBuildFile")
+		buildPolycephalyPropFile = new File("properties.PolycephalyBuildDirectory/properties.PolycephalyBuildFile")
 		if (properties.debug) println("buildPolycephalyPropFile = $buildPolycephalyPropFile")
 		if (buildPolycephalyPropFile.exists()) {
 		   properties.load(new File("${buildPolycephalyPropFile}"))

From e635b70fc3174844bf94d2b2a7daf8717d1c975b Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Thu, 26 Aug 2021 23:38:21 +0100
Subject: [PATCH 25/26] Update Jenkinsfile

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 39f2e76..cae711c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,7 +94,8 @@ pipeline {
         }
         stage('Build Groovy zOS Utilities') {
             steps {
-            	
+            	sh "env"
+		    sh "export_BPXK_AUTOCVT=ON"
                 sh "${env.groovyzHome}/groovyc -cp .:${env.groovyClassPath}  -d ${env.classesDir} ${env.srcGrovoyZosUtil}/*.groovy"
             }
         }

From d77b154e8839830b6f76ee230c974bb13a16c8a3 Mon Sep 17 00:00:00 2001
From: "Onwukanjo, Innocent O" <45260952+Bliss911@users.noreply.github.com>
Date: Thu, 26 Aug 2021 23:46:27 +0100
Subject: [PATCH 26/26] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index cae711c..9e85716 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -139,7 +139,7 @@ pipeline {
         stage("Test") {
         	when {
 				expression { !env.Debug.toBoolean()}
-	        }
+	        
             steps {
             	sh "export DBB_HOME=${env.DBB_HOME}"
             	sh "export DBB_CONF=${env.DBB_CONF}"