Merge pull request #171 from devgateway/fix/#168/remove-cdn-resources

#168 Remove all CDN resources from wicket-bootsrap and use webjars instead
devgateway · May 27, 2017 · 5b703e7 · 5b703e7
2 parents d9a8780 + bc951aa
commit 5b703e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/forms/pom.xml b/forms/pom.xml
@@ -30,7 +30,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <wicket.version>7.7.0</wicket.version>
-        <wicket.bootstrap.version>0.10.12</wicket.bootstrap.version>
+        <wicket.bootstrap.version>0.10.14</wicket.bootstrap.version>
         <zt.zip.version>1.11</zt.zip.version>
         <wicket.webjars.version>0.5.5</wicket.webjars.version>
         <closure.compiler.version>v20160822</closure.compiler.version>

diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/FormsWebApplication.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/FormsWebApplication.java
@@ -140,7 +140,7 @@ private void configureBootstrap() {
         // The boostrap.css file is loaded as dependency in MainCss Instance
         // settings.setCssResourceReference(EmptyCss.INSTANCE);
 
-        settings.useCdnResources(true);
+        settings.useCdnResources(false);
 
         // use the default bootstrap theme
         Bootstrap.install(this, settings);