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 01/31] 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 02/31] 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 03/31] 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 04/31] 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 05/31] 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 06/31] 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 07/31] 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 08/31] 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 09/31] 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 10/31] 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 11/31] 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 12/31] 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 13/31] 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 14/31] 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 15/31] 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 16/31] 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 17/31] 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 18/31] 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 19/31] 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 20/31] 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 21/31] 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 22/31] 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 23/31] 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 24/31] 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 25/31] 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 26/31] 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 27/31] 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 28/31] 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 29/31] 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 30/31] 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 31/31] 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