Madhura Bhave
88bd0fa794
Merge branch '2.6.x' into 2.7.x
2022-03-07 20:22:57 -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
b80047c451
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30092
2022-03-07 18:23:36 -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
Moritz Halbritter
d95dc75de9
Merge branch '2.6.x' into 2.7.x
2022-03-07 14:11:22 +01: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
50d766020c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30084
2022-03-07 13:22:53 +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
ce4f7ded8a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30081
2022-03-07 09:49:10 +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
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
f44e7d9391
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30071
2022-03-04 17:56:29 +00: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
bc62775116
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30069
2022-03-04 17:27:17 +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
d47b56a40e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30060
2022-03-03 20:39:21 +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
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
4459fb46be
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30058
2022-03-03 20:34:46 +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
4846be9506
Align with latest repackaging of CacheMeterBinder in Micrometer
...
See gh-30014
2022-03-03 15:44:12 +00:00
Andy Wilkinson
ff7321cc5a
Polish "Support overriding the default SanitizingFunction"
...
See gh-30006
2022-03-03 14:24:51 +00:00
Guirong Hu
fb9112c891
Support overriding the default SanitizingFunction
...
See gh-30006
2022-03-03 14:19:14 +00:00
Andy Wilkinson
a5d900d0af
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30054
2022-03-03 14:18:30 +00:00
Andy Wilkinson
1f2da6a341
Document SanitizingFunction
...
Closes gh-29950
2022-03-03 14:17:28 +00:00
Andy Wilkinson
f4e2d7669b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30051
2022-03-03 12:08:26 +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
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
1910a3b33e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30049
2022-03-03 11:31:51 +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
wonwoo
c2bf0d551b
Polish RestController examples
...
See gh-30027
2022-03-03 11:26:11 +00:00
Andy Wilkinson
79fe503616
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30044
2022-03-03 10:33:52 +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
936998647e
Work around Gradle changing line endings during property expansion
...
There's a known issue [1] where property expansion changes the input
files line endings to the operating system's default. This causes
problems for us on Windows as the line endings become \r\n which
breaks our formatting checks.
This commit tunes the checkFormatMain task to exclude the generated
source files from checking. In their place, the original templates
are added. This ensures that the inputs are correctly formatted and,
therefore, that the output should be too (other than the line endings
on Windows).
Closes gh-30039
[1] https://github.com/gradle/gradle/issues/1151
2022-03-02 20:26:15 +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
Andy Wilkinson
b89c29f29c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30037
2022-03-02 15:24:10 +00:00
Andy Wilkinson
ea729fc1c6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30036
2022-03-02 15:21:43 +00:00
Andy Wilkinson
4073cf8334
Only apply special handling of META-INF to jar files
...
The changes for gh-28562 attempted to align the Gradle plugin's
handling of META-INF with the Maven plugin's behavior. Unfortunately,
they want too far, applying the handling to both jar and war files
when the Maven plugin only applies it to jar files.
This commit reworks the changes so that they only apply to jar files.
Closes gh-30026
2022-03-02 15:19:09 +00:00
Andy Wilkinson
324c4310a4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30034
2022-03-02 12:21:29 +00:00