root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
35,645 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

35645 Commits

Author SHA1 Message Date
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
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 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 1ac1782e21 Merge branch '2.5.x' into 2.6.x 
Closes gh-30031
 2022-03-02 11:21:56 +00:00
Andy Wilkinson 35f9358eb2 Manage more of Kafka's modules 
Closes gh-29023
 2022-03-02 11:06:25 +00:00
Andy Wilkinson 4ac884ee2d Merge branch '2.5.x' into 2.6.x 
Closes gh-30029
 2022-03-02 10:28:50 +00:00
Andy Wilkinson 69ce392c34 Add support for classifiers when defining a bom 
Closes gh-29298
 2022-03-02 10:17:45 +00:00
Andy Wilkinson 3630952f7b Merge branch '2.5.x' into 2.6.x 
Closes gh-30022
 2022-03-01 17:49:14 +00:00
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
 2022-03-01 17:38:19 +00:00
Andy Wilkinson c8b849e2f6 Merge branch '2.5.x' into 2.6.x 
Closes gh-30018
 2022-03-01 12:32:07 +00:00
Andy Wilkinson 355f80ab98 Add links to Spring Boot for Apache Geode and its documentation 
Closes gh-29697
 2022-03-01 12:13:58 +00:00
Andy Wilkinson b379eea885 Merge branch '2.5.x' into 2.6.x 
Closes gh-30008
 2022-02-28 11:15:02 +00:00
Andy Wilkinson 7bc336cdc6 Use an ephemeral port to avoid potential port clash 
Closes gh-30007
 2022-02-28 10:54:31 +00:00
Stephane Nicoll 0941cfd5fe Merge branch '2.5.x' into 2.6.x 
Closes gh-29993
 2022-02-24 15:12:26 +01:00
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
 2022-02-24 15:12:09 +01:00
Stephane Nicoll 24cd71634c Merge branch '2.5.x' into 2.6.x 2022-02-24 15:02:22 +01:00
Spring Builds a36e28b4be Next development version (v2.6.5-SNAPSHOT) 2022-02-24 12:46:42 +00:00
Spring Builds 5768f5f649 Next development version (v2.5.11-SNAPSHOT) 2022-02-24 09:12:59 +00:00
Phillip Webb 1a3841f74e Polish 2022-02-23 21:44:14 -08:00
Phillip Webb 9411fc264d Merge branch '2.5.x' into 2.6.x 2022-02-23 21:44:08 -08:00
Phillip Webb 57009d5623 Polish 2022-02-23 21:43:42 -08:00
Scott Frederick 59ffe28639 Ignore buildpack deprecation warnings in Paketo system tests 
Fixes gh-29885
 2022-02-23 17:56:21 -06:00
Madhura Bhave acd1ba0eca Merge branch '2.5.x' into 2.6.x 
Closes gh-29980
 2022-02-23 15:28:17 -08:00
Madhura Bhave 67b13ee4c7 Document that placeholders in @DefaultValue annotations are not resolved 
Closes gh-23164
 2022-02-23 15:27:43 -08:00
Madhura Bhave 894860c177 Merge branch '2.5.x' into 2.6.x 
Closes gh-29978
 2022-02-23 15:10:12 -08:00
Madhura Bhave cc95f734d7 Clarify relation of import path to resultant properties in configtree import data 
Closes gh-29606
 2022-02-23 15:09:42 -08:00
Stephane Nicoll 4e4e3f1f49 Merge branch '2.5.x' into 2.6.x 2022-02-23 17:06:45 +01:00
Stephane Nicoll 8147aff76a Upgrade to Spring Batch 4.3.5 
Closes gh-29724
 2022-02-23 17:04:59 +01:00
Stephane Nicoll f864505ea7 Upgrade to Netty tcNative 2.0.50.Final 
Closes gh-29974
 2022-02-23 17:04:40 +01:00
Stephane Nicoll 479a4e693c Upgrade to Spring Batch 4.3.5 
Closes gh-29714
 2022-02-23 16:58:39 +01:00
Stephane Nicoll 773b025208 Upgrade to Netty tcNative 2.0.50.Final 
Closes gh-29973
 2022-02-23 16:57:32 +01:00
Stephane Nicoll e3b0cdd435 Merge branch '2.5.x' into 2.6.x 2022-02-23 16:19:51 +01:00
Stephane Nicoll d1ab3f5f78 Upgrade to Spring Session 2021.1.2 
Closes gh-29725
 2022-02-23 16:19:26 +01:00
Stephane Nicoll 776ccf77a7 Upgrade to Spring Session 2021.0.5 
Closes gh-29715
 2022-02-23 16:17:52 +01:00
Andy Wilkinson a979925e63 Merge branch '2.5.x' into 2.6.x 
Closes gh-29970
 2022-02-23 11:52:57 +00:00
Andy Wilkinson 7aca75c58c Preserve ObjectName property order when name is unchanged 
Closes gh-29953
 2022-02-23 11:30:21 +00:00
Andy Wilkinson 4f8a18fa0a Merge branch '2.5.x' into 2.6.x 
Closes gh-29966
 2022-02-23 08:59:16 +00:00
Andy Wilkinson 9c9e04b8e4 Use mainClass rather than deprecated main in BootRun examples 
Closes gh-29965
 2022-02-23 08:59:04 +00:00
Stephane Nicoll fc964e5bce Merge branch '2.5.x' into 2.6.x 2022-02-23 08:35:07 +01:00
Stephane Nicoll 9e3891a0fe Upgrade to Spring Integration 5.5.9 
Closes gh-29963
 2022-02-23 08:29:23 +01:00
Stephane Nicoll c8b7a17545 Upgrade to Spring Kafka 2.8.3 
Closes gh-29722
 2022-02-23 08:27:24 +01:00
Stephane Nicoll ee7426a555 Upgrade to Spring Integration 5.5.9 
Closes gh-29962
 2022-02-23 08:21:14 +01:00
Stephane Nicoll 3f2d01628d Upgrade to Spring Kafka 2.7.11 
Closes gh-29712
 2022-02-23 08:19:08 +01:00
Madhura Bhave 880db30c67 Merge branch '2.5.x' into 2.6.x 
Closes gh-29959
 2022-02-22 15:49:18 -08:00
Madhura Bhave a70fa80571 Rectify incorrect sanitizing regex example provided in how-to docs 
Closes gh-29951
 2022-02-22 15:44:50 -08:00