Commit Graph

36550 Commits (d79fb60398d4a1a5ffd28eeaeaad1551a65f66f3)
 

Author SHA1 Message Date
Andy Wilkinson d79fb60398 Merge branch '2.7.x' 3 years ago
Andy Wilkinson d47b56a40e Merge branch '2.6.x' into 2.7.x
Closes gh-30060
3 years ago
Andy Wilkinson fd3248b629 Merge branch '2.5.x' into 2.6.x
Closes gh-30059
3 years ago
Andy Wilkinson 2b98fce639 Merge pull request #30000 from larsgrefer
* gh-30000:
  Use Gradle's configuration avoidance APIs in the reference docs

Closes gh-30000
3 years ago
Lars Grefer 99a8374249 Use Gradle's configuration avoidance APIs in the reference docs
See gh-30000
3 years ago
Andy Wilkinson e2d0b348e3 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 4459fb46be Merge branch '2.6.x' into 2.7.x
Closes gh-30058
3 years ago
Andy Wilkinson 2ba8b490a0 Merge branch '2.5.x' into 2.6.x
Closes gh-30057
3 years ago
Andy Wilkinson e7566e968e Use configuration avoidance APIs in Gradle plugin's docs
Closes gh-30056
3 years ago
Andy Wilkinson d43359ea44 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 0833e9eab8 Relax alias checking for CI on Windows 3 years ago
Andy Wilkinson 4846be9506 Align with latest repackaging of CacheMeterBinder in Micrometer
See gh-30014
3 years ago
Andy Wilkinson bd0829a382 Merge branch '2.7.x' 3 years ago
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
3 years ago
Andy Wilkinson ff7321cc5a Polish "Support overriding the default SanitizingFunction"
See gh-30006
3 years ago
Guirong Hu fb9112c891 Support overriding the default SanitizingFunction
See gh-30006
3 years ago
Andy Wilkinson dd372a6a93 Merge branch '2.7.x' 3 years ago
Andy Wilkinson a5d900d0af Merge branch '2.6.x' into 2.7.x
Closes gh-30054
3 years ago
Andy Wilkinson 1f2da6a341 Document SanitizingFunction
Closes gh-29950
3 years ago
Andy Wilkinson a8a70ecc06 Merge branch '2.7.x' 3 years ago
Andy Wilkinson f4e2d7669b Merge branch '2.6.x' into 2.7.x
Closes gh-30051
3 years ago
Andy Wilkinson d63e609fda Merge branch '2.5.x' into 2.6.x
Closes gh-30050
3 years ago
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
3 years ago
Andy Wilkinson 7dce772d67 Polish "Update placeholder docs to mention env vars and default values"
See gh-30012
3 years ago
Kirill Marchuk 2644a2b897 Update placeholder docs to mention env vars and default values
See gh-30012
3 years ago
Andy Wilkinson c10a6b7b3e Merge branch '2.7.x' 3 years ago
Andy Wilkinson 1910a3b33e Merge branch '2.6.x' into 2.7.x
Closes gh-30049
3 years ago
Andy Wilkinson d11c5d3bd2 Merge branch '2.5.x' into 2.6.x
Closes gh-30048
3 years ago
Andy Wilkinson ef927627de Merge pull request #30027 from wonwoo
* gh-30027:
  Polish RestController examples

Closes gh-30027
3 years ago
wonwoo c2bf0d551b Polish RestController examples
See gh-30027
3 years ago
Andy Wilkinson ddc953468c Merge branch '2.7.x' 3 years ago
Andy Wilkinson 308fe7c552 Merge branch '2.6.x' into 2.7.x
Closes gh-30047
3 years ago
Andy Wilkinson 97222236fe Merge branch '2.5.x' into 2.6.x
Closes gh-30046
3 years ago
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
3 years ago
Andy Wilkinson dd25696eb1 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 79fe503616 Merge branch '2.6.x' into 2.7.x
Closes gh-30044
3 years ago
Andy Wilkinson 71dd607623 Merge branch '2.5.x' into 2.6.x
Closes gh-30043
3 years ago
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
3 years ago
Andy Wilkinson bfe9dede5b Merge branch '2.7.x' 3 years ago
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
3 years ago
Andy Wilkinson 1db1ef49c6 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 2f7a0c4e8d Merge branch '2.6.x' into 2.7.x 3 years ago
Andy Wilkinson 0ca64d3b64 Merge branch '2.5.x' into 2.6.x
Closes gh-30038
3 years ago
Andy Wilkinson 35e5b4329e Provide complete dependency management for Netty tcNative
Closes gh-30010
3 years ago
Andy Wilkinson a5ec85bede Merge branch '2.7.x' 3 years ago
Andy Wilkinson b89c29f29c Merge branch '2.6.x' into 2.7.x
Closes gh-30037
3 years ago
Andy Wilkinson ea729fc1c6 Merge branch '2.5.x' into 2.6.x
Closes gh-30036
3 years ago
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
3 years ago
Andy Wilkinson f95e5b9b8a Merge branch '2.7.x' 3 years ago
Andy Wilkinson 324c4310a4 Merge branch '2.6.x' into 2.7.x
Closes gh-30034
3 years ago