Merge branch '5.1.x'

spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -36,8 +36,8 @@ import org.springframework.web.server.ServerWebExchange;
  *
  * <p>This also resolves resources for version agnostic HTTP requests {@code "GET /jquery/jquery.min.js"}.
  *
- * <p>This resolver requires the "org.webjars:webjars-locator" library on classpath,
- * and is automatically registered if that library is present.
+ * <p>This resolver requires the {@code org.webjars:webjars-locator-core} library
+ * on the classpath and is automatically registered if that library is present.
  *
  * @author Rossen Stoyanchev
  * @author Brian Clozel

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -35,8 +35,8 @@ import org.springframework.lang.Nullable;
  *
  * <p>This also resolves resources for version agnostic HTTP requests {@code "GET /jquery/jquery.min.js"}.
  *
- * <p>This resolver requires the "org.webjars:webjars-locator" library on classpath,
- * and is automatically registered if that library is present.
+ * <p>This resolver requires the {@code org.webjars:webjars-locator-core} library
+ * on the classpath and is automatically registered if that library is present.
  *
  * @author Brian Clozel
  * @since 4.2

src/docs/asciidoc/web/webflux.adoc

@@ -3216,11 +3216,12 @@ Note that, when using both `EncodedResourceResolver` (for example, Gzip, Brotli
 `VersionedResourceResolver`, they must be registered in that order, to ensure content-based
 versions are always computed reliably based on the unencoded file.
 
-http://www.webjars.org/documentation[WebJars] is also supported through `WebJarsResourceResolver`
-and is automatically registered when `org.webjars:webjars-locator` is present on the
-classpath. The resolver can re-write URLs to include the version of the jar and can also
-match to incoming URLs without versions (for example, `/jquery/jquery.min.js` to
-`/jquery/1.2.0/jquery.min.js`).
+http://www.webjars.org/documentation[WebJars] are also supported through the
+`WebJarsResourceResolver` which is automatically registered when the
+`org.webjars:webjars-locator-core` library is present on the classpath. The resolver can
+re-write URLs to include the version of the jar and can also match against incoming URLs
+without versions -- for example, from `/jquery/jquery.min.js` to
+`/jquery/1.2.0/jquery.min.js`.
 
 
 

src/docs/asciidoc/web/webmvc.adoc

@@ -4560,10 +4560,11 @@ Note that, when using both `EncodedResourceResolver` (for example, for serving g
 brotli-encoded resources) and `VersionedResourceResolver`, you must register them in this order.
 That ensures content-based versions are always computed reliably, based on the unencoded file.
 
-http://www.webjars.org/documentation[WebJars] is also supported through `WebJarsResourceResolver`
-and is automatically registered when `org.webjars:webjars-locator` is present on the
-classpath. The resolver can re-write URLs to include the version of the jar and can also
-match to incoming URLs without versions -- for example, `/jquery/jquery.min.js` to
+http://www.webjars.org/documentation[WebJars] are also supported through the
+`WebJarsResourceResolver` which is automatically registered when the
+`org.webjars:webjars-locator-core` library is present on the classpath. The resolver can
+re-write URLs to include the version of the jar and can also match against incoming URLs
+without versions -- for example, from `/jquery/jquery.min.js` to
 `/jquery/1.2.0/jquery.min.js`.