Madhura Bhave
503d50f39e
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27139
2021-07-01 15:59:12 -07:00
Madhura Bhave
6c4273b5c9
Document spring hateoas is spring mvc specific
...
Closes gh-26897
2021-07-01 15:54:01 -07:00
Madhura Bhave
1f3b32c3b9
Merge branch '2.5.x' into main
...
Closes gh-27138
2021-07-01 15:46:21 -07:00
Madhura Bhave
55593a7ac1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27137
2021-07-01 15:46:00 -07:00
Madhura Bhave
eb4144eb97
Add clarification on when @DevaultValue is used during binding
...
Closes gh-26742
2021-07-01 15:39:16 -07:00
Madhura Bhave
32a1644cca
Split spring boot features into multiple sections
...
See gh-27132
2021-06-30 22:17:48 -07:00
Madhura Bhave
f06b784d6e
Merge branch '2.5.x' into main
...
Closes gh-27122
2021-06-29 13:05:10 -07:00
Madhura Bhave
c231714e2f
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27121
2021-06-29 13:04:18 -07:00
Madhura Bhave
44b0bd43a4
Automate publication of gradle plugin
...
Closes gh-27079
2021-06-29 13:03:49 -07:00
Stephane Nicoll
786d7cdb6e
Merge branch '2.5.x'
...
Closes gh-27118
2021-06-29 09:09:14 +02:00
Stephane Nicoll
163a8e17f7
Merge pull request #27085 from dreis2211
...
* pr/27085:
Update copyright year of updated file
Avoid reflection in tests
Closes gh-27085
2021-06-29 09:06:15 +02:00
Stephane Nicoll
ddf76c32c6
Update copyright year of updated file
...
See gh-27085
2021-06-29 08:28:08 +02:00
dreis2211
c852961011
Avoid reflection in tests
...
See gh-27085
2021-06-29 08:25:45 +02:00
Stephane Nicoll
573ca50333
Merge branch '2.5.x'
...
Closes gh-27117
2021-06-29 08:22:13 +02:00
Stephane Nicoll
b011e4ff97
Merge pull request #27103 from temnur
...
* pr/27103:
Remove unnecessary unit for spring.datasource.tomcat.max-active
Closes gh-27103
2021-06-29 08:22:07 +02:00
Nurlan Tembayev
e57970393c
Remove unnecessary unit for spring.datasource.tomcat.max-active
...
See gh-27103
2021-06-29 08:21:50 +02:00
Stephane Nicoll
53fe7b71f6
Merge branch '2.5.x'
...
Closes gh-27116
2021-06-29 08:17:30 +02:00
Stephane Nicoll
a360cceede
Merge pull request #27107 from biergit
...
* pr/27107:
Fix anchor rewrites containing a question mark
Closes gh-27107
2021-06-29 08:17:25 +02:00
biergit
79638a8f63
Fix anchor rewrites containing a question mark
...
See gh-27107
2021-06-29 08:09:45 +02:00
Stephane Nicoll
0f20c236da
Merge branch '2.5.x'
...
Closes gh-27112
2021-06-28 08:07:31 +02:00
Stephane Nicoll
4e8d466955
Merge pull request #27102 from cordin
...
* pr/27102:
Fix typo in section title
Closes gh-27102
2021-06-28 08:07:16 +02:00
Cèsar Ordiñana
0c38449851
Fix typo in section title
...
See gh-27102
2021-06-28 08:06:57 +02:00
Brian Clozel
f23fa2821c
Merge branch '2.5.x'
...
Closes gh-27106
2021-06-25 19:38:39 +02:00
Brian Clozel
4db53601b5
Fix spring.netty.leak-detection metadata
...
Fixes gh-27104
2021-06-25 19:38:07 +02:00
Phillip Webb
5e6bed2888
Merge branch '2.5.x'
...
Closes gh-27097
2021-06-24 18:51:08 -07:00
Phillip Webb
0c99bc874e
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27096
2021-06-24 18:50:22 -07:00
Phillip Webb
618c1e42e2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-27095
2021-06-24 18:49:56 -07:00
Phillip Webb
7b14d5bb08
Protect against NPE in isAlreadyPromoted
...
Fixes gh-27094
2021-06-24 18:48:22 -07:00
Spring Buildmaster
6f453e3fbe
Next development version (v2.5.3-SNAPSHOT)
2021-06-24 22:58:04 +00:00
Phillip Webb
d00db60bab
Merge branch '2.5.x'
2021-06-24 14:06:25 -07:00
Phillip Webb
dfbd82b838
Fix Kotlin 1.5.20 classpath issues
...
See gh-27086
2021-06-24 14:05:36 -07:00
Phillip Webb
716e8ab717
Merge branch '2.5.x'
2021-06-24 11:31:33 -07:00
Phillip Webb
d44207161f
Suppress Kotlin 1.5.20 deprecation warning
...
See gh-27086
2021-06-24 11:30:58 -07:00
Phillip Webb
674b9fb8fb
Merge branch '2.5.x'
...
Closes gh-27088
2021-06-24 10:45:25 -07:00
Phillip Webb
8f9652c011
Upgrade to Kotlin 1.5.20
...
Closes gh-27086
2021-06-24 10:43:22 -07:00
Madhura Bhave
e67609959b
Merge branch '2.5.x' into main
2021-06-24 09:53:26 -07:00
Madhura Bhave
b4346f0dda
Merge branch '2.4.x' into 2.5.x
2021-06-24 09:53:03 -07:00
Madhura Bhave
fb008a4b71
Merge branch '2.3.x' into 2.4.x
2021-06-24 09:52:44 -07:00
Madhura Bhave
82963a39be
Fix typo
2021-06-24 09:52:26 -07:00
Andy Wilkinson
bd192238ef
Merge branch '2.5.x'
...
Closes gh-27083
2021-06-24 17:02:48 +01:00
Andy Wilkinson
c150a9124a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27082
2021-06-24 17:02:31 +01:00
Andy Wilkinson
2ea836752e
Merge branch '2.3.x' into 2.4.x
...
Closes gh-27081
2021-06-24 17:02:14 +01:00
Andy Wilkinson
7617f0df60
Do not publish to Sonatype when already published
...
Closes gh-27080
2021-06-24 17:01:06 +01:00
Andy Wilkinson
8b9991fcc7
Merge branch '2.5.x'
...
Closes gh-27076
2021-06-24 14:07:17 +01:00
Andy Wilkinson
5a9fa3c8f1
Only close context that is active
...
Previously, SpringApplicationShutdownHook would call close() on any
registered application context even if it wasn't active as it had
already been closed. This could lead to deadlock if the context was
closed and System.exit was called during application context refresh.
This commit updates SpringApplicationShutdownHook so that it only
calls close() on active contexts. This prevents deadlock as it avoids
trying to sychronize on the context's startupShutdownMonitor on
the shutdown hook thread while it's still held on the main thread
which called System.exit and is waiting for all of the shutdown hooks
to complete.
Fixes gh-27049
2021-06-24 14:07:02 +01:00
Andy Wilkinson
0c01a08bba
Merge branch '2.5.x'
2021-06-24 14:06:50 +01:00
Andy Wilkinson
05b041bc86
Merge branch '2.4.x' into 2.5.x
2021-06-24 14:06:35 +01:00
Spring Buildmaster
99a840937b
Next development version (v2.4.9-SNAPSHOT)
2021-06-24 11:23:49 +00:00
Andy Wilkinson
d56ddb0f60
Merge branch '2.5.x'
...
See gh-27050
2021-06-24 11:21:30 +01:00
Andy Wilkinson
4572ae5430
Use reflection to extract Netty's default level
...
See gh-27046
2021-06-24 11:20:56 +01:00