diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java index de6fd3be4e6..c6ba02b5175 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 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. @@ -37,8 +37,8 @@ import org.springframework.web.server.ServerWebExchange; * *

This also resolves resources for version agnostic HTTP requests {@code "GET /jquery/jquery.min.js"}. * - *

This resolver requires the "org.webjars:webjars-locator" library on classpath, - * and is automatically registered if that library is present. + *

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 diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java index 1045ded59f7..546d44ca8ed 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 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; * *

This also resolves resources for version agnostic HTTP requests {@code "GET /jquery/jquery.min.js"}. * - *

This resolver requires the "org.webjars:webjars-locator" library on classpath, - * and is automatically registered if that library is present. + *

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 diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc index c4527e8f919..6c029c9417a 100644 --- a/src/docs/asciidoc/web/webflux.adoc +++ b/src/docs/asciidoc/web/webflux.adoc @@ -3035,11 +3035,12 @@ Note that when using both `GzipResourceResolver` and `VersionedResourceResolver` 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 via `WebJarsResourceResolver` -and 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 -- e.g. `"/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`. diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc index a37aea7d925..67e22103aed 100644 --- a/src/docs/asciidoc/web/webmvc.adoc +++ b/src/docs/asciidoc/web/webmvc.adoc @@ -4508,11 +4508,12 @@ bean so it can be injected into others. You can also make the rewrite transparen `ResourceUrlEncodingFilter` for Thymeleaf, JSPs, FreeMarker, and others with URL tags that rely on `HttpServletResponse#encodeURL`. -http://www.webjars.org/documentation[WebJars] is also supported via `WebJarsResourceResolver` -and 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 -- e.g. `"/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`.