166 Commits

Author SHA1 Message Date
Brian Clozel
e44e0c8f1e Remove ErrorAttributes.ERROR_ATTRIBUTE
This commit removes the now defunkt `ErrorAttributes.ERROR_ATTRIBUTE`
that was introduce to register handled errors as metrics. This has been
replaced since 3.0 by a direct support in Spring Framework and had no
effect whatsoever since that release.

This also updates the documentation to point to the Framework mechanism
that replaced it.

Fixes gh-33731
2023-12-14 11:26:45 +01:00
Johnny Lim
f9f73aa146 Polish
See gh-38508
2023-11-23 09:39:01 +01:00
Johnny Lim
175b6473c7 Polish
See gh-38389
2023-11-22 10:16:19 +01:00
Moritz Halbritter
7e79d1f3c7 Merge branch '3.1.x'
Closes gh-38289
2023-11-10 11:25:38 +01:00
Moritz Halbritter
eaaf977331 Merge branch '3.0.x' into 3.1.x
Closes gh-38288
2023-11-10 11:19:27 +01:00
Moritz Halbritter
d29f7a88b4 Update Spring Framework links
Closes gh-36241
2023-11-10 10:47:54 +01:00
Phillip Webb
77218a644e Merge branch '3.1.x' 2023-11-02 14:16:37 -07:00
Phillip Webb
afa4d274c2 Merge branch '3.0.x' into 3.1.x 2023-11-02 14:14:19 -07:00
Phillip Webb
8d53caa1c6 Merge branch '2.7.x' into 3.0.x 2023-11-02 14:13:47 -07:00
Phillip Webb
e891a3e24c Polish adoc formatting 2023-11-02 14:12:56 -07:00
Andy Wilkinson
e2444f196f Merge branch '3.1.x'
Closes gh-38035
2023-10-25 14:41:24 +01:00
Andy Wilkinson
b934e2edb5 Merge branch '3.0.x' into 3.1.x
Closes gh-38034
2023-10-25 14:41:12 +01:00
Andy Wilkinson
5bd9b1725a Merge branch '2.7.x' into 3.0.x
Closes gh-38033
2023-10-25 14:41:00 +01:00
Andy Wilkinson
ea39a33337 Document server.servlet.encoding.* configuration properties
Closes gh-32472
2023-10-25 14:40:29 +01:00
Andy Wilkinson
fb1912149e Merge branch '3.1.x'
Closes gh-38028
2023-10-25 12:24:55 +01:00
Andy Wilkinson
581dfbfa33 Merge branch '3.0.x' into 3.1.x
Closes gh-38027
2023-10-25 12:24:42 +01:00
Andy Wilkinson
5b80dd87d3 Merge branch '2.7.x' into 3.0.x
Closes gh-38026
2023-10-25 12:18:41 +01:00
Andy Wilkinson
9a23e13894 Add some documentation for customizing the reactive web server
Closes gh-31917
2023-10-25 12:17:45 +01:00
Andy Wilkinson
edca4901dc Merge branch '3.1.x'
Closes gh-38022
2023-10-25 11:03:36 +01:00
Andy Wilkinson
56d31d47f1 Merge branch '3.0.x' into 3.1.x
Closes gh-38021
2023-10-25 11:03:24 +01:00
Andy Wilkinson
e742321dbb Merge branch '2.7.x' into 3.0.x
Closes gh-38020
2023-10-25 11:02:26 +01:00
Andy Wilkinson
fcdc638336 Mention what to do when use-hal-as-default-json-media-type is false
Closes gh-26814
2023-10-25 11:01:28 +01:00
Andy Wilkinson
4f7e4712dd Merge branch '3.1.x'
Closes gh-38019
2023-10-25 10:45:07 +01:00
Andy Wilkinson
4faabcfcdd Merge branch '3.0.x' into 3.1.x
Closes gh-38018
2023-10-25 10:44:38 +01:00
Andy Wilkinson
b33ee84146 Merge branch '2.7.x' into 3.0.x
Closes gh-38017
2023-10-25 10:44:03 +01:00
Andy Wilkinson
8778884f5d Clarify role of WebMvcRegistrations and WebMvcConfigurer
Closes gh-31232
2023-10-25 10:42:25 +01:00
Moritz Halbritter
4c3de96d74 Fix links to Antora based JavaDoc and reference documentation
This introduces two different attributes for, e.g. the Spring Framework
version: the "normal" one, e.g. 6.1.0-SNAPSHOT, and the Antora one,
e.g. 6.1.

Spring Framework's reference documentation is still broken when using
SNAPSHOT versions, see spring-framework/gh-31480.

See gh-38000
2023-10-24 10:31:26 +02:00
Andy Wilkinson
bdaf7a7603 Merge branch '3.1.x'
Closes gh-37830
2023-10-11 15:06:09 +01:00
Andy Wilkinson
411586347c Merge branch '3.0.x' into 3.1.x
Closes gh-37829
2023-10-11 15:04:21 +01:00
Andy Wilkinson
781ac2ece2 Merge branch '2.7.x' into 3.0.x
Closes gh-37828
2023-10-11 15:02:36 +01:00
Johnny Lim
303015ea2d Polish
See gh-37745
2023-10-11 14:57:38 +01:00
Andy Wilkinson
ecc670772a Make user details service auto-configs back off more readily
Previously auto-configuration of a user details service (imperative
or reactive) would only back off on the presence of certain beans.
This led to situations where the im-memory service was
auto-configured and the default password was logged even though
another authentication mechanism was in use.

This commit updates the auto-configuration so that it backs off
when depending on Spring Security's OAuth2 Client and OAuth2
Resource Server modules. In the imperative case it will also back
off when depending on the SAML 2 provider.

Closes gh-35338
2023-09-26 16:47:19 +01:00
Brian Clozel
c8d036eaa8 Remove ServerHttpObservationFilter from WebFlux
This commit removes the auto-configuration of the
`ServerHttpObservationFilter` bean for WebFlux applications as it's been
deprecated by Spring Framework.

The Observability instrumentation is now handled at the
`WebHttpHandlerBuilder` in Framework directly and doesn't need any
auto-configuration from Spring Boot.

Closes gh-37344
2023-09-12 10:59:25 +02:00
Brian Clozel
0d902c1323 Document Welcome Page support ordering
This commit documents the relative ordering of `HandlerMapping` support
in Spring MVC and WebFlux applications.
As of Spring Framework 6.1.0, the Welcome Page support acts as a
fallback in case no index route has been defined by the application as a
`RouterFunction` or within an annotated `@Controller`.

Closes gh-34846
2023-09-11 15:04:43 +02:00
Andy Wilkinson
8c8aa19691 Merge branch '3.0.x' into 3.1.x
Closes gh-36797
2023-08-08 12:57:12 +01:00
Andy Wilkinson
355012d40b Merge branch '2.7.x' into 3.0.x
Closes gh-36796
2023-08-08 12:57:00 +01:00
Andy Wilkinson
b978950cb2 Clarify the effect of @EnableWebMvc
Closes gh-36506
2023-08-08 12:56:24 +01:00
Andy Wilkinson
930824a566 Merge branch '3.0.x' into 3.1.x
Closes gh-36793
2023-08-08 12:52:26 +01:00
Andy Wilkinson
4b8a848ecf Merge branch '2.7.x' into 3.0.x
Closes gh-36792
2023-08-08 12:52:14 +01:00
Andy Wilkinson
8dec443e3b Document default for MVC and WebFlux date and time formatting
Closes gh-30041
2023-08-08 12:51:29 +01:00
Andy Wilkinson
f0343df9c5 Merge branch '3.0.x' into 3.1.x
Closes gh-36789
2023-08-08 12:01:25 +01:00
Andy Wilkinson
406e934325 Merge branch '2.7.x' into 3.0.x
Closes gh-36788
2023-08-08 12:01:10 +01:00
Andy Wilkinson
e7203e31c8 Correct documentation of default path matching strategy
Closes gh-32557
2023-08-08 11:48:04 +01:00
Johnny Lim
06157837e5
Polish
See gh-35872
2023-06-16 12:39:03 -07:00
Moritz Halbritter
0cf93f1aa4 Merge branch '3.0.x'
Closes gh-35767
2023-06-07 09:08:54 +02:00
Steve Riesenberg
ba9f92fa86 Improve OAuth2 Client section of docs
* Add an OpenID Connect login client example
* Update redirect-uri examples to match Security docs and not require
  any customization
* Update client-authentication-method for Spring Security 6 usage
* Update provider configuration example to align with Spring
  Authorization Server
* Format Java DSL according to Spring Security docs
* Use Kotlin DSL
* Update redirection endpoint base uri example to use ant pattern

See gh-35679
2023-06-07 09:07:14 +02:00
Andy Wilkinson
6a74f63143 Merge branch '3.0.x'
Closes gh-35634
2023-05-25 14:20:17 +01:00
Andy Wilkinson
a9f89a1e3c Merge branch '2.7.x' into 3.0.x
Closes gh-35633
2023-05-25 14:19:58 +01:00
Andy Wilkinson
f452a86175 Polish "Document audience support in Oauth2 resource server"
See gh-35286
2023-05-25 14:11:44 +01:00
Bikash Adhikari
13c5c6efb1 Document audience support in Oauth2 resource server
See gh-35286
2023-05-25 14:11:27 +01:00