Commit Graph

36541 Commits

Author SHA1 Message Date
Andy Wilkinson
d43359ea44 Merge branch '2.7.x' 2022-03-03 15:47:05 +00:00
Andy Wilkinson
0833e9eab8 Relax alias checking for CI on Windows 2022-03-03 15:46:33 +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
bd0829a382 Merge branch '2.7.x' 2022-03-03 14:48:03 +00:00
Andy Wilkinson
2fec86a551 Merge pull request #30006 from terminux
* gh-30006:
  Polish "Support overriding the default SanitizingFunction"
  Support overriding the default SanitizingFunction

Closes gh-30006
2022-03-03 14:25:07 +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
dd372a6a93 Merge branch '2.7.x' 2022-03-03 14:18:45 +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
a8a70ecc06 Merge branch '2.7.x' 2022-03-03 12:08:38 +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
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
c10a6b7b3e Merge branch '2.7.x' 2022-03-03 11:36:49 +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
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
ddc953468c Merge branch '2.7.x' 2022-03-03 11:05:49 +00:00
Andy Wilkinson
308fe7c552 Merge branch '2.6.x' into 2.7.x
Closes gh-30047
2022-03-03 11:05:39 +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
dd25696eb1 Merge branch '2.7.x' 2022-03-03 10:34:08 +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
bfe9dede5b Merge branch '2.7.x' 2022-03-02 20:30:30 +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
1db1ef49c6 Merge branch '2.7.x' 2022-03-02 15:57:12 +00:00
Andy Wilkinson
2f7a0c4e8d Merge branch '2.6.x' into 2.7.x 2022-03-02 15:57:00 +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
a5ec85bede Merge branch '2.7.x' 2022-03-02 15:24:23 +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
f95e5b9b8a Merge branch '2.7.x' 2022-03-02 12:21:39 +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
Andy Wilkinson
8a4a639734 Merge branch '2.5.x' into 2.6.x
Closes gh-30033
2022-03-02 12:21:20 +00:00
Andy Wilkinson
b43715c70b Merge pull request #29983 from izeye
* gh-29983:
  Remove redundant ConditionalOnMissingFilterBean

Closes gh-29983
2022-03-02 12:21:12 +00:00
izeye
140d24d567 Remove redundant ConditionalOnMissingFilterBean
See gh-29983
2022-03-02 11:40:44 +00:00
Andy Wilkinson
81b8b6a24c Merge branch '2.7.x' 2022-03-02 11:22:57 +00:00
Andy Wilkinson
a33dd254c8 Merge branch '2.6.x' into 2.7.x
Closes gh-30032
2022-03-02 11:22:12 +00:00
Andy Wilkinson
1ac1782e21 Merge branch '2.5.x' into 2.6.x
Closes gh-30031
2022-03-02 11:21:56 +00:00
Andy Wilkinson
1547bad452 Merge branch '2.7.x' 2022-03-02 11:07:40 +00:00
Andy Wilkinson
1f8c5942cf Merge branch '2.6.x' into 2.7.x
Closes gh-30030
2022-03-02 11:07:27 +00:00
Andy Wilkinson
35f9358eb2 Manage more of Kafka's modules
Closes gh-29023
2022-03-02 11:06:25 +00:00