From f77260f58f37d64f52718d664c77e47d1a4519e1 Mon Sep 17 00:00:00 2001 From: Ahmad <52757738+ahmad-shahid@users.noreply.github.com> Date: Thu, 6 Jun 2024 11:37:35 -0400 Subject: [PATCH] Updating version and changelog (#45) --- CHANGELOG.md | 6 ++++++ builds/build.properties | 2 +- .../gocwebtemplate-core-base/pom.xml | 2 +- .../main/java/goc/webtemplate/Constants.java | 4 ++-- .../component/AbstractCoreBean.java | 4 ++-- .../global/config/CDTSEnvironments.json | 18 ++++++++++++++++++ .../webtemplate/global/config/cdn.properties | 2 +- .../gocwebtemplate-core-jsp/pom.xml | 2 +- .../webtemplate/global/config/cdn.properties | 2 +- .../gocwebtemplate-core-spring/pom.xml | 2 +- gocwebtemplate-core/pom.xml | 2 +- gocwebtemplate-sample-jsp/pom.xml | 4 ++-- gocwebtemplate-sample-spring/pom.xml | 4 ++-- pom.xml | 2 +- 14 files changed, 40 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 862779c..55a28ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ [Download and/or Installation instructions](https://github.com/wet-boew/cdts-JavaTemplates/wiki/Installation) +## v4.0.2 + +- [CDTS](https://github.com/wet-boew/cdts-sgdc/) v5.0.1 & [wet-boew](https://github.com/wet-boew/wet-boew) v4.0.79 +- Updated static fallback files +- Bug Fixes + ## v4.0.1 - Now targeting Struts version 2.5.33 diff --git a/builds/build.properties b/builds/build.properties index bd6b312..af288fb 100644 --- a/builds/build.properties +++ b/builds/build.properties @@ -3,4 +3,4 @@ # # DO NOT EDIT build.properties DIRECTLY! # -gocwebtemplate.build.version=4.0.1-SNAPSHOT +gocwebtemplate.build.version=4.0.2-SNAPSHOT diff --git a/gocwebtemplate-core/gocwebtemplate-core-base/pom.xml b/gocwebtemplate-core/gocwebtemplate-core-base/pom.xml index 2dc51b8..d766f54 100644 --- a/gocwebtemplate-core/gocwebtemplate-core-base/pom.xml +++ b/gocwebtemplate-core/gocwebtemplate-core-base/pom.xml @@ -10,7 +10,7 @@ ca.gc.gocwebtemplate gocwebtemplate-core - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT .. diff --git a/gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/Constants.java b/gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/Constants.java index 7075cd2..ce92a42 100644 --- a/gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/Constants.java +++ b/gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/Constants.java @@ -13,9 +13,9 @@ public abstract class Constants { public static final String CACHE_KEY_STATICFILES_PREFIX = "GoC.Template.CacheKey"; - public static final String WEB_TEMPLATE_DISTRIBUTION_VERSION = "4.0.1"; + public static final String WEB_TEMPLATE_DISTRIBUTION_VERSION = "4.0.2"; - public static final String CDTS_DEFAULT_VERSION = "v5_0_0"; + public static final String CDTS_DEFAULT_VERSION = "v5_0_1"; public static final String STATIC_FALLBACK_FILES_INTERNAL_PATH = "/goc/webtemplate/StaticFallbackFiles"; diff --git a/gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/AbstractCoreBean.java b/gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/AbstractCoreBean.java index 363de8c..65913c5 100644 --- a/gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/AbstractCoreBean.java +++ b/gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/AbstractCoreBean.java @@ -508,7 +508,7 @@ public void setUseSRI(boolean value) { } /** - * Returns the version of the CDN files to use to build the page. (e.g v5_0_0) + * Returns the version of the CDN files to use to build the page. (e.g v5_0_1) * * Set at application level via "wettemplate_version" property in cdn.properties, * can be overriden programatically. @@ -529,7 +529,7 @@ public String getTemplateVersion() { } /** - * Sets the version of the CDN files to use to build the page. (e.g v5_0_0) + * Sets the version of the CDN files to use to build the page. (e.g v5_0_1) * * Set at application level via "wettemplate_version" property in cdn.properties, * can be overriden programatically. diff --git a/gocwebtemplate-core/gocwebtemplate-core-base/src/main/resources/goc/webtemplate/global/config/CDTSEnvironments.json b/gocwebtemplate-core/gocwebtemplate-core-base/src/main/resources/goc/webtemplate/global/config/CDTSEnvironments.json index bc94140..21c3b45 100644 --- a/gocwebtemplate-core/gocwebtemplate-core-base/src/main/resources/goc/webtemplate/global/config/CDTSEnvironments.json +++ b/gocwebtemplate-core/gocwebtemplate-core-base/src/main/resources/goc/webtemplate/global/config/CDTSEnvironments.json @@ -94,6 +94,24 @@ "cdts-eccc-styles.css": "sha512-VjD7joqLvOMRsDY0x+9zCkn/H9RQGHTbiYLGZtLJ+AU3KF9CysP9vI9igQgNxeVgkqagyTCHVBP2y0jDZnEozg==", "cdts-esdc-styles.css": "sha512-K10RfHMGrIcS+36XhwMqShTiifXP/cTrMN4y66HPJOeRipyaRtQvrK4VgmodS2QK2IJIyXWSwS8I85uA4MnoTA==", "cdts-labour-styles.css": "sha512-K10RfHMGrIcS+36XhwMqShTiifXP/cTrMN4y66HPJOeRipyaRtQvrK4VgmodS2QK2IJIyXWSwS8I85uA4MnoTA==" + }, + "gcweb/v5_0_1": { + "cdtsPath": "gcweb/v5_0_1/cdts/", + "compiled/wet-en.js": "sha512-B938eXEuH3R4A0e7+3EMdeqYV8QUCvdlPk3YqHQ4G0ga/puANt/Cw2+o6VwWwOTcitCK51K3UMHzD5IsWWhZjw==", + "compiled/wet-fr.js": "sha512-QHy0TkGpeFa26obDtm7sz7ky4xPJNrLN2CortiG5OomLhlZDtl4JMr8rBWpSS7QY9ThayWdhwOWsPPVsHbtQzA==", + "cdts-styles.css": "sha512-9XjF3MCbcyrmE5Xxp3JaLAQsYbSdIrwd8aJGafX6V7T8d7SrkAIrd6HFwsev0eAQrOMtDQ4pO65La3CrVHXo8w==", + "cdts-app-styles.css": "sha512-LdDduYGImuTiQIQCuQgOEttk+oe7wg5+rauqTbA/Qi1qTeZuvBcWcoqr5Nn1mHepDsboEadVW9HnHuMAOqJefA==", + "cdts-splash-styles.css": "sha512-Ux0hmX3uXA6WcF0i6+JHf0J3Z4HzzxDNyWdV+5mo1qakQwUBeDKMY+xcCcrWHySqStFvndhaJ5OqbIiqaADb9g==" + }, + "gcintranet/v5_0_1": { + "cdtsPath": "gcintranet/v5_0_1/cdts/", + "compiled/wet-en.js": "sha512-+S0fCsUQUYD9e+SWSoId240kegM/NRVHynrpZqk8hKGg4A134VcCmvNPFn8uOO/UQrTcfKhtZqoRT6y9Hn/jmQ==", + "compiled/wet-fr.js": "sha512-Lx8ZcYpAPb6V4B2VR5y6x5cJ480xxWsWLCHpb0RWugsrN0Td+uGc+LpNosSmXVzU/nt0GoeVQC9SEphYWL0lmQ==", + "cdts-styles.css": "sha512-dqrBeYZXK6RYeYmF7LSMsQ7efhL3Lalpi1P09QpwGXVBbuEB2lnqzhhVN1yPXTYN/5/4UeRlCf3SDtiXnk6sOQ==", + "cdts-splash-styles.css": "sha512-Ux0hmX3uXA6WcF0i6+JHf0J3Z4HzzxDNyWdV+5mo1qakQwUBeDKMY+xcCcrWHySqStFvndhaJ5OqbIiqaADb9g==", + "cdts-eccc-styles.css": "sha512-VjD7joqLvOMRsDY0x+9zCkn/H9RQGHTbiYLGZtLJ+AU3KF9CysP9vI9igQgNxeVgkqagyTCHVBP2y0jDZnEozg==", + "cdts-esdc-styles.css": "sha512-K10RfHMGrIcS+36XhwMqShTiifXP/cTrMN4y66HPJOeRipyaRtQvrK4VgmodS2QK2IJIyXWSwS8I85uA4MnoTA==", + "cdts-labour-styles.css": "sha512-K10RfHMGrIcS+36XhwMqShTiifXP/cTrMN4y66HPJOeRipyaRtQvrK4VgmodS2QK2IJIyXWSwS8I85uA4MnoTA==" } } } \ No newline at end of file diff --git a/gocwebtemplate-core/gocwebtemplate-core-base/src/test/resources/goc/webtemplate/global/config/cdn.properties b/gocwebtemplate-core/gocwebtemplate-core-base/src/test/resources/goc/webtemplate/global/config/cdn.properties index eb0210a..6c69559 100644 --- a/gocwebtemplate-core/gocwebtemplate-core-base/src/test/resources/goc/webtemplate/global/config/cdn.properties +++ b/gocwebtemplate-core/gocwebtemplate-core-base/src/test/resources/goc/webtemplate/global/config/cdn.properties @@ -23,7 +23,7 @@ cdn_localdev_localpath=/loadtesting/app/cls/WET/{0}/{1}/ #(blank values for theme, subtheme and version will use defaults from internal environment configuration) wettemplate_theme= wettemplate_subtheme= -wettemplate_version=v5_0_0 +wettemplate_version=v5_0_1 wettemplate_loadjqueryfromgoogle=false webtemplate_usehttps=true webtemplate_usesri=true diff --git a/gocwebtemplate-core/gocwebtemplate-core-jsp/pom.xml b/gocwebtemplate-core/gocwebtemplate-core-jsp/pom.xml index 6be9bab..cc6ade7 100644 --- a/gocwebtemplate-core/gocwebtemplate-core-jsp/pom.xml +++ b/gocwebtemplate-core/gocwebtemplate-core-jsp/pom.xml @@ -10,7 +10,7 @@ ca.gc.gocwebtemplate gocwebtemplate-core - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT .. diff --git a/gocwebtemplate-core/gocwebtemplate-core-jsp/src/test/resources/goc/webtemplate/global/config/cdn.properties b/gocwebtemplate-core/gocwebtemplate-core-jsp/src/test/resources/goc/webtemplate/global/config/cdn.properties index beab9a0..f4f5e0f 100644 --- a/gocwebtemplate-core/gocwebtemplate-core-jsp/src/test/resources/goc/webtemplate/global/config/cdn.properties +++ b/gocwebtemplate-core/gocwebtemplate-core-jsp/src/test/resources/goc/webtemplate/global/config/cdn.properties @@ -23,7 +23,7 @@ cdn_localdev_localpath=/GoCWebTemplateSampleJSP/loadtesting/app/cls/WET/{0}/{1}/ #(blank values for theme, subtheme and version will use defaults from internal environment configuration) wettemplate_theme= wettemplate_subtheme= -wettemplate_version=v5_0_0 +wettemplate_version=v5_0_1 wettemplate_loadjqueryfromgoogle=false webtemplate_usehttps=true webtemplate_usesri=true diff --git a/gocwebtemplate-core/gocwebtemplate-core-spring/pom.xml b/gocwebtemplate-core/gocwebtemplate-core-spring/pom.xml index a0dcc61..a3e73d6 100644 --- a/gocwebtemplate-core/gocwebtemplate-core-spring/pom.xml +++ b/gocwebtemplate-core/gocwebtemplate-core-spring/pom.xml @@ -10,7 +10,7 @@ ca.gc.gocwebtemplate gocwebtemplate-core - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT .. diff --git a/gocwebtemplate-core/pom.xml b/gocwebtemplate-core/pom.xml index cd77f9e..b9d9ef9 100644 --- a/gocwebtemplate-core/pom.xml +++ b/gocwebtemplate-core/pom.xml @@ -2,7 +2,7 @@ 4.0.0 ca.gc.gocwebtemplate gocwebtemplate-core - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT pom gocwebtemplate-core diff --git a/gocwebtemplate-sample-jsp/pom.xml b/gocwebtemplate-sample-jsp/pom.xml index a58f6a4..afe5508 100644 --- a/gocwebtemplate-sample-jsp/pom.xml +++ b/gocwebtemplate-sample-jsp/pom.xml @@ -3,7 +3,7 @@ ca.gc.gocwebtemplate gocwebtemplate-sample-jsp - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT war gocwebtemplate-sample-jsp @@ -14,7 +14,7 @@ GoCWebTemplateSampleJSP 1.8 - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT local yyyy/MM/dd HH:mm:ss diff --git a/gocwebtemplate-sample-spring/pom.xml b/gocwebtemplate-sample-spring/pom.xml index f7a8e0e..03492cd 100644 --- a/gocwebtemplate-sample-spring/pom.xml +++ b/gocwebtemplate-sample-spring/pom.xml @@ -3,7 +3,7 @@ ca.gc.gocwebtemplate gocwebtemplate-sample-spring - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT jar @@ -11,7 +11,7 @@ UTF-8 1.8 2.6.6 - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT local ${maven.build.timestamp} diff --git a/pom.xml b/pom.xml index 5e27c61..7ad3db2 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 ca.gc.gocwebtemplate gocwebtemplate - 4.0.1-SNAPSHOT + 4.0.2-SNAPSHOT pom gocwebtemplate