From 332ddf1496bbb9651595609d148211bafd1e37c2 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Fri, 31 Jan 2020 12:39:40 -0500 Subject: [PATCH 1/5] 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 Date: Fri, 31 Jan 2020 12:54:58 -0500 Subject: [PATCH 2/5] 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 Date: Wed, 5 Feb 2020 16:13:56 -0500 Subject: [PATCH 3/5] 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 Date: Mon, 10 Feb 2020 10:21:07 -0500 Subject: [PATCH 4/5] 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 Date: Fri, 14 Feb 2020 09:27:31 -0500 Subject: [PATCH 5/5] 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