Commit Graph

35702 Commits (26719a211b4d1b7f0059df397138b75f32cb3a1e)
 

Author SHA1 Message Date
Kirill Marchuk 2644a2b897 Update placeholder docs to mention env vars and default values
See gh-30012
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 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 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 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 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 8a4a639734 Merge branch '2.5.x' into 2.6.x
Closes gh-30033
3 years ago
Andy Wilkinson b43715c70b Merge pull request #29983 from izeye
* gh-29983:
  Remove redundant ConditionalOnMissingFilterBean

Closes gh-29983
3 years ago
izeye 140d24d567 Remove redundant ConditionalOnMissingFilterBean
See gh-29983
3 years ago
Andy Wilkinson 1ac1782e21 Merge branch '2.5.x' into 2.6.x
Closes gh-30031
3 years ago
Andy Wilkinson 35f9358eb2 Manage more of Kafka's modules
Closes gh-29023
3 years ago
Andy Wilkinson 4ac884ee2d Merge branch '2.5.x' into 2.6.x
Closes gh-30029
3 years ago
Andy Wilkinson 69ce392c34 Add support for classifiers when defining a bom
Closes gh-29298
3 years ago
Andy Wilkinson 3630952f7b Merge branch '2.5.x' into 2.6.x
Closes gh-30022
3 years ago
Andy Wilkinson a265f150ac Improve parsing of numeric default values
Previously, all integral numbers were parsed as integers. This
caused two problems:

1. Compilation would fail if the default value for a long wasn't a
   valid integer.
2. The default value for a byte or short could be out of range,
   resulting in the generation of invalid metadata and an error
   that could have been caught at compile time not being caught
   until runtime.

This commit updates the parsing of all numeric values to use the
parse method of the target primitive type. For example,
Short.parseShort(String) is now used to parse a short.

Fixes gh-30020
3 years ago
Andy Wilkinson c8b849e2f6 Merge branch '2.5.x' into 2.6.x
Closes gh-30018
3 years ago
Andy Wilkinson 355f80ab98 Add links to Spring Boot for Apache Geode and its documentation
Closes gh-29697
3 years ago
Andy Wilkinson b379eea885 Merge branch '2.5.x' into 2.6.x
Closes gh-30008
3 years ago
Andy Wilkinson 7bc336cdc6 Use an ephemeral port to avoid potential port clash
Closes gh-30007
3 years ago
Stephane Nicoll 0941cfd5fe Merge branch '2.5.x' into 2.6.x
Closes gh-29993
3 years ago
Stephane Nicoll b60b5feefe Add explicit dependency on inject-api
This commit clarifies the build as a test needs inject-api and it works
only by side effect as another library has repackaged this API.

Closes gh-29990
3 years ago
Stephane Nicoll 24cd71634c Merge branch '2.5.x' into 2.6.x 3 years ago
Spring Builds a36e28b4be Next development version (v2.6.5-SNAPSHOT) 3 years ago
Spring Builds 5768f5f649 Next development version (v2.5.11-SNAPSHOT) 3 years ago
Phillip Webb 1a3841f74e Polish 3 years ago
Phillip Webb 9411fc264d Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 57009d5623 Polish 3 years ago
Scott Frederick 59ffe28639 Ignore buildpack deprecation warnings in Paketo system tests
Fixes gh-29885
3 years ago
Madhura Bhave acd1ba0eca Merge branch '2.5.x' into 2.6.x
Closes gh-29980
3 years ago
Madhura Bhave 67b13ee4c7 Document that placeholders in @DefaultValue annotations are not resolved
Closes gh-23164
3 years ago
Madhura Bhave 894860c177 Merge branch '2.5.x' into 2.6.x
Closes gh-29978
3 years ago
Madhura Bhave cc95f734d7 Clarify relation of import path to resultant properties in configtree import data
Closes gh-29606
3 years ago
Stephane Nicoll 4e4e3f1f49 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll 8147aff76a Upgrade to Spring Batch 4.3.5
Closes gh-29724
3 years ago
Stephane Nicoll f864505ea7 Upgrade to Netty tcNative 2.0.50.Final
Closes gh-29974
3 years ago
Stephane Nicoll 479a4e693c Upgrade to Spring Batch 4.3.5
Closes gh-29714
3 years ago
Stephane Nicoll 773b025208 Upgrade to Netty tcNative 2.0.50.Final
Closes gh-29973
3 years ago
Stephane Nicoll e3b0cdd435 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll d1ab3f5f78 Upgrade to Spring Session 2021.1.2
Closes gh-29725
3 years ago
Stephane Nicoll 776ccf77a7 Upgrade to Spring Session 2021.0.5
Closes gh-29715
3 years ago
Andy Wilkinson a979925e63 Merge branch '2.5.x' into 2.6.x
Closes gh-29970
3 years ago
Andy Wilkinson 7aca75c58c Preserve ObjectName property order when name is unchanged
Closes gh-29953
3 years ago
Andy Wilkinson 4f8a18fa0a Merge branch '2.5.x' into 2.6.x
Closes gh-29966
3 years ago
Andy Wilkinson 9c9e04b8e4 Use mainClass rather than deprecated main in BootRun examples
Closes gh-29965
3 years ago