From 4da4a4d385ec5851b0a6968312e73d6ba9c0b1ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Kolo=C5=A1njaji?= Date: Tue, 20 Feb 2018 13:11:22 +0100 Subject: [PATCH 1/2] Update documentation to reference webjars-locator-core See gh-12135 --- .../autoconfigure/web/ConditionalOnEnabledResourceChain.java | 2 +- .../src/main/asciidoc/spring-boot-features.adoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChain.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChain.java index 68690dcb042..fc01bb2ab3e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChain.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChain.java @@ -27,7 +27,7 @@ import org.springframework.context.annotation.Conditional; /** * {@link Conditional} that checks whether or not the Spring resource handling chain is * enabled. Matches if {@link ResourceProperties.Chain#getEnabled()} is {@code true} or if - * {@code webjars-locator} is on the classpath. + * {@code webjars-locator-core} is on the classpath. * * @author Stephane Nicoll * @since 1.3.0 diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 50439f7ef2e..5f1b37869b2 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -1988,13 +1988,13 @@ Spring Boot also supports the advanced resource handling features provided by Sp allowing use cases such as cache-busting static resources or using version agnostic URLs for Webjars. -To use version agnostic URLs for Webjars, add the `webjars-locator` dependency. +To use version agnostic URLs for Webjars, add the `webjars-locator-core` dependency. Then declare your Webjar. Using jQuery as an example, adding `"/webjars/jquery/dist/jquery.min.js"` results in `"/webjars/jquery/x.y.z/dist/jquery.min.js"`. where `x.y.z` is the Webjar version. NOTE: If you use JBoss, you need to declare the `webjars-locator-jboss-vfs` -dependency instead of the `webjars-locator`. Otherwise, all Webjars resolve as a `404`. +dependency instead of the `webjars-locator-core`. Otherwise, all Webjars resolve as a `404`. To use cache busting, the following configuration configures a cache busting solution for all static resources, effectively adding a content hash, such as From 6f59dd6b175a604c612c8b0eae6d94908cf98613 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 20 Feb 2018 16:37:34 +0100 Subject: [PATCH 2/2] Polish "Update documentation to reference webjars-locator-core" Closes gh-12135 --- .../autoconfigure/web/ConditionalOnEnabledResourceChain.java | 2 +- .../src/main/asciidoc/spring-boot-features.adoc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChain.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChain.java index fc01bb2ab3e..9f6406e5a9c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChain.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChain.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 5f1b37869b2..2771e9999b6 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -1994,7 +1994,8 @@ Then declare your Webjar. Using jQuery as an example, adding `"/webjars/jquery/x.y.z/dist/jquery.min.js"`. where `x.y.z` is the Webjar version. NOTE: If you use JBoss, you need to declare the `webjars-locator-jboss-vfs` -dependency instead of the `webjars-locator-core`. Otherwise, all Webjars resolve as a `404`. +dependency instead of the `webjars-locator-core`. Otherwise, all Webjars resolve as a +`404`. To use cache busting, the following configuration configures a cache busting solution for all static resources, effectively adding a content hash, such as