Merge pull request #14 from wet-boew/11-update-static-fallback-files

Updating static fallback files

Author: plup2

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 [Download and/or Installation instructions](https://github.com/wet-boew/cdts-JavaTemplates/wiki/Installation)
 
+## v2.6.0
+
+- [CDTS](https://github.com/wet-boew/cdts-sgdc/) v4.0.47 & [wet-boew](https://github.com/wet-boew/wet-boew) v4.0.56.5
+- Updated static fallback files
+- Bug Fixes
+
 ## v2.5.1
 
 - Minor refactoring: Functions now take parameters (and return value) using interfaces `java.util.List` and `java.util.Map` instead of concrete classes `java.util.ArrayList` and `java.util.HashMap` for more flexibility.

builds/build.properties

@@ -3,4 +3,4 @@
 #
 # DO NOT EDIT build.properties DIRECTLY!
 #
-gocwebtemplate.build.version=2.5.1-SNAPSHOT
+gocwebtemplate.build.version=2.6.0-SNAPSHOT

gocwebtemplate-core/gocwebtemplate-core-base/pom.xml

@@ -10,7 +10,7 @@
   <parent>
     <groupId>ca.gc.gocwebtemplate</groupId>
     <artifactId>gocwebtemplate-core</artifactId>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.6.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

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 = "2.5.1";
+    public static final String WEB_TEMPLATE_DISTRIBUTION_VERSION = "2.6.0";
 
-    public static final String CDTS_DEFAULT_VERSION = "v4_0_46";
+    public static final String CDTS_DEFAULT_VERSION = "v4_0_47";
 
     public static final String STATIC_FALLBACK_FILES_INTERNAL_PATH = "/goc/webtemplate/StaticFallbackFiles";
 

gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/AbstractCoreBean.java

@@ -459,7 +459,7 @@ public void setUseHttps(boolean value) {
     }
 
     /**
-     * Returns the version of the CDN files to use to build the page. (e.g v4_0_46)
+     * Returns the version of the CDN files to use to build the page. (e.g v4_0_47)
      * 
      * Set at application level via "wettemplate_version" property in cdn.properties, 
      * can be overriden programatically.  
@@ -480,7 +480,7 @@ public String getTemplateVersion() {
     }
 
     /**
-     * Sets the version of the CDN files to use to build the page. (e.g v4_0_46)
+     * Sets the version of the CDN files to use to build the page. (e.g v4_0_47)
      * 
      * Set at application level via "wettemplate_version" property in cdn.properties, 
      * can be overriden programatically.  

gocwebtemplate-core/gocwebtemplate-core-base/src/test/resources/goc/webtemplate/global/config/cdn.properties

@@ -29,7 +29,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=v4_0_46
+wettemplate_version=v4_0_47
 wettemplate_loadjqueryfromgoogle=false
 webtemplate_usehttps=true
 #

gocwebtemplate-core/gocwebtemplate-core-jsp/pom.xml

@@ -10,7 +10,7 @@
   <parent>
     <groupId>ca.gc.gocwebtemplate</groupId>
     <artifactId>gocwebtemplate-core</artifactId>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.6.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

gocwebtemplate-core/gocwebtemplate-core-jsp/src/test/resources/goc/webtemplate/global/config/cdn.properties

@@ -29,7 +29,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=v4_0_46
+wettemplate_version=v4_0_47
 wettemplate_loadjqueryfromgoogle=false
 webtemplate_usehttps=true
 #

gocwebtemplate-core/gocwebtemplate-core-spring/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>ca.gc.gocwebtemplate</groupId>
 		<artifactId>gocwebtemplate-core</artifactId>
-		<version>2.5.1-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 

gocwebtemplate-core/gocwebtemplate-core-spring/src/main/resources/goc/webtemplate/StaticFallbackFiles/gcintranet/appFooter-en.html

@@ -3,13 +3,13 @@
 <div class="container">
 <div class="row">
 <div class="col-xs-12 col-md-8">
-<a href="https://www.canada.ca/en.html"><img src="https://cdts.service.canada.ca/app/cls/WET/gcintranet/v4_0_46/wet-boew/assets/sig-blk-en.svg" alt=""><span class="wb-inv">Government of Canada</span></a>
+<a href="https://www.canada.ca/en.html"><img src="https://cdts.service.canada.ca/app/cls/WET/gcintranet/v4_0_47/wet-boew/assets/sig-blk-en.svg" alt=""><span class="wb-inv">Government of Canada</span></a>
 </div>
 <div class="col-xs-6 visible-sm visible-xs tofpg">
 <a href="#wb-cont">Top of Page<span class="glyphicon glyphicon-chevron-up"></span></a>
 </div>
 <div class="col-xs-6 col-md-4 text-right">
-<img src="https://cdts.service.canada.ca/app/cls/WET/gcintranet/v4_0_46/wet-boew/assets/wmms-blk.svg" alt="Symbol of the Government of Canada">
+<img src="https://cdts.service.canada.ca/app/cls/WET/gcintranet/v4_0_47/wet-boew/assets/wmms-blk.svg" alt="Symbol of the Government of Canada">
 </div>
 </div>
 </div>