From d9857ca0644c170318150042e1a774a4ffe5de76 Mon Sep 17 00:00:00 2001 From: Deepak Gautam Date: Mon, 12 Aug 2019 15:00:03 +0530 Subject: [PATCH 1/4] _prodregjs: Change branch for mailbox and webclient --- config.build.nicps | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config.build.nicps b/config.build.nicps index 4a7c75ea1b..bb24344f8a 100644 --- a/config.build.nicps +++ b/config.build.nicps @@ -1,13 +1,13 @@ BUILD_RELEASE = SNICKERS -BUILD_RELEASE_NO = 8.8.12 +BUILD_RELEASE_NO = 8.8.9 BUILD_RELEASE_CANDIDATE = GA BUILD_TYPE = FOSS BUILD_THIRDPARTY_SERVER = files.zimbra.com -GIT_DEFAULT_TAG = 8.8.12 +GIT_DEFAULT_TAG = 8.8.9 BUILD_NO = 2009 -%GIT_OVERRIDES = zm-mailbox.branch=snickers +%GIT_OVERRIDES = zm-mailbox.branch=NICPS-OWASP %GIT_OVERRIDES = zm-ajax.branch=snickers -%GIT_OVERRIDES = zm-web-client.branch=snickers +%GIT_OVERRIDES = zm-web-client.branch=NICPS-OWASP %GIT_OVERRIDES = zm-taglib.branch=snickers %GIT_OVERRIDES = zm-core-utils.branch=snickers %GIT_OVERRIDES = zm-ldap-utilities.branch=snickers From ed2eca9ae81689c17d04ae795a2fe796f7259ac3 Mon Sep 17 00:00:00 2001 From: Deepak Gautam <38309433+deepakzimb@users.noreply.github.com> Date: Mon, 12 Aug 2019 21:57:10 +0530 Subject: [PATCH 2/4] Update config.build.nicps --- config.build.nicps | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config.build.nicps b/config.build.nicps index bb24344f8a..e1cc7eeae8 100644 --- a/config.build.nicps +++ b/config.build.nicps @@ -18,8 +18,7 @@ BUILD_NO = 2009 %GIT_OVERRIDES = zm-clientuploader-admin-zimlet.tag=8.8.12 # no 8.8.6 tag %GIT_OVERRIDES = zm-help.branch=snickers %GIT_OVERRIDES = zm-zimlets.branch=snickers -%GIT_OVERRIDES = zm-oauth-social.tag=snickers +%GIT_OVERRIDES = zm-oauth-social.tag=8.8.12 %GIT_OVERRIDES = zm-admin-console.tag=8.8.12 %GIT_OVERRIDES = zm-zcs-lib.branch=snickers %GIT_OVERRIDES = zm-nicps.branch=snickers - From c64beac7fc325c52f1a96d3bddd7bb3ca129c8cb Mon Sep 17 00:00:00 2001 From: Deepak Gautam <38309433+deepakzimb@users.noreply.github.com> Date: Mon, 12 Aug 2019 23:45:35 +0530 Subject: [PATCH 3/4] Update config.build.nicps --- config.build.nicps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.build.nicps b/config.build.nicps index e1cc7eeae8..bafbcd3a3b 100644 --- a/config.build.nicps +++ b/config.build.nicps @@ -8,7 +8,7 @@ BUILD_NO = 2009 %GIT_OVERRIDES = zm-mailbox.branch=NICPS-OWASP %GIT_OVERRIDES = zm-ajax.branch=snickers %GIT_OVERRIDES = zm-web-client.branch=NICPS-OWASP -%GIT_OVERRIDES = zm-taglib.branch=snickers +%GIT_OVERRIDES = zm-taglib.branch=NICPS-release2019021 %GIT_OVERRIDES = zm-core-utils.branch=snickers %GIT_OVERRIDES = zm-ldap-utilities.branch=snickers %GIT_OVERRIDES = zm-network-store.branch=snickers From ba159306bf1646f70cb427dc6ea31fb44b1e65bc Mon Sep 17 00:00:00 2001 From: Deepak Gautam <38309433+deepakzimb@users.noreply.github.com> Date: Mon, 12 Aug 2019 23:56:47 +0530 Subject: [PATCH 4/4] Update config.build.nicps --- config.build.nicps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.build.nicps b/config.build.nicps index bafbcd3a3b..4e635ae814 100644 --- a/config.build.nicps +++ b/config.build.nicps @@ -8,7 +8,7 @@ BUILD_NO = 2009 %GIT_OVERRIDES = zm-mailbox.branch=NICPS-OWASP %GIT_OVERRIDES = zm-ajax.branch=snickers %GIT_OVERRIDES = zm-web-client.branch=NICPS-OWASP -%GIT_OVERRIDES = zm-taglib.branch=NICPS-release2019021 +%GIT_OVERRIDES = zm-taglib.branch=NICPS-release20190211 %GIT_OVERRIDES = zm-core-utils.branch=snickers %GIT_OVERRIDES = zm-ldap-utilities.branch=snickers %GIT_OVERRIDES = zm-network-store.branch=snickers