From c27e192d0731fcd9d880c8abde729f4f88295472 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 4 Sep 2018 10:11:28 -0400
Subject: [PATCH 001/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 284e5dca..5e5778d8 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_108,grouper_v2_3_0_ui_patch_45,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_16
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_108,grouper_v2_3_0_ui_patch_45,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_20
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From e7cbf6f72c9539e7dae8bffa76eab2ad298324a7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 7 Sep 2018 09:15:02 -0400
Subject: [PATCH 002/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 5e5778d8..bc4e1b30 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_108,grouper_v2_3_0_ui_patch_45,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_20
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_109,grouper_v2_3_0_ui_patch_47,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_20
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 7b24ed0c528d37d9ff1323820c168b7050dbbe1d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 10 Sep 2018 09:17:44 -0400
Subject: [PATCH 003/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index bc4e1b30..4b08cf86 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_109,grouper_v2_3_0_ui_patch_47,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_20
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_109,grouper_v2_3_0_ui_patch_47,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_21
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 20aedfd9d143943eab72ff9f10aefebbe6bb893a Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 18 Sep 2018 07:44:11 -0400
Subject: [PATCH 004/111] API patch 2

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 3d2b2f6d..e3b3dc58 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_1,grouper_v2_4_0_ui_patch_0,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_2,grouper_v2_4_0_ui_patch_0,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 454e7c6db59d65b77330de284253d328dfd29744 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 1 Oct 2018 12:41:01 -0400
Subject: [PATCH 005/111] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index edd47bb5..933bbdf3 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,8 @@
 If upgrading from Grouper version 2.3 to 2.4 and using LDAP, modifications will be needed in subject.properties and grouper-loaders.proprties. Further details about this can be found at the following URL:
 https://spaces.at.internet2.edu/display/Grouper/vt-ldap+to+ldaptive+migration+for+LDAP+access
 
+In particular, in subject.properties, *.param.base.value should be adjusted to only contain the RDN (Relative Distinguished Name), not the full DN.  For example, "OU=People", not "OU=People,DC=domain,DC=edu"
+
 Additional upgrade information can be found at the following URL: https://spaces.at.internet2.edu/display/Grouper/v2.4+Upgrade+Instructions+from+v2.3
 
 # Supported tags

From 1f1797d7a98fd14559181fe0fec24b856f222384 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 2 Oct 2018 16:12:03 -0400
Subject: [PATCH 006/111] Testing Aqua Microscanner

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 8cb90349..c274a79a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,10 +51,12 @@ pipeline {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
                       def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
                       // test the environment 
+                      aquaMicroscanner imageName: "$maintainer/$imagename"
                       sh 'cd test-compose && ./compose.sh'
                       // bring down after testing
                       sh 'cd test-compose && docker-compose down'
                       baseImg.push("$tag")
+                      
                    }
                }
             }

From c83210b70804b22be5061bc18d914ec59c3e84b3 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 14:34:07 -0400
Subject: [PATCH 007/111] testing clair scanner in jenkins

---
 Jenkinsfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c274a79a..95d84907 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,8 +50,13 @@ pipeline {
                 script {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
                       def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+                      // scan the image with clair
+                      docker run -p 5432:5432 -d --name db arminc/clair-db:2017-10-04
+                      docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5
+                      curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64
+                      chmod 755 clair-scanner
+                      ./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename
                       // test the environment 
-                      aquaMicroscanner imageName: "$maintainer/$imagename"
                       sh 'cd test-compose && ./compose.sh'
                       // bring down after testing
                       sh 'cd test-compose && docker-compose down'

From 9445f3111860f2b4547bcd9f860987ee4adad368 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 14:36:40 -0400
Subject: [PATCH 008/111] Update Jenkinsfile

---
 Jenkinsfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 95d84907..a8c4c679 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,11 +51,11 @@ pipeline {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
                       def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
                       // scan the image with clair
-                      docker run -p 5432:5432 -d --name db arminc/clair-db:2017-10-04
-                      docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5
-                      curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64
-                      chmod 755 clair-scanner
-                      ./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename
+                      sh 'docker run -p 5432:5432 -d --name db arminc/clair-db:2017-10-04'
+                      sh 'docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
+                      sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
+                      sh 'chmod 755 clair-scanner'
+                      sh './clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename'
                       // test the environment 
                       sh 'cd test-compose && ./compose.sh'
                       // bring down after testing

From 298594f64d0733223e47d5f220d4a5d1ccd4ba64 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 14:55:10 -0400
Subject: [PATCH 009/111] hard coding image name temporarily

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

diff --git a/Jenkinsfile b/Jenkinsfile
index a8c4c679..df57acc0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,18 +49,18 @@ pipeline {
             steps {
                 script {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
-                      def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+                      // def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
                       // scan the image with clair
                       sh 'docker run -p 5432:5432 -d --name db arminc/clair-db:2017-10-04'
                       sh 'docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
                       sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
                       sh 'chmod 755 clair-scanner'
-                      sh './clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename'
+                      sh './clair-scanner --ip 172.17.0.1 -r test.out tier/grouper'
                       // test the environment 
                       sh 'cd test-compose && ./compose.sh'
                       // bring down after testing
                       sh 'cd test-compose && docker-compose down'
-                      baseImg.push("$tag")
+                      // baseImg.push("$tag")
                       
                    }
                }

From b156912162b65a7c005e74752b3ea955b079c2d7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 15:01:39 -0400
Subject: [PATCH 010/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index df57acc0..35cd096c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,7 +55,7 @@ pipeline {
                       sh 'docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
                       sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
                       sh 'chmod 755 clair-scanner'
-                      sh './clair-scanner --ip 172.17.0.1 -r test.out tier/grouper'
+                      sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:$tag"
                       // test the environment 
                       sh 'cd test-compose && ./compose.sh'
                       // bring down after testing

From 6d0199c3e570b2864809f5097418668d2dbef3bc Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 15:22:37 -0400
Subject: [PATCH 011/111] Update Jenkinsfile

---
 Jenkinsfile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 35cd096c..5d5b035a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,18 +49,22 @@ pipeline {
             steps {
                 script {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
-                      // def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+                      def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
                       // scan the image with clair
-                      sh 'docker run -p 5432:5432 -d --name db arminc/clair-db:2017-10-04'
-                      sh 'docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
+                      sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:2017-10-04'
+                      sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
                       sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
                       sh 'chmod 755 clair-scanner'
                       sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:$tag"
-                      // test the environment 
+                      // test the environment
+                      sh 'docker kill clairdb'
+                      sh 'docker rm clairdb'
+                      sh 'docker kill clair'
+                      sh 'docker rm clair'
                       sh 'cd test-compose && ./compose.sh'
                       // bring down after testing
                       sh 'cd test-compose && docker-compose down'
-                      // baseImg.push("$tag")
+                      baseImg.push("$tag")
                       
                    }
                }

From 846dc965af1c7b7a82e682d2170db3d13fd603e2 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 15:35:02 -0400
Subject: [PATCH 012/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 5d5b035a..9db4574d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,7 +55,7 @@ pipeline {
                       sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
                       sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
                       sh 'chmod 755 clair-scanner'
-                      sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:$tag"
+                      sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:latest"
                       // test the environment
                       sh 'docker kill clairdb'
                       sh 'docker rm clairdb'

From a4fa056cf65378f9d01ff49307b1df8bcbd59196 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 15:52:32 -0400
Subject: [PATCH 013/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 9db4574d..17cdd795 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,7 +51,7 @@ pipeline {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
                       def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
                       // scan the image with clair
-                      sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:2017-10-04'
+                      sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:2018-10-04'
                       sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
                       sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
                       sh 'chmod 755 clair-scanner'

From c08db92982f167125f376efcebabe0139591a771 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 16:28:40 -0400
Subject: [PATCH 014/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 17cdd795..fb2ba008 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,7 +51,7 @@ pipeline {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
                       def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
                       // scan the image with clair
-                      sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:2018-10-04'
+                      sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:latest'
                       sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
                       sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
                       sh 'chmod 755 clair-scanner'

From fdfd1f6b82a615bd3d3a2add7720f811eea79577 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 12:31:29 -0400
Subject: [PATCH 015/111] Create clairscan.sh

---
 tests/clairscan.sh | 72 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 tests/clairscan.sh

diff --git a/tests/clairscan.sh b/tests/clairscan.sh
new file mode 100644
index 00000000..99e36141
--- /dev/null
+++ b/tests/clairscan.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+startsecs=$(date +'%s')
+starttime=$(date +%H:%M:%S)
+
+echo 'starting:' ${starttime}
+
+#ensure clair-scanner
+if [ ! -s ./clair-scanner ]; then
+  echo 'downloading curl-scanner...'
+  curl -s -L -o ./clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64
+  chmod 755 clair-scanner
+else
+  echo 'using existing clair-scanner...'
+fi
+
+#ensure DB container
+echo 'ensuring a fresh clair-db container...'
+docker ps | grep clair-db &>/dev/null
+if [ $? == "0" ]; then
+  echo 'removing existing clair-db container...'
+  docker kill db &>/dev/null
+  docker rm db &>/dev/null
+  docker run -p 5432:5432 -d --name db arminc/clair-db:latest &>/dev/null
+else
+  docker run -p 5432:5432 -d --name db arminc/clair-db:latest &>/dev/null
+fi
+sleep 30
+
+#ensure clair-scan container
+echo 'ensuring a fresh clair-scan container...'
+docker ps | grep clair-local-scan &>/dev/null
+if [ $? == "0" ]; then
+  echo 'removing existing clair-scan container...'
+  docker kill clair &>/dev/null
+  docker rm clair &>/dev/null
+  docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5 &>/dev/null
+else
+  docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5 &>/dev/null
+fi
+sleep 30
+
+#get ip where clair-scanner will listen
+clairip=$(/sbin/ifconfig docker0 | grep 'inet ' | sed 's/^[[:space:]]*//g' | cut -f 2 -d ' ' | sed 's/^[[:space:]]*//g')
+echo 'sending ip addr' ${clairip} 'to clair-scan server...'
+
+#run scan
+echo 'running scan...'
+./clair-scanner --ip ${clairip} $1
+retcode=$?
+
+#eval results
+if [ $retcode == '0' ]; then
+  echo 'scan found nothing.'
+else
+  echo 'scan found issues.'
+fi
+
+#cleanup
+echo 'removing temporary containers...'
+docker kill clair &>/dev/null
+docker rm clair &>/dev/null
+docker kill db &>/dev/null
+docker rm db &>/dev/null
+
+endsecs=$(date +'%s')
+endtime=$(date +%H:%M:%S)
+echo 'finished:' $endtime '  ('$((endsecs - startsecs)) 'seconds)'
+echo ""
+
+#pass along return code from scan
+exit $retcode

From d5241b56d33d634e200f23b2c8e3b27f35a2bbaa Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 12:33:25 -0400
Subject: [PATCH 016/111] Create main.bats

---
 tests/main.bats | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 tests/main.bats

diff --git a/tests/main.bats b/tests/main.bats
new file mode 100644
index 00000000..73d3cf82
--- /dev/null
+++ b/tests/main.bats
@@ -0,0 +1,33 @@
+#!/usr/bin/env bats
+
+load ../common
+
+@test "010 Image is present and healthy" {
+    docker image inspect ${maintainer}/${imagename}
+}
+
+@test "030 Port 443/https is listening" {
+    docker run -d ${maintainer}/${imagename}
+    sleep 25
+    #get cont id
+    contid=$(docker ps | grep ${maintainer}/${imagename} | cut -f 1 -d ' ')
+    run docker exec -i ${contid} sh -c 'cat < /dev/null > /dev/tcp/127.0.0.1/443'
+    docker kill ${contid} &>/dev/null
+    docker rm ${contid} &>/dev/null
+    [ "$status" -eq 0 ]
+}
+
+@test "040 The Grouper Status page is present" {
+    docker run -d ${maintainer}/${imagename}
+    sleep 60
+    contid2=$(docker ps | grep ${maintainer}/${imagename} | cut -f 1 -d ' ')
+    run docker exec -i ${contid2} sh -c 'curl -I -k -s -f https://127.0.0.1/grouper/status?diagnosticType=trivial'
+    docker kill ${contid2} &>/dev/null
+    docker rm ${contid2} &>/dev/null
+    [ "$status" -eq 0 ]
+}
+
+
+@test "070 There are no known security vulnerabilities" {
+    ./tests/clairscan.sh ${maintainer}/${imagename}
+}

From 91c611f8aa3c172896b5f17009c56b60e6639dac Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 12:41:05 -0400
Subject: [PATCH 017/111] Update Jenkinsfile

---
 Jenkinsfile | 55 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index fb2ba008..0d52ba13 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -46,24 +46,51 @@ pipeline {
             }
         } 
         stage('Build') {
+            steps {
+                script {
+                  try{
+                    sh 'bin/rebuild.sh &> debug'
+                  } catch(error) {
+                     def error_details = readFile('./debug');
+                     def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"
+                     sh "rm -f ./debug"
+                     handleError(message)
+                  }
+                }
+        }
+        stage('Test') {
+            steps {
+                script {
+                   try {
+                     sh 'bin/test.sh 2>&1 | tee debug ; test ${PIPESTATUS[0]} -eq 0'
+                   } catch (error) {
+                     def error_details = readFile('./debug')
+                     def message = "BUILD ERROR: There was a problem testing ${imagename}:${tag}. \n\n ${error_details}"
+                     sh "rm -f ./debug"
+                     handleError(message)
+                   } 
+                }    
+        }
+        
+        stage('Push') {
             steps {
                 script {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
                       def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
-                      // scan the image with clair
-                      sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:latest'
-                      sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
-                      sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
-                      sh 'chmod 755 clair-scanner'
-                      sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:latest"
-                      // test the environment
-                      sh 'docker kill clairdb'
-                      sh 'docker rm clairdb'
-                      sh 'docker kill clair'
-                      sh 'docker rm clair'
-                      sh 'cd test-compose && ./compose.sh'
-                      // bring down after testing
-                      sh 'cd test-compose && docker-compose down'
+                      //// scan the image with clair
+                      // sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:latest'
+                      // sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
+                      // sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
+                      // sh 'chmod 755 clair-scanner'
+                      // sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:latest"
+                      //// test the environment
+                      // sh 'docker kill clairdb'
+                      // sh 'docker rm clairdb'
+                      // sh 'docker kill clair'
+                      // sh 'docker rm clair'
+                      // sh 'cd test-compose && ./compose.sh'
+                      //// bring down after testing
+                      //sh 'cd test-compose && docker-compose down'
                       baseImg.push("$tag")
                       
                    }

From a783a1a4402382834e087338457bef28bd99b2dc Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 12:44:23 -0400
Subject: [PATCH 018/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 0d52ba13..9b43e606 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -57,6 +57,7 @@ pipeline {
                      handleError(message)
                   }
                 }
+            }
         }
         stage('Test') {
             steps {
@@ -70,6 +71,7 @@ pipeline {
                      handleError(message)
                    } 
                 }    
+             }
         }
         
         stage('Push') {

From e56671814d9d7b9222ff482fa683601c5d1b867e Mon Sep 17 00:00:00 2001
From: Chris Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 12:56:23 -0400
Subject: [PATCH 019/111] added x bit

---
 tests/clairscan.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 tests/clairscan.sh

diff --git a/tests/clairscan.sh b/tests/clairscan.sh
old mode 100644
new mode 100755

From d37730b882f051c8a591d760ac22f657c485b63c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:01:41 -0400
Subject: [PATCH 020/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 9b43e606..c764ea9b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,7 @@ pipeline {
             steps {
                 script {
                   try{
-                    sh 'bin/rebuild.sh &> debug'
+                    sh 'bin/rebuild.sh | tee debug ; test ${PIPESTATUS[0]} -eq 0'
                   } catch(error) {
                      def error_details = readFile('./debug');
                      def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"

From effd5212d768694f1fe4c27760529ff233296219 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:03:05 -0400
Subject: [PATCH 021/111] Update main.bats

---
 tests/main.bats | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tests/main.bats b/tests/main.bats
index 73d3cf82..e7be030f 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -17,16 +17,6 @@ load ../common
     [ "$status" -eq 0 ]
 }
 
-@test "040 The Grouper Status page is present" {
-    docker run -d ${maintainer}/${imagename}
-    sleep 60
-    contid2=$(docker ps | grep ${maintainer}/${imagename} | cut -f 1 -d ' ')
-    run docker exec -i ${contid2} sh -c 'curl -I -k -s -f https://127.0.0.1/grouper/status?diagnosticType=trivial'
-    docker kill ${contid2} &>/dev/null
-    docker rm ${contid2} &>/dev/null
-    [ "$status" -eq 0 ]
-}
-
 
 @test "070 There are no known security vulnerabilities" {
     ./tests/clairscan.sh ${maintainer}/${imagename}

From 5a963c1c96633f5640f4acb5c4dacfd8e57f3506 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:07:01 -0400
Subject: [PATCH 022/111] Update main.bats

---
 tests/main.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/main.bats b/tests/main.bats
index e7be030f..d70655b0 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -7,7 +7,7 @@ load ../common
 }
 
 @test "030 Port 443/https is listening" {
-    docker run -d ${maintainer}/${imagename}
+    docker run -d ${maintainer}/${imagename} ui
     sleep 25
     #get cont id
     contid=$(docker ps | grep ${maintainer}/${imagename} | cut -f 1 -d ' ')

From 4cc64f08da86be058624260f87bcf6e53860f91d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:23:49 -0400
Subject: [PATCH 023/111] Update main.bats

---
 tests/main.bats | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/tests/main.bats b/tests/main.bats
index d70655b0..cbe8ea2d 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -6,14 +6,9 @@ load ../common
     docker image inspect ${maintainer}/${imagename}
 }
 
-@test "030 Port 443/https is listening" {
-    docker run -d ${maintainer}/${imagename} ui
-    sleep 25
-    #get cont id
-    contid=$(docker ps | grep ${maintainer}/${imagename} | cut -f 1 -d ' ')
-    run docker exec -i ${contid} sh -c 'cat < /dev/null > /dev/tcp/127.0.0.1/443'
-    docker kill ${contid} &>/dev/null
-    docker rm ${contid} &>/dev/null
+@test "030 Test Compose the environment" {
+    cd test-compose && ./compose.sh
+    cd test-compose && docker-compose down
     [ "$status" -eq 0 ]
 }
 

From cf745dae4e74bf2f12680a8a61876b09c886b197 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:31:46 -0400
Subject: [PATCH 024/111] Update main.bats

---
 tests/main.bats | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/main.bats b/tests/main.bats
index cbe8ea2d..ade16fbd 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -7,8 +7,7 @@ load ../common
 }
 
 @test "030 Test Compose the environment" {
-    cd test-compose && ./compose.sh
-    cd test-compose && docker-compose down
+    cd test-compose && ./compose.sh && docker-compose down
     [ "$status" -eq 0 ]
 }
 

From 5c9e23c40bf8b23aa96a385b05a3b523b02cd9ef Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:33:27 -0400
Subject: [PATCH 025/111] Update main.bats

---
 tests/main.bats | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/main.bats b/tests/main.bats
index ade16fbd..8a865bfe 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -8,7 +8,6 @@ load ../common
 
 @test "030 Test Compose the environment" {
     cd test-compose && ./compose.sh && docker-compose down
-    [ "$status" -eq 0 ]
 }
 
 

From 7d975abdfbfaed9fa2b845dda13b9da652a2728b Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:38:27 -0400
Subject: [PATCH 026/111] Update main.bats

---
 tests/main.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/main.bats b/tests/main.bats
index 8a865bfe..973dc981 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -12,5 +12,5 @@ load ../common
 
 
 @test "070 There are no known security vulnerabilities" {
-    ./tests/clairscan.sh ${maintainer}/${imagename}
+    ./tests/clairscan.sh ${maintainer}/${imagename}:${tag}
 }

From 1b24c3b8d9aee55f534577f0508f0a1c7d9cbfa3 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:43:49 -0400
Subject: [PATCH 027/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index c764ea9b..823b222e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,6 +28,9 @@ pipeline {
                       sh 'ls'
                       sh 'mv bin/* ../bin/.'
                     }
+                    // Build and test scripts expect that 'tag' is present in common.bash. This is necessary for both Jenkins and standalone testing.
+                    // We don't care if there are more 'tag' assignments there. The latest one wins.
+                    sh "echo >> common.bash ; echo \"tag=\\\"${tag}\\\"\" >> common.bash ; echo common.bash ; cat common.bash"
                 }  
              }
         }    

From fe4fdf42237d95ba7520777b99b7358311ba7a11 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 11:45:25 -0400
Subject: [PATCH 028/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 823b222e..a015af5e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,7 @@
 
 pipeline {
     agent any
+    def baseImg
     environment { 
         maintainer = "t"
         imagename = 'g'
@@ -52,7 +53,9 @@ pipeline {
             steps {
                 script {
                   try{
-                    sh 'bin/rebuild.sh | tee debug ; test ${PIPESTATUS[0]} -eq 0'
+                      docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
+                        baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+                      }
                   } catch(error) {
                      def error_details = readFile('./debug');
                      def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"
@@ -80,8 +83,6 @@ pipeline {
         stage('Push') {
             steps {
                 script {
-                   docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
-                      def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
                       //// scan the image with clair
                       // sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:latest'
                       // sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
@@ -97,9 +98,7 @@ pipeline {
                       //// bring down after testing
                       //sh 'cd test-compose && docker-compose down'
                       baseImg.push("$tag")
-                      
-                   }
-               }
+                  }
             }
         }
         stage('Notify') {

From ffd56bd7fa472fa646224f4dd57ec7eb060c2f99 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 11:46:10 -0400
Subject: [PATCH 029/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index a015af5e..1fab98ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 
 pipeline {
     agent any
-    def baseImg
+    def baseImg = ''
     environment { 
         maintainer = "t"
         imagename = 'g'

From 5f9098a2238d90d149a28b3ff5b036f66bc13910 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 11:46:48 -0400
Subject: [PATCH 030/111] Update Jenkinsfile

---
 Jenkinsfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1fab98ac..0dedd0b3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,6 @@
 
 pipeline {
     agent any
-    def baseImg = ''
     environment { 
         maintainer = "t"
         imagename = 'g'

From f0eae16956f9a9ff45bfc1b6030b85492a96867b Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 12:03:22 -0400
Subject: [PATCH 031/111] Update main.bats

---
 tests/main.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/main.bats b/tests/main.bats
index 973dc981..8a865bfe 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -12,5 +12,5 @@ load ../common
 
 
 @test "070 There are no known security vulnerabilities" {
-    ./tests/clairscan.sh ${maintainer}/${imagename}:${tag}
+    ./tests/clairscan.sh ${maintainer}/${imagename}
 }

From 44b1d57b8d38c300ad1af369329761a25448b4af Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 12:24:02 -0400
Subject: [PATCH 032/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 0dedd0b3..31cc94d1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -96,7 +96,9 @@ pipeline {
                       // sh 'cd test-compose && ./compose.sh'
                       //// bring down after testing
                       //sh 'cd test-compose && docker-compose down'
-                      baseImg.push("$tag")
+                      docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
+                        baseImg.push("$tag")
+                      }
                   }
             }
         }

From 515c65090b0a1e93c426768cb71848aac0ad16dc Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 12:38:08 -0400
Subject: [PATCH 033/111] Update main.bats

---
 tests/main.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/main.bats b/tests/main.bats
index 8a865bfe..973dc981 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -12,5 +12,5 @@ load ../common
 
 
 @test "070 There are no known security vulnerabilities" {
-    ./tests/clairscan.sh ${maintainer}/${imagename}
+    ./tests/clairscan.sh ${maintainer}/${imagename}:${tag}
 }

From d179cf7e4ccc253c793501d27a29d1f84298de71 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 13:09:10 -0400
Subject: [PATCH 034/111] Update main.bats

---
 tests/main.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/main.bats b/tests/main.bats
index 973dc981..9dc81676 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -12,5 +12,5 @@ load ../common
 
 
 @test "070 There are no known security vulnerabilities" {
-    ./tests/clairscan.sh ${maintainer}/${imagename}:${tag}
+    ./tests/clairscan.sh ${maintainer}/${imagename}:$latest
 }

From 004636368bf0e53457ff203ca1caf27f5a9af8bf Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 13:41:05 -0400
Subject: [PATCH 035/111] Update main.bats

---
 tests/main.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/main.bats b/tests/main.bats
index 9dc81676..0c18d122 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -12,5 +12,5 @@ load ../common
 
 
 @test "070 There are no known security vulnerabilities" {
-    ./tests/clairscan.sh ${maintainer}/${imagename}:$latest
+    ./tests/clairscan.sh ${maintainer}/${imagename}:latest
 }

From 2701cfa7fcc6a88a7485683c9e00c44407652cd5 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 16 Oct 2018 12:49:47 -0400
Subject: [PATCH 036/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index e3b3dc58..2ed11a54 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_2,grouper_v2_4_0_ui_patch_0,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_2,grouper_v2_4_0_ui_patch_1,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 7ea8949bd23dc107d920ee1cbaaa10cdd325b841 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 31 Oct 2018 22:20:12 -0400
Subject: [PATCH 037/111] API patch 3

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 2ed11a54..7aeb8776 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_2,grouper_v2_4_0_ui_patch_1,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_3,grouper_v2_4_0_ui_patch_1,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From cada700298286c8191a772e742b8a69886993058 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 7 Nov 2018 14:28:26 -0500
Subject: [PATCH 038/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 7aeb8776..c3b77116 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_3,grouper_v2_4_0_ui_patch_1,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_6,grouper_v2_4_0_ui_patch_3,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 6f9502e1c22dd8e8dac4df28b57c23b7c57d0c89 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 7 Dec 2018 10:32:05 -0500
Subject: [PATCH 039/111] a11-u5-w0-p0

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index c3b77116..967b0d10 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_6,grouper_v2_4_0_ui_patch_3,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_11,grouper_v2_4_0_ui_patch_5,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From de3486b0b3b62ba274e383e6fa92429b485577d7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 7 Dec 2018 10:47:45 -0500
Subject: [PATCH 040/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 31cc94d1..2b7b801b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,7 +26,7 @@ pipeline {
                     dir('tmp'){
                       git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])
                       sh 'ls'
-                      sh 'mv bin/* ../bin/.'
+                      sh 'mv bin/* ../bin'
                     }
                     // Build and test scripts expect that 'tag' is present in common.bash. This is necessary for both Jenkins and standalone testing.
                     // We don't care if there are more 'tag' assignments there. The latest one wins.

From 67cf458ab4b887510c633de3d7ca86159c79161f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 4 Jan 2019 12:29:02 -0500
Subject: [PATCH 041/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 967b0d10..ce6477e9 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_11,grouper_v2_4_0_ui_patch_5,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_11,grouper_v2_4_0_ui_patch_6,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 9891cf0784fdcfd812f9c43b0e75cd0bb5daebca Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 4 Jan 2019 12:33:20 -0500
Subject: [PATCH 042/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 2b7b801b..d7b0dc62 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -53,7 +53,7 @@ pipeline {
                 script {
                   try{
                       docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
-                        baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+                        baseImg = docker.build("$maintainer/$imagename", "--build-arg GROUPER_CONTAINER_VERSION=$tag --no-cache .")
                       }
                   } catch(error) {
                      def error_details = readFile('./debug');

From b12c150413b73fa63c05845efbe1bc23ca15e7d8 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 4 Jan 2019 15:38:43 -0500
Subject: [PATCH 043/111] Update Dockerfile

---
 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index eee6c126..d618b9fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,12 @@ FROM centos:centos7 as installing
 RUN yum update -y \
     && yum install -y wget tar unzip dos2unix \
     && yum clean all
+    
+ARG GROUPER_CONTAINER_VERSION
 
 ENV GROUPER_VERSION=2.4.0 \
-     JAVA_HOME=/usr/lib/jvm/zulu-8/
+     JAVA_HOME=/usr/lib/jvm/zulu-8/ \
+     GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
 
 # use Zulu package
 RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \

From f76052103703ee7855a7df24e53ecbc08deac249 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 4 Jan 2019 16:05:54 -0500
Subject: [PATCH 044/111] Update Dockerfile

---
 Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d618b9fe..accfc65b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -96,10 +96,15 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       ImageType="Grouper" \
       ImageName=$imagename \
       ImageOS=centos7
+      
+ARG GROUPER_CONTAINER_VERSION
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8/ \
     PATH=$PATH:$JAVA_HOME/bin \
-    GROUPER_HOME=/opt/grouper/grouper.apiBinary
+    GROUPER_HOME=/opt/grouper/grouper.apiBinary \
+    GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION \
+    
+
 
 RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 

From bfa62a7b3c076370cc4e6b2abea1d297760425ee Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 4 Jan 2019 16:09:41 -0500
Subject: [PATCH 045/111] Update Dockerfile

---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index accfc65b..e5f412bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -102,9 +102,7 @@ ARG GROUPER_CONTAINER_VERSION
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8/ \
     PATH=$PATH:$JAVA_HOME/bin \
     GROUPER_HOME=/opt/grouper/grouper.apiBinary \
-    GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION \
-    
-
+    GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
 
 RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 

From 39679df77ca065557efdd77fecb3d2ccd0c223f4 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 7 Jan 2019 11:08:54 -0500
Subject: [PATCH 046/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index ce6477e9..d79ed61d 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_11,grouper_v2_4_0_ui_patch_6,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_11,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From ed2fbd50591b24ceed77c583d23c4142ccf7b327 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 7 Jan 2019 13:31:11 -0500
Subject: [PATCH 047/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index d79ed61d..1d78ed2f 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_11,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_13,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 661fb87da7cb32433d0829f17dea1c02d92711d7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 8 Jan 2019 16:32:08 -0500
Subject: [PATCH 048/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 1d78ed2f..2cbef7ea 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_13,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_14,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 8784d7534988a1ed84a5d4cc5d0df68eaa5866ea Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 15 Jan 2019 05:46:23 -0500
Subject: [PATCH 049/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 2cbef7ea..dd108d85 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_14,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_17,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 79be192561a81321d461efb440f90262e6eb0280 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 16 Jan 2019 20:35:24 -0500
Subject: [PATCH 050/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index dd108d85..b47a51eb 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_17,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_19,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 3bf230f45e822400155c6c55b38df857b2d0126f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 29 Jan 2019 08:20:10 -0500
Subject: [PATCH 051/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index b47a51eb..7f2f9b4b 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_19,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_19,grouper_v2_4_0_ui_patch_9,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_2
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From ab1f9481075b4538d1ad404ed1eeef97eb9ee21f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 6 Feb 2019 12:04:48 -0500
Subject: [PATCH 052/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 7f2f9b4b..cafa7c87 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_19,grouper_v2_4_0_ui_patch_9,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_2
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_23,grouper_v2_4_0_ui_patch_9,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From f32bc0610f708873c8028fdf514956db139d1fe7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 7 Feb 2019 15:46:56 -0500
Subject: [PATCH 053/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index cafa7c87..dbe725eb 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_23,grouper_v2_4_0_ui_patch_9,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_25,grouper_v2_4_0_ui_patch_11,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 795bd16cfdde80909df5855d26a88ea603416a22 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 8 Feb 2019 14:15:30 -0500
Subject: [PATCH 054/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index dbe725eb..5644c5cb 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_25,grouper_v2_4_0_ui_patch_11,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_26,grouper_v2_4_0_ui_patch_11,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 76ac8667cc6debf5405533a58c1dfd855a37609a Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 8 Feb 2019 16:31:42 -0500
Subject: [PATCH 055/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 4b08cf86..b2acf050 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_109,grouper_v2_3_0_ui_patch_47,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_21
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_109,grouper_v2_3_0_ui_patch_47,grouper_v2_3_0_ws_patch_13,grouper_v2_3_0_pspng_patch_24
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 8ebeef12fa7f5e77f49059e4915d6cf84d80e097 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 11 Feb 2019 15:10:00 -0500
Subject: [PATCH 056/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 5644c5cb..a20f71f2 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_26,grouper_v2_4_0_ui_patch_11,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_27,grouper_v2_4_0_ui_patch_11,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 8e0f56764a5087587ae00e0d055efda9f77f4bfe Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 12 Feb 2019 10:42:27 -0500
Subject: [PATCH 057/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 8cb90349..f97f1526 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,12 +21,11 @@ pipeline {
                         echo "You must define an imagename in common.bash"
                         currentBuild.result = 'FAILURE'
                      }
-                    sh 'mkdir -p bin'
-                    sh 'mkdir -p tmp'
+                    sh 'mkdir -p tmp && mkdir -p bin'
                     dir('tmp'){
                       git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])
-                      sh 'ls'
-                      sh 'mv bin/* ../bin/.'
+                      sh 'rm -rf ../bin/*'
+                      sh 'mv ./bin/* ../bin/.'
                     }
                 }  
              }

From 08e687a9d383bcc4d81e86886ddbc370dcef949f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sun, 17 Feb 2019 12:00:56 -0500
Subject: [PATCH 058/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index a20f71f2..6b0241d0 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_27,grouper_v2_4_0_ui_patch_11,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_29,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_2
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From 71bc2ee834aed674e30e44c245d668fc56c93fe0 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 26 Feb 2019 16:58:26 -0500
Subject: [PATCH 059/111] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 933bbdf3..2c5c73cb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-[![Build Status](https://jenkins.testbed.tier.internet2.edu/job/docker/job/grouper/job/master/badge/icon)](https://jenkins.testbed.tier.internet2.edu/job/docker/job/grouper/job/master/)
+[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a29-u14-w3-p2-20190217)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a29-u14-w3-p2-20190217)
+
 
 
 # Upgrading from 2.3 to 2.4

From 6275b358b1c93c6e44605e7067ed45f070764baf Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 26 Feb 2019 17:05:02 -0500
Subject: [PATCH 060/111] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index d7b0dc62..f07c3f43 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,12 +21,12 @@ pipeline {
                         echo "You must define an imagename in common.bash"
                         currentBuild.result = 'FAILURE'
                      }
-                    sh 'mkdir -p bin'
-                    sh 'mkdir -p tmp'
+                    
+                    sh 'mkdir -p tmp && mkdir -p bin'
                     dir('tmp'){
                       git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])
-                      sh 'ls'
-                      sh 'mv bin/* ../bin'
+                      sh 'rm -rf ../bin/*'
+                      sh 'mv ./bin/* ../bin/.'
                     }
                     // Build and test scripts expect that 'tag' is present in common.bash. This is necessary for both Jenkins and standalone testing.
                     // We don't care if there are more 'tag' assignments there. The latest one wins.

From 80ab1303d31dc0b37f6d8a9639899c7d7c2d3e95 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 4 Mar 2019 10:53:01 -0500
Subject: [PATCH 061/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 6b0241d0..92d1ffc2 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_29,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_2
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_31,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_3
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

From a4cbae8551f12a55c2e83b162010e87ca97c81a2 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 12 Mar 2019 12:52:21 -0400
Subject: [PATCH 062/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index ee6acce7..dd32b019 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_31,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_3
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_32,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_3
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 5297deb414a0480a582dce5b419cb010dfb042e4 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 14 Mar 2019 12:17:36 -0400
Subject: [PATCH 063/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index dd32b019..5f0b79de 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_32,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_3
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_32,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_3
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From d56bc60e22684bc2764d9431d3676124f5d5fbfa Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sun, 17 Mar 2019 09:56:49 -0400
Subject: [PATCH 064/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 5f0b79de..99142801 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_32,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_3
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_32,grouper_v2_4_0_ui_patch_18,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_3
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 2af5dac90ab7a119641641b7a125fc4ed6241bc8 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 18 Mar 2019 08:33:38 -0400
Subject: [PATCH 065/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 99142801..90b9b7e4 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_32,grouper_v2_4_0_ui_patch_18,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_3
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_38,grouper_v2_4_0_ui_patch_18,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From d96a3e16dea5036e011f16e6a9d51080a86fc1fd Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 15 Apr 2019 15:03:53 -0400
Subject: [PATCH 066/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 90b9b7e4..977942bc 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_38,grouper_v2_4_0_ui_patch_18,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_41,grouper_v2_4_0_ui_patch_22,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From f208d3b6e60e95dda03d43e24ec82ddcf0b47861 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 26 Apr 2019 14:17:05 -0400
Subject: [PATCH 067/111] 2.4.0-a42-u23-w5-p4-20190426-rc1

---
 container_files/grouper.installer.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 977942bc..36a97a89 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,8 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_41,grouper_v2_4_0_ui_patch_22,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
+# 2.4.0-a42-u23-w5-p4-20190426-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_42,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From cc5917b8bae262d317da2d3bae442ab520e87745 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 26 Apr 2019 14:18:23 -0400
Subject: [PATCH 068/111] update shib_sp tag to 3.0.4_03122019

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

diff --git a/Dockerfile b/Dockerfile
index e5f412bf..716d44c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -89,7 +89,7 @@ COPY container_files/tomcat/ /opt/tomcat/
 COPY container_files/tomee/ /opt/tomee/
 
 
-FROM tier/shibboleth_sp
+FROM tier/shibboleth_sp:3.0.4_03122019
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

From ebe0ee41e798bbd30c8443ba3cf04facafacbc9f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 29 Apr 2019 10:24:54 -0400
Subject: [PATCH 069/111] 2.4.0-a42-u23-w5-p5-20190429-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 36a97a89..2eecedb4 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,8 +16,8 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a42-u23-w5-p4-20190426-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_42,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
+# 2.4.0-a42-u23-w5-p5-20190429-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_42,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_5
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 564ee1f8ccad16e2806ead67e1790731e12f14b7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 1 May 2019 09:41:34 -0400
Subject: [PATCH 070/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 2eecedb4..0f38148b 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a42-u23-w5-p5-20190429-rc1
+# 2.4.0-a42-u23-w5-p6-20190501-rc1
 grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_42,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_5
 
 

From adc5284703d09039757925847570bc2a027facc8 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 1 May 2019 11:32:55 -0400
Subject: [PATCH 071/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 0f38148b..e5d30b23 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,8 +16,8 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a42-u23-w5-p6-20190501-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_42,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_5
+# 2.4.0-a43-u23-w5-p6-20190501-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_43,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_5
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 6d4b379c3cca8091a3083b72d3f489b438b0620d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 1 May 2019 15:09:10 -0400
Subject: [PATCH 072/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index e5d30b23..ed78b0bd 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,7 +17,7 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
 # 2.4.0-a43-u23-w5-p6-20190501-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_43,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_5
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_43,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 0d5bb36795c1fc72b197b6bcb0b4bff9771db44d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 1 May 2019 15:45:13 -0400
Subject: [PATCH 073/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index ed78b0bd..3e30035c 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -14,6 +14,7 @@ grouperInstaller.default.installOrUpgrade = install
 ##
 ##############################
 
+grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
 # 2.4.0-a43-u23-w5-p6-20190501-rc1

From cbc027e78e90be24d65b4f678a37d5ad5db55b37 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 6 May 2019 14:39:53 -0400
Subject: [PATCH 074/111] 2.4.0-a47-u23-w5-p6-20190506-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 3e30035c..ee30d9d7 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a43-u23-w5-p6-20190501-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_43,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
+# 2.4.0-a47-u23-w5-p6-20190506-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_47,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 08ab73f90daef019f200f526cd902eea8035347b Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 7 May 2019 16:44:50 -0600
Subject: [PATCH 075/111] Add HEALTCHECK NONE to fix gsh problem

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 716d44c9..920c2841 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -144,6 +144,8 @@ WORKDIR /opt/grouper/grouper.apiBinary/
 
 EXPOSE 80 443
 
+HEALTHCHECK NONE
+
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
 
 CMD ["bin/gsh", "-loader"]

From 3a1c0740e2809e971685f52e3ed8aa7c33dfe945 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 9 May 2019 13:28:11 -0400
Subject: [PATCH 076/111] 2.4.0-a47-u25-w5-p6-20190509-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index ee30d9d7..3680125d 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a47-u23-w5-p6-20190506-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_47,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
+# 2.4.0-a47-u25-w5-p6-20190509-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_47,grouper_v2_4_0_ui_patch_25,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From d2465097ac6368eb75488a6c97b0b6293bd8feb5 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 15 May 2019 10:23:24 -0400
Subject: [PATCH 077/111] removing webapps/ROOT/ from container

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

diff --git a/Dockerfile b/Dockerfile
index 716d44c9..a37e2a60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,7 +76,7 @@ RUN cd /opt/grouper/grouper.apiBinary/; \
 
 RUN cd /opt/tomcat/; \
     chmod +r bin/log4j-*.jar; \
-    rm -fr webapps/docs/ webapps/examples/ webapps/host-manager/ webapps/manager/ logs/* temp/* work/* conf/logging.properties
+    rm -fr webapps/docs/ webapps/examples/ webapps/host-manager/ webapps/manager/ webapps/ROOT/ logs/* temp/* work/* conf/logging.properties
 
 RUN cd /opt/tomee/; \
     chmod +r bin/log4j-*.jar; \

From c23674d7f82abac245155c0bfbcaa4e0e5affbaf Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 15 May 2019 10:24:09 -0400
Subject: [PATCH 078/111] Update grouper-www.conf

---
 container_files/httpd/grouper-www.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/container_files/httpd/grouper-www.conf b/container_files/httpd/grouper-www.conf
index 368f7f6c..0108c5f8 100644
--- a/container_files/httpd/grouper-www.conf
+++ b/container_files/httpd/grouper-www.conf
@@ -7,6 +7,11 @@ ProxyPass /grouper ajp://localhost:8009/grouper  timeout=2400
 ProxyPass /grouper-ws ajp://localhost:8009/grouper-ws  timeout=2400
 ProxyPass /grouper-ws-scim ajp://localhost:8009/grouper-ws-scim  timeout=2400
 
+RewriteEngine on
+
+RewriteCond %{REQUEST_URI} "^/$"
+RewriteRule . %{REQUEST_SCHEME}://%{HTTP_HOST}/grouper/ [R=301,L]
+
 <Location /grouper>
   AuthType shibboleth
   ShibRequestSetting requireSession 1

From 04394718dd5d9d19f6320ad091d3ebe4b5ca37b2 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 15 May 2019 10:31:12 -0400
Subject: [PATCH 079/111] Update grouper-www.conf

---
 container_files/httpd/grouper-www.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/container_files/httpd/grouper-www.conf b/container_files/httpd/grouper-www.conf
index 0108c5f8..562e47c6 100644
--- a/container_files/httpd/grouper-www.conf
+++ b/container_files/httpd/grouper-www.conf
@@ -8,7 +8,6 @@ ProxyPass /grouper-ws ajp://localhost:8009/grouper-ws  timeout=2400
 ProxyPass /grouper-ws-scim ajp://localhost:8009/grouper-ws-scim  timeout=2400
 
 RewriteEngine on
-
 RewriteCond %{REQUEST_URI} "^/$"
 RewriteRule . %{REQUEST_SCHEME}://%{HTTP_HOST}/grouper/ [R=301,L]
 

From 3ca9108b3da4b0b56119fb257e236f63748ce41e Mon Sep 17 00:00:00 2001
From: Scott Koranda <skoranda@gmail.com>
Date: Sat, 8 Jun 2019 08:21:29 -0500
Subject: [PATCH 080/111] Fixed bad JEXL/elConfig example in README.md

The JEXL/elConfig example in the README.md documentation will not work
to read the database password from a file path pointed to by an
environment variable because the first argument to
org.apache.commons.io.FileUtils.readFileToString() must be an instance
of java.io.File and not String. This commit fixes that with an example
that is tested to work with Grouper 2.4.x.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2c5c73cb..d4b9069e 100644
--- a/README.md
+++ b/README.md
@@ -168,7 +168,7 @@ For passing full files into the container, this container will make any secrets
 Docker Secrets can also be used to pass in strings, such as a database connection string password, into the component config. To pass in the Grouper database connection string, one might set the property and value as such:
 
 ```text
-hibernate.connection.password.elConfig = ${java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD') }
+hibernate.connection.password.elConfig = ${java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(new("java.io.File", java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD_FILE')), "utf-8") : java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD') }
 ```
 
 Note that the default property name has been changed by appending `.elConfig`. (This causes Grouper to evaluate the string before saving the value.) The expression allows deployers to use a file containing only the database password as a Docker Secret and reference the file name via the `GROUPER_DATABASE_PASSWORD_FILE` environment property. This allows the config files to be baked into the image, if desired. Also, but not recommended, the database password could just be set in the Docker Service definition as an environment variable, `GROUPER_DATABASE_PASSWORD`. (Technically the expression can be broken up and just the desired functionality used.) Of course, using Grouper's MorphString functionality is supported and likely is the best option, but does require more effort in setting it up.

From 904f6d87389de5cba61c546681ce155fd2b0ec1c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 12 Jun 2019 09:42:10 -0400
Subject: [PATCH 081/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 3680125d..0dd88fa2 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,7 +17,7 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a47-u25-w5-p6-20190509-rc1
+# 2.4.0-a64-u38-w6-p6-20190612-rc1
 grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_47,grouper_v2_4_0_ui_patch_25,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
 
 

From 4a49defa8148c4c81197e3febb879dd0fae7b972 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 12 Jun 2019 09:43:02 -0400
Subject: [PATCH 082/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 3680125d..e74a0f5f 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a47-u25-w5-p6-20190509-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_47,grouper_v2_4_0_ui_patch_25,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
+# 2.4.0-a64-u38-w6-p6-20190612-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_64,grouper_v2_4_0_ui_patch_38,grouper_v2_4_0_ws_patch_6,grouper_v2_4_0_pspng_patch_6
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From d0e8a62537dfef39ee2b420032c70c5e42e6f269 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 12 Jun 2019 14:41:23 -0400
Subject: [PATCH 083/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 0dd88fa2..e74a0f5f 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -18,7 +18,7 @@ grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
 # 2.4.0-a64-u38-w6-p6-20190612-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_47,grouper_v2_4_0_ui_patch_25,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_64,grouper_v2_4_0_ui_patch_38,grouper_v2_4_0_ws_patch_6,grouper_v2_4_0_pspng_patch_6
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 1179e13d5cfdf2a2a4aca8481a8a89c22aed1276 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 25 Jun 2019 14:27:59 -0400
Subject: [PATCH 084/111] tomcat 8.5.42

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

diff --git a/Dockerfile b/Dockerfile
index 9471c34c..87435e24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,7 @@ RUN echo 'Installing Grouper'; \
 FROM centos:centos7 as cleanup
 
 ENV GROUPER_VERSION=2.4.0 \
-    TOMCAT_VERSION=8.5.12 \    
+    TOMCAT_VERSION=8.5.42 \    
     TOMEE_VERSION=7.0.0
 
 COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar /opt/grouper/

From f1d4f8ef0f2877c6a6086f81ffe2b7223db10ac3 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sun, 29 Sep 2019 18:51:25 -0400
Subject: [PATCH 085/111] 2.4.0-a74-u44-w8-p11-20190929-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index e74a0f5f..809bbbe5 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a64-u38-w6-p6-20190612-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_64,grouper_v2_4_0_ui_patch_38,grouper_v2_4_0_ws_patch_6,grouper_v2_4_0_pspng_patch_6
+# 2.4.0-a74-u44-w8-p11-20190929-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_74,grouper_v2_4_0_ui_patch_44,grouper_v2_4_0_ws_patch_8,grouper_v2_4_0_pspng_patch_11
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 7836648e8642251273a0007204096297ed506639 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sun, 29 Sep 2019 20:00:53 -0400
Subject: [PATCH 086/111] Update Dockerfile

---
 test-compose/data/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-compose/data/Dockerfile b/test-compose/data/Dockerfile
index cbb3ca2d..e4ffb7f8 100644
--- a/test-compose/data/Dockerfile
+++ b/test-compose/data/Dockerfile
@@ -11,7 +11,7 @@ RUN yum install -y epel-release \
     && yum clean all \
     && rm -rf /var/cache/yum
 
-RUN mysql_install_db \
+RUN mysql_install_db --force \
     && chown -R mysql:mysql /var/lib/mysql/ \
     && sed -i 's/^\(bind-address\s.*\)/# \1/' /etc/my.cnf \
     && sed -i 's/^\(log_error\s.*\)/# \1/' /etc/my.cnf \

From bcfb7e3727dc33d79ae3f274d18b23845d9a7099 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 1 Oct 2019 16:49:40 -0400
Subject: [PATCH 087/111] 2.4.0-a74-u45-w8-p11-20191001-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 809bbbe5..edb46202 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a74-u44-w8-p11-20190929-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_74,grouper_v2_4_0_ui_patch_44,grouper_v2_4_0_ws_patch_8,grouper_v2_4_0_pspng_patch_11
+# 2.4.0-a74-u45-w8-p11-20191001-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_74,grouper_v2_4_0_ui_patch_45,grouper_v2_4_0_ws_patch_8,grouper_v2_4_0_pspng_patch_11
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 5e9523c29d682653312009e33aed87f0eabe013d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 24 Oct 2019 09:01:57 -0600
Subject: [PATCH 088/111] 2.4.0-a77-u49-w10-p11-20191024-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index edb46202..ed2f2aaf 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a74-u45-w8-p11-20191001-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_74,grouper_v2_4_0_ui_patch_45,grouper_v2_4_0_ws_patch_8,grouper_v2_4_0_pspng_patch_11
+# 2.4.0-a77-u49-w10-p11-20191024-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_77,grouper_v2_4_0_ui_patch_49,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 5e8e64ec215db06fc235b3c42311dbb6f66fa40c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 28 Oct 2019 07:56:06 -0400
Subject: [PATCH 089/111] 2.4.0-a78-u51-w10-p11-20191028-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index ed2f2aaf..138d653f 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a77-u49-w10-p11-20191024-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_77,grouper_v2_4_0_ui_patch_49,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
+# 2.4.0-a78-u51-w10-p11-20191028-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_78,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 1190b34d451067a6d43a8f0def26669c142efc7d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 30 Oct 2019 15:10:24 -0400
Subject: [PATCH 090/111] 2.4.0-a79-u51-w10-p11-20191030-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 138d653f..17955d17 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a78-u51-w10-p11-20191028-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_78,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
+# 2.4.0-a79-u51-w10-p11-20191030-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_79,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 33db44d2c2a41f2c5462f0d24dfc14b1b183dcc9 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 31 Oct 2019 14:46:27 -0400
Subject: [PATCH 091/111] 2.4.0-80-u51-w10-p11-20191031-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 17955d17..8e0300e0 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a79-u51-w10-p11-20191030-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_79,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
+# 2.4.0-80-u51-w10-p11-20191031-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_80,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 1ba4216468753af1bce8553b87f84f097d7a6ae3 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 9 Dec 2019 13:47:15 -0600
Subject: [PATCH 092/111] Update README.md

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d4b9069e..0d21538c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
 [![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a29-u14-w3-p2-20190217)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a29-u14-w3-p2-20190217)
 
 
+This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are avalailable at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally. 
+
+The test-compose directory contains an example Grouper environment that starts up the various Grouper components. This example demonstrates how one might go about customizing and deploying their Grouper containers, using the TIER Grouper image as a base image. If evaluating Grouper, this is a good place to start. 
+
 
 # Upgrading from 2.3 to 2.4
 
@@ -11,10 +15,12 @@ In particular, in subject.properties, *.param.base.value should be adjusted to o
 
 Additional upgrade information can be found at the following URL: https://spaces.at.internet2.edu/display/Grouper/v2.4+Upgrade+Instructions+from+v2.3
 
+
+
 # Supported tags
 
 -	latest
--   patch specific tags* (i.e. 2.3.0-a97-u41-w11-p16)
+-   patch specific tags with date timestamp* (i.e. 2.4.0-80-u51-w10-p11-20191118)
 
 \* Patch builds are routinely produced, but not necessarily for each patch release. The following monikers are used to construct the tag name:
  
@@ -22,6 +28,7 @@ Additional upgrade information can be found at the following URL: https://spaces
 - u = ui patch number
 - w = ws patch number
 - p = pspng patch number
+- last field = the year, month and day the image was built
 
 # Quick reference
 

From 2e59eb4aae6f9be679337ac910901f010b008f4c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 9 Dec 2019 13:48:13 -0600
Subject: [PATCH 093/111] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0d21538c..1707123c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a29-u14-w3-p2-20190217)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a29-u14-w3-p2-20190217)
+[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118)
 
 
-This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are avalailable at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally. 
+This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are available at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally. 
 
 The test-compose directory contains an example Grouper environment that starts up the various Grouper components. This example demonstrates how one might go about customizing and deploying their Grouper containers, using the TIER Grouper image as a base image. If evaluating Grouper, this is a good place to start. 
 

From f4b81f69634d61c01459c20606e2d93f5564db76 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 23 Dec 2019 08:46:46 -0500
Subject: [PATCH 094/111] 2.4.0-a85-u53-w10-p12-20191223-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 8e0300e0..f0ba8c39 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-80-u51-w10-p11-20191031-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_80,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
+# 2.4.0-a85-u53-w10-p12-20191223-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_85,grouper_v2_4_0_ui_patch_53,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 3509ca460b2f3223e3b7993050cb94d304977af1 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 24 Dec 2019 07:15:31 -0500
Subject: [PATCH 095/111] 2.4.0-a86-u53-w10-p12-20191224-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index f0ba8c39..6efa4ed3 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a85-u53-w10-p12-20191223-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_85,grouper_v2_4_0_ui_patch_53,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a86-u53-w10-p12-20191224-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_86,grouper_v2_4_0_ui_patch_53,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 3058d5fcd524b84fb572d081892a334d1955457e Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 2 Jan 2020 19:35:03 -0500
Subject: [PATCH 096/111] 2.4.0-a87-u53-w10-p12-20200102-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 6efa4ed3..322ceff3 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a86-u53-w10-p12-20191224-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_86,grouper_v2_4_0_ui_patch_53,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a87-u53-w10-p12-20200102-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_87,grouper_v2_4_0_ui_patch_53,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 7b7a12a3472682a03b2fcd56acae69d007a058ab Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 2 Jan 2020 21:37:47 -0500
Subject: [PATCH 097/111] 2.4.0-a87-u54-w10-p12-20200102-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 322ceff3..b49f46e2 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a87-u53-w10-p12-20200102-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_87,grouper_v2_4_0_ui_patch_53,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a87-u54-w10-p12-20200102-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_87,grouper_v2_4_0_ui_patch_54,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From a2a1cac94180d61bdebf85cae0a9b9014132579d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 3 Jan 2020 13:30:57 -0500
Subject: [PATCH 098/111] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1707123c..2862d7c4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118)
+[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/latest)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/latest)
 
 
 This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are available at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally. 

From 3e8bd5c7518deebf05c5e63a4f10a122b33e9783 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 3 Jan 2020 13:58:19 -0500
Subject: [PATCH 099/111] typo in jenkins url

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2862d7c4..126d8942 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/latest)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/latest)
+[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/master)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/master)
 
 
 This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are available at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally. 

From e6bd8854a19e7d4a7240bbed67dc84acde861619 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 9 Jan 2020 14:16:31 -0500
Subject: [PATCH 100/111] 2.4.0-a88-u55-w11-p12-20200109-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index b49f46e2..f081b8c4 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a87-u54-w10-p12-20200102-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_87,grouper_v2_4_0_ui_patch_54,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a88-u55-w11-p12-20200109-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_88,grouper_v2_4_0_ui_patch_55,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From ce4b1d43898ca7d2469b3e1ecc987f804cd8f115 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 9 Jan 2020 14:17:02 -0500
Subject: [PATCH 101/111] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1707123c..84567891 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118)
+[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a88-u55-w11-p12-20200109-rc1)](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a88-u55-w11-p12-20200109-rc1)
 
 
 This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are available at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally. 

From 82b97ac2449ca7ea4d5c261e112cc3cccd997007 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 9 Jan 2020 14:46:47 -0500
Subject: [PATCH 102/111] temporary morphString.properties file for build

---
 container_files/morphString.properties | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 container_files/morphString.properties

diff --git a/container_files/morphString.properties b/container_files/morphString.properties
new file mode 100644
index 00000000..7c1cc4ca
--- /dev/null
+++ b/container_files/morphString.properties
@@ -0,0 +1 @@
+fh43IRJ4Nf5

From 22847a5a3a259b25c6814fbc159b61698de77bd5 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 9 Jan 2020 14:47:38 -0500
Subject: [PATCH 103/111] install temporary morphString.properties

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 87435e24..601828c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,6 +39,8 @@ RUN echo 'Downloading Grouper Installer...' \
     && wget -q -O /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar http://software.internet2.edu/grouper/release/$GROUPER_VERSION/grouperInstaller.jar
 
 COPY container_files/grouper.installer.properties /opt/grouper/$GROUPER_VERSION
+COPY container_files/morphString.properties /opt/grouper/$GROUPER_VERSION
+
 
 RUN echo 'Installing Grouper'; \
     PATH=$PATH:$JAVA_HOME/bin; \

From 9788217fa8b8eee4d286878c16f90df173b731a4 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 9 Jan 2020 15:00:46 -0500
Subject: [PATCH 104/111] Update Dockerfile

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 601828c8..12116253 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,6 +39,7 @@ RUN echo 'Downloading Grouper Installer...' \
     && wget -q -O /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar http://software.internet2.edu/grouper/release/$GROUPER_VERSION/grouperInstaller.jar
 
 COPY container_files/grouper.installer.properties /opt/grouper/$GROUPER_VERSION
+# Temporary morphString file used for building, not used in production
 COPY container_files/morphString.properties /opt/grouper/$GROUPER_VERSION
 
 

From bf865a59134eeaa807fb1063a182bdf7fe814425 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 10 Jan 2020 09:20:08 -0500
Subject: [PATCH 105/111] update dummy encrypt.key

---
 container_files/morphString.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container_files/morphString.properties b/container_files/morphString.properties
index 7c1cc4ca..52479216 100644
--- a/container_files/morphString.properties
+++ b/container_files/morphString.properties
@@ -1 +1 @@
-fh43IRJ4Nf5
+encrypt.key=fh43IRJ4Nf5

From 70d9ca6bedac287392ac46f9bce30de149ccbe0f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 10 Jan 2020 13:36:22 -0500
Subject: [PATCH 106/111] 2.4.0-a89-u55-w11-p12-20200110-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index f081b8c4..11fcfef9 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a88-u55-w11-p12-20200109-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_88,grouper_v2_4_0_ui_patch_55,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a89-u55-w11-p12-20200110-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_89,grouper_v2_4_0_ui_patch_55,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 332ddf1496bbb9651595609d148211bafd1e37c2 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 31 Jan 2020 12:39:40 -0500
Subject: [PATCH 107/111] 2.4.0-a89-u55-w11-p12-20200131-rc1

remove extraneous grouper.properties in /opt/grouper/grouper.apiBinary/
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 12116253..a397ab04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -75,7 +75,7 @@ ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/lo
 ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomee/bin
 
 RUN cd /opt/grouper/grouper.apiBinary/; \
-    rm -fr ddlScripts/ grouper.lck grouper.log grouper.script grouper.tmp/ gshAddGrouperSystemWsGroup.gsh logs/
+    rm -fr ddlScripts/ grouper.properties grouper.lck grouper.log grouper.script grouper.tmp/ gshAddGrouperSystemWsGroup.gsh logs/
 
 RUN cd /opt/tomcat/; \
     chmod +r bin/log4j-*.jar; \

From 9c045d439169867e07fc98336e01226ed4f2da32 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 31 Jan 2020 12:54:58 -0500
Subject: [PATCH 108/111] central.maven.org to repo1 for now

---
 Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a397ab04..6fdf32bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,13 +66,13 @@ COPY --from=installing /opt/grouper/$GROUPER_VERSION/apache-tomcat-$TOMCAT_VERSI
 COPY --from=installing /opt/grouper/$GROUPER_VERSION/apache-tomee-webprofile-$TOMEE_VERSION/ /opt/tomee/
 COPY --from=installing /etc/alternatives/java /etc/alternatives/java
 
-ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomcat/bin
-ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomcat/bin
-ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomcat/bin
+ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomcat/bin
+ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomcat/bin
+ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomcat/bin
 
-ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomee/bin
-ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomee/bin
-ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomee/bin
+ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomee/bin
+ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomee/bin
+ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomee/bin
 
 RUN cd /opt/grouper/grouper.apiBinary/; \
     rm -fr ddlScripts/ grouper.properties grouper.lck grouper.log grouper.script grouper.tmp/ gshAddGrouperSystemWsGroup.gsh logs/

From ac86dac0ea3fc331145befda8e6e7543b552f554 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 5 Feb 2020 16:13:56 -0500
Subject: [PATCH 109/111] 2.4.0-a90-u56-w11-p12-20200205-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 11fcfef9..2a917dc1 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a89-u55-w11-p12-20200110-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_89,grouper_v2_4_0_ui_patch_55,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a90-u56-w11-p12-20200205-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_90,grouper_v2_4_0_ui_patch_56,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 3fc57112861802f3e777acc41a6b4fc57ce02e32 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 10 Feb 2020 10:21:07 -0500
Subject: [PATCH 110/111] 2.4.0-a91-u56-w11-p12-20200210-rc1

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 2a917dc1..c63c9d5f 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a90-u56-w11-p12-20200205-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_90,grouper_v2_4_0_ui_patch_56,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a91-u56-w11-p12-20200210-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_91,grouper_v2_4_0_ui_patch_56,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set

From 6f931f09ccf4758cacbb544211c991ce65f77f7f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 14 Feb 2020 09:27:31 -0500
Subject: [PATCH 111/111] Update grouper.installer.properties

---
 container_files/grouper.installer.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index c63c9d5f..4e018728 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
 grouperInstaller.autorun.forceInstallPatch = t
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a91-u56-w11-p12-20200210-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_91,grouper_v2_4_0_ui_patch_56,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a93-u56-w11-p12-20200214-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_93,grouper_v2_4_0_ui_patch_56,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
 
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set