root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
35,198 Commits 24 Branches 372 Tags 285 MiB
Commit Graph

35198 Commits

Author SHA1 Message Date
Brian Clozel d13441c009 Merge branch '2.7.x' 
Closes gh-29014
 2021-12-17 12:16:02 +01:00
Brian Clozel b04f7904ff Merge branch '2.6.x' into 2.7.x 
Closes gh-29013
 2021-12-17 12:15:15 +01:00
Brian Clozel 1c35ec2c3c Merge branch '2.5.x' into 2.6.x 
Closes gh-29012
 2021-12-17 12:14:31 +01:00
Brian Clozel 5d0206320a Upgrade to Logback 1.2.9 
Closes gh-29011
 2021-12-17 12:13:02 +01:00
Stephane Nicoll 63121b451f Upgrade to Gradle 7.3.2 
Closes gh-29100
 2021-12-17 10:54:07 +01:00
Stephane Nicoll b9057f1957 Merge branch '2.7.x' 2021-12-17 10:50:23 +01:00
Stephane Nicoll de383fcee0 Merge branch '2.6.x' into 2.7.x 
Closes gh-29099
 2021-12-17 10:50:15 +01:00
Stephane Nicoll bcaa59ce73 Merge branch '2.5.x' into 2.6.x 
Closes gh-29098
 2021-12-17 10:50:07 +01:00
Stephane Nicoll 614d34195a Merge pull request #29094 from An1s9n 
* pr/29094:
  Polish CacheManager customization section in reference doc

Closes gh-29094
 2021-12-17 10:50:00 +01:00
Pavel Anisimov 415c58e21b Polish CacheManager customization section in reference doc 
See gh-29094
 2021-12-17 10:48:55 +01:00
Stephane Nicoll 62d8f0db78 Merge branch '2.7.x' 2021-12-17 10:31:57 +01:00
Stephane Nicoll a05714ad9f Merge branch '2.6.x' into 2.7.x 
Closes gh-29097
 2021-12-17 10:30:42 +01:00
Stephane Nicoll 10362a9315 Merge branch '2.5.x' into 2.6.x 
Closes gh-29096
 2021-12-17 10:30:26 +01:00
Stephane Nicoll 8c9d398422 Test our Gradle plugin against Gradle 7.3.2 
Closes gh-29093
 2021-12-17 09:11:44 +01:00
Phillip Webb 77c1f5aa27 Merge branch '2.7.x' 2021-12-16 14:00:50 -08:00
Phillip Webb 1015df088d Merge branch '2.6.x' into 2.7.x 2021-12-16 13:55:55 -08:00
Phillip Webb 587d6fa309 Polish 2021-12-16 13:55:42 -08:00
Phillip Webb 7981a82785 Merge branch '2.7.x' 2021-12-16 13:50:15 -08:00
Phillip Webb 9c36682fe7 Merge branch '2.6.x' into 2.7.x 2021-12-16 13:49:44 -08:00
Phillip Webb f676602c96 Merge branch '2.5.x' into 2.6.x 2021-12-16 13:49:12 -08:00
Phillip Webb 783981ba98 Merge branch '2.4.x' into 2.5.x 2021-12-16 13:48:25 -08:00
Phillip Webb d336a96b7f Update web.xml xsd references to for 3.1 version 
See gh-29075
 2021-12-16 13:45:12 -08:00
Phillip Webb 003fb229fd Merge branch '2.7.x' 2021-12-16 13:07:22 -08:00
Phillip Webb a74b563b49 Merge branch '2.6.x' into 2.7.x 2021-12-16 13:06:20 -08:00
Phillip Webb a6a5b81dd0 Merge branch '2.5.x' into 2.6.x 2021-12-16 13:05:44 -08:00
Phillip Webb f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08:00
Scott Frederick b4cdd37e63 Merge branch '2.7.x' 2021-12-16 12:24:25 -06:00
Scott Frederick 4cad4851da Merge branch '2.6.x' into 2.7.x 
Closes gh-29088
 2021-12-16 12:24:12 -06:00
Scott Frederick 92b096abbf Fix message interpolation when code is used as default message 
When `setUseCodeAsDefaultMessage(true)` was set on a message source,
attempting to interpolate the default message returned from the message
source would result in the code being unusable by upstream message
resolvers.

Fixes gh-28930
 2021-12-16 12:20:37 -06:00
Stephane Nicoll 4d0b583b46 Merge branch '2.7.x' 2021-12-16 17:51:54 +01:00
Stephane Nicoll 3039272a70 Merge branch '2.6.x' into 2.7.x 2021-12-16 17:51:47 +01:00
Stephane Nicoll 6555ad404e Merge branch '2.5.x' into 2.6.x 2021-12-16 17:51:40 +01:00
Stephane Nicoll f2efe56a18 Upgrade to Spring Framework 5.3.14 2021-12-16 17:51:27 +01:00
Stephane Nicoll a7a37f4ad6 Upgrade to Spring Framework 5.3.14 
Closes gh-28970
 2021-12-16 17:50:53 +01:00
Stephane Nicoll b8bf2cbbc7 Upgrade to Spring Framework 5.3.14 
Closes gh-28961
 2021-12-16 17:50:18 +01:00
Stephane Nicoll 75d2c36846 Merge branch '2.7.x' 2021-12-16 17:30:45 +01:00
Stephane Nicoll 63427b77d1 Merge branch '2.6.x' into 2.7.x 
Closes gh-29086
 2021-12-16 17:30:36 +01:00
Stephane Nicoll 55859ea64c Stop accessing the datasource if initialization mode is set to never 
Closes gh-28931
 2021-12-16 16:50:22 +01:00
Phillip Webb c0023118a9 Merge branch '2.7.x' 
Closes gh-29079
 2021-12-15 22:19:36 -08:00
Phillip Webb b85b6b06a6 Merge branch '2.6.x' into 2.7.x 
Closes gh-29078
 2021-12-15 22:18:41 -08:00
Phillip Webb 6e01c3edbe Merge branch '2.5.x' into 2.6.x 
Closes gh-29077
 2021-12-15 22:17:22 -08:00
Phillip Webb 17363d1b3a Merge branch '2.4.x' into 2.5.x 
Closes gh-29076
 2021-12-15 22:16:37 -08:00
Phillip Webb 1749c893dc Update web-app version to 3.1 
Update the web-app version specified in `web.xml` to 3.1 in order to
make Eclipse happy.

Closes gh-29075
 2021-12-15 22:14:52 -08:00
Scott Frederick 07243539bd Remove unused import 
See gh-29029
 2021-12-15 14:30:12 -06:00
Scott Frederick caf49783d4 Merge branch '2.7.x' 2021-12-15 14:06:55 -06:00
Scott Frederick a773af0387 Merge branch '2.6.x' into 2.7.x 
Closes gh-29073
 2021-12-15 14:05:31 -06:00
Scott Frederick 9e6709eda0 Enable caching for system tests in CI 
Setting the `systemTest` Gradle task output as never up-to-date ensures
that all system tests are executed each time they are run in CI. The
`--rerun-tasks` Gradle option that was used previously had the same
effect but also disabled build caching.

Closes gh-29029
 2021-12-15 14:04:17 -06:00
Stephane Nicoll 904459fa2c Merge branch '2.7.x' 2021-12-15 16:54:28 +01:00
Stephane Nicoll 4b1c0e5a03 Start building against Spring Framework 5.3.14 snapshots 2021-12-15 16:52:41 +01:00
Stephane Nicoll 035adf4f05 Merge branch '2.7.x' 2021-12-15 16:41:27 +01:00