Skip to content

Commit 83ba091

Browse files
bodom91php-coder
authored andcommitted
Use versioned URLs for JS/CSS resources of external libraries.
Fix #455 No functional changes.
1 parent 0d04e8a commit 83ba091

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@
340340
</parent>
341341

342342
<properties>
343-
<!-- Don't forget to update version in MvcConfig and Url classes -->
343+
<!-- Don't forget to update version in the Url class -->
344344
<bootstrap.version>3.3.6</bootstrap.version>
345345

346346
<cglib.version>2.2.2</cglib.version>
@@ -388,7 +388,7 @@
388388
<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
389389
<jetty.version>9.2.18.v20160721</jetty.version>
390390

391-
<!-- Don't forget to update version in MvcConfig and Url classes -->
391+
<!-- Don't forget to update version in the Url class -->
392392
<jquery.version>1.9.1</jquery.version>
393393

394394
<license.plugin.version>1.9.0</license.plugin.version>
@@ -406,7 +406,7 @@
406406
<pmd.plugin.version>3.6</pmd.plugin.version>
407407
<resources.plugin.version>2.7</resources.plugin.version>
408408

409-
<!-- Don't forget to update version in MvcConfig and Url classes -->
409+
<!-- Don't forget to update version in the Url class -->
410410
<selectizejs.version>0.12.1</selectizejs.version>
411411

412412
<selenium.htmlunit.version>2.20</selenium.htmlunit.version>

src/main/java/ru/mystamps/web/Url.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ public final class Url {
8787
public static final String SERIES_ADD_JS = "/public/js/series/add.min.js";
8888
public static final String COLLECTION_INFO_JS = "/public/js/collection/info.min.js";
8989

90-
public static final String BOOTSTRAP_CSS = "/public/bootstrap/css/bootstrap.min.css";
91-
public static final String BOOTSTRAP_JS = "/public/bootstrap/js/bootstrap.min.js";
92-
public static final String JQUERY_JS = "/public/jquery/jquery.min.js";
93-
// CheckStyle: ignore LineLength for next 1 lines
90+
// CheckStyle: ignore LineLength for next 4 lines
91+
public static final String BOOTSTRAP_CSS = "/public/bootstrap/3.3.6/css/bootstrap.min.css";
92+
public static final String BOOTSTRAP_JS = "/public/bootstrap/3.3.6/js/bootstrap.min.js";
93+
public static final String JQUERY_JS = "/public/jquery/1.9.1/jquery.min.js";
9494
public static final String BOOTSTRAP_LANGUAGE = "https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css";
9595

9696
// CheckStyle: ignore LineLength for next 3 lines
9797
// TODO: use minimal version of CSS file when it will be available (https://github.com/webjars/selectize.js/issues/3)
98-
public static final String SELECTIZE_CSS = "/public/selectize/css/selectize.bootstrap3.css";
99-
public static final String SELECTIZE_JS = "/public/selectize/js/standalone/selectize.min.js";
98+
public static final String SELECTIZE_CSS = "/public/selectize/0.12.1/css/selectize.bootstrap3.css";
99+
public static final String SELECTIZE_JS = "/public/selectize/0.12.1/js/standalone/selectize.min.js";
100100

101101
// see also pom.xml and ru.mystamps.web.config.MvcConfig#addResourceHandlers()
102102
// CheckStyle: ignore LineLength for next 5 lines

src/main/java/ru/mystamps/web/config/MvcConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
8484

8585
// For WebJars:
8686
registry.addResourceHandler("/public/bootstrap/**")
87-
.addResourceLocations("classpath:/META-INF/resources/webjars/bootstrap/3.3.6/");
87+
.addResourceLocations("classpath:/META-INF/resources/webjars/bootstrap/");
8888
registry.addResourceHandler("/public/jquery/**")
89-
.addResourceLocations("classpath:/META-INF/resources/webjars/jquery/1.9.1/");
89+
.addResourceLocations("classpath:/META-INF/resources/webjars/jquery/");
9090
registry.addResourceHandler("/public/selectize/**")
91-
.addResourceLocations("classpath:/META-INF/resources/webjars/selectize.js/0.12.1/");
91+
.addResourceLocations("classpath:/META-INF/resources/webjars/selectize.js/");
9292
}
9393

9494
@Override

0 commit comments

Comments
 (0)