Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,592 Commits 23 Branches 0 Tags
09dc4e5ce3e27abd68f7ccc81009b6838593054c
Commit Graph

35592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Bhave
09dc4e5ce3 Merge branch '2.5.x' into 2.6.x 
Closes gh-30113
Closes gh-30114
 2022-03-08 22:01:26 -08:00
Madhura Bhave
ef7d7487fa Document when config data properties are invalid 
This commit also reinstates documentation for
`spring.profiles.include`

Closes gh-25849
Closes gh-28451
 2022-03-08 21:58:43 -08:00
Madhura Bhave
b86ad89523 Merge branch '2.5.x' into 2.6.x 
Closes gh-30111
 2022-03-08 18:13:01 -08:00
Madhura Bhave
7d63faac7c Document the scalar types supported by MapBinder 
Closes gh-27581
 2022-03-08 18:12:21 -08:00
Madhura Bhave
9c437c6cd9 Merge branch '2.5.x' into 2.6.x 
Closes gh-30109
 2022-03-08 17:40:52 -08:00
Madhura Bhave
d240e293db Document how to obtain ServletContext with an embedded container setup 
Closes gh-24561
 2022-03-08 17:34:35 -08:00
Andy Wilkinson
5b2cc74f71 Merge branch '2.5.x' into 2.6.x 
Closes gh-30100
 2022-03-08 14:09:35 +00:00
Andy Wilkinson
708e57eafb Register metrics for wrapped R2DBC ConnectionPools 
Closes gh-30090
 2022-03-08 13:55:34 +00:00
Andy Wilkinson
119a713f09 Merge branch '2.5.x' into 2.6.x 
Closes gh-30098
 2022-03-08 13:52:25 +00:00
Andy Wilkinson
e7705f4f71 Improve condition message produced by @ConditionalOnSingleCandidate 
Closes gh-30073
 2022-03-08 13:51:38 +00:00
Madhura Bhave
d131003456 Merge branch '2.5.x' into 2.6.x 
Closes gh-30093
 2022-03-07 21:53:44 -08:00
Madhura Bhave
480ccc6175 Clarify devtools documentation when using with build plugins 
Closes gh-17851
 2022-03-07 21:52:43 -08:00
Madhura Bhave
27bf068091 Merge branch '2.5.x' into 2.6.x 2022-03-07 20:22:42 -08:00
Madhura Bhave
9b073c825b Fix checkstyle 2022-03-07 20:22:27 -08:00
Madhura Bhave
ac04be75f8 Merge branch '2.5.x' into 2.6.x 
Closes gh-30091
 2022-03-07 18:23:19 -08:00
Madhura Bhave
ed8f8d59ef Document how to structure configurations for efficient slice tests 
Closes gh-16088
 2022-03-07 18:21:12 -08:00
Andy Wilkinson
344f71c75a Merge branch '2.5.x' into 2.6.x 
Closes gh-30087
 2022-03-07 14:57:20 +00:00
Andy Wilkinson
4bcb7e2f77 Prevent ActiveProfilesTests from binding to 8080 
Due to gh-29695, smoketest.profile.ActiveProfilesTests starts a web
server bound to the default port (8080) despite the test setting
`webEnvironment` to `NONE`.

This commit works around the problem by running the tests with
server.port set to zero.

Closes gh-30086
 2022-03-07 14:55:00 +00:00
Moritz Halbritter
e980a53399 Merge branch '2.5.x' into 2.6.x 2022-03-07 14:11:11 +01:00
Moritz Halbritter
f3eb90046f Remove @Repeatable support for @DisabledOnOs 
We'll add it back again when we need it, and delay the naming issue.

See gh-30082
 2022-03-07 14:10:13 +01:00
Moritz Halbritter
564555347f Merge branch '2.5.x' into 2.6.x 
Closes gh-30083
 2022-03-07 13:22:34 +01:00
Moritz Halbritter
be38311c5d Disable incompatible tests on Linux AArch64 
- Adds a new @DisableOnOs annotation, which is inspired from JUnit5s
  @DisableOnOs annotation. This new annotation supports the architecture
  and is repeatable

Closes gh-30082
 2022-03-07 13:22:17 +01:00
Stephane Nicoll
c6a9e138e5 Merge branch '2.5.x' into 2.6.x 
Closes gh-30080
 2022-03-07 09:49:00 +01:00
Stephane Nicoll
089ea17423 Merge pull request #30074 from hak7a3 
* pr/30074:
  Update copyright year of change file
  Fix references to spring.data.cassandra.connection.connect-timeout

Closes gh-30074
 2022-03-07 09:48:50 +01:00
Stephane Nicoll
cf9cc82025 Update copyright year of change file 
See gh-30074
 2022-03-07 09:47:12 +01:00
hak7a3
0a035c7fa6 Fix references to spring.data.cassandra.connection.connect-timeout 
See gh-30074
 2022-03-07 09:42:43 +01:00
Andy Wilkinson
2ef055a823 Merge branch '2.5.x' into 2.6.x 
Closes gh-30070
 2022-03-04 17:56:14 +00:00
Andy Wilkinson
1872af056e Make it clearer that the generated password is not for production use 
Closes gh-30061
 2022-03-04 17:55:54 +00:00
Andy Wilkinson
52c49cc4ea Merge pull request #30065 from cmabdullah 
* gh-30065:
  Polish "Clarify actuator security documentation"
  Clarify actuator security documentation

Closes gh-30065
 2022-03-04 17:20:37 +00:00
Andy Wilkinson
c872539dea Polish "Clarify actuator security documentation" 
See gh-30065
 2022-03-04 17:20:25 +00:00
Khan, C M Abdullah
5b7c21e780 Clarify actuator security documentation 
See gh-30065
 2022-03-04 17:20:17 +00:00
Andy Wilkinson
fd3248b629 Merge branch '2.5.x' into 2.6.x 
Closes gh-30059
 2022-03-03 20:39:10 +00:00
Andy Wilkinson
2b98fce639 Merge pull request #30000 from larsgrefer 
* gh-30000:
  Use Gradle's configuration avoidance APIs in the reference docs

Closes gh-30000
 2022-03-03 20:39:04 +00:00
Lars Grefer
99a8374249 Use Gradle's configuration avoidance APIs in the reference docs 
See gh-30000
 2022-03-03 20:38:35 +00:00
Andy Wilkinson
2ba8b490a0 Merge branch '2.5.x' into 2.6.x 
Closes gh-30057
 2022-03-03 20:34:34 +00:00
Andy Wilkinson
e7566e968e Use configuration avoidance APIs in Gradle plugin's docs 
Closes gh-30056
 2022-03-03 20:27:46 +00:00
Andy Wilkinson
1f2da6a341 Document SanitizingFunction 
Closes gh-29950
 2022-03-03 14:17:28 +00:00
Andy Wilkinson
d63e609fda Merge branch '2.5.x' into 2.6.x 
Closes gh-30050
 2022-03-03 12:08:11 +00:00
Andy Wilkinson
58e2adb895 Merge pull request #30012 from 62mkv 
* gh-30012:
  Polish "Update placeholder docs to mention env vars and default values"
  Update placeholder docs to mention env vars and default values

Closes gh-30012
 2022-03-03 12:07:56 +00:00
Andy Wilkinson
7dce772d67 Polish "Update placeholder docs to mention env vars and default values" 
See gh-30012
 2022-03-03 12:07:38 +00:00
Kirill Marchuk
2644a2b897 Update placeholder docs to mention env vars and default values 
See gh-30012
 2022-03-03 11:48:50 +00:00
Andy Wilkinson
d11c5d3bd2 Merge branch '2.5.x' into 2.6.x 
Closes gh-30048
 2022-03-03 11:27:18 +00:00
Andy Wilkinson
ef927627de Merge pull request #30027 from wonwoo 
* gh-30027:
  Polish RestController examples

Closes gh-30027
 2022-03-03 11:27:11 +00:00
wonwoo
c2bf0d551b Polish RestController examples 
See gh-30027
 2022-03-03 11:26:11 +00:00
Andy Wilkinson
97222236fe Merge branch '2.5.x' into 2.6.x 
Closes gh-30046
 2022-03-03 11:05:27 +00:00
Andy Wilkinson
57f935faed Use a more relaxed AliasCheck for CI on Windows 
ContextHandler.ApproveAliases has been deprecated. We tried to
replace it with AllowedResourceAliasChecker but it does not
behave in the same way and causes CI failures on Windows.
ContextHandler.ApproveAliases always returns true so we should
hardcode our own implementation that does the same.

Closes gh-30045
 2022-03-03 11:01:48 +00:00
Andy Wilkinson
71dd607623 Merge branch '2.5.x' into 2.6.x 
Closes gh-30043
 2022-03-03 10:33:40 +00:00
Andy Wilkinson
34e436ef6e Accommodate SocketException when reading from stopped TunnelClient 
TunnelClientTests stopTriggersTunnelClose expects that stopping the
client will cause an attempt to read from a connected channel to
return -1. With Java 17 on Windows the connection has been reset and
a SocketException is thrown instead. This seems reasonable as
stopping the client closes the ServerSocketChannel to which the test
was connected.

This commit updates test to expect a SocketException or a return
value of -1.

Closes gh-30042
 2022-03-03 10:30:54 +00:00
Andy Wilkinson
0ca64d3b64 Merge branch '2.5.x' into 2.6.x 
Closes gh-30038
 2022-03-02 15:56:04 +00:00
Andy Wilkinson
35e5b4329e Provide complete dependency management for Netty tcNative 
Closes gh-30010
 2022-03-02 15:55:15 +00:00