fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,069 Commits 22 Branches 339 Tags
Commit Graph

13900 Commits

Author SHA1 Message Date
Madhura Bhave
d82b46b718 Merge branch '2.5.x' into main 
Closes gh-27212
Closes gh-27213
 2021-07-08 13:05:46 -07:00
Madhura Bhave
0f70c46746 Merge branch '2.4.x' into 2.5.x 
Closes gh-27210
Closes gh-27211
 2021-07-08 13:04:48 -07:00
Madhura Bhave
42e556dd73 Handle file with name matching an optional wildcard location 
Previously, the presence of a file with the same name
as an optional wildcard location would cause a failure. With
this change the pattern is resolved only if the resource is a
directory.

Additionally, if an optional wildcard search location that was a file
would also fail with an exception. This commit fixes that so that those
locations are not resolved.

Fixes gh-27120
Fixes gh-27209
 2021-07-08 13:01:15 -07:00
Phillip Webb
cf5fc04ec5 Merge branch '2.5.x' 
Closes gh-27205
 2021-07-08 11:36:37 -07:00
Phillip Webb
f32f4a2e3d Merge branch '2.4.x' into 2.5.x 
Closes gh-27204
 2021-07-08 11:36:25 -07:00
Phillip Webb
84110a22bc Don't change case of 'Sec-WebSocket-Key' 
Polish commit 5ca687c9a6b5 had an accidental side-effect of changing
the 'Sec-WebSocket-Key' header value to lowercase. This breaks
connections since the value needs to be echoed unchanged in the
"Sec-WebSocket-Accept" header.

Fixes gh-27147
 2021-07-08 11:29:29 -07:00
Andy Wilkinson
b50cefbf8b Upgrade to Postgresql 42.2.23 
Closes gh-27202
 2021-07-08 18:44:11 +01:00
Andy Wilkinson
bce7b9c711 Upgrade to jOOQ 3.14.12 
Closes gh-27201
 2021-07-08 18:44:09 +01:00
Andy Wilkinson
2c7105965d Upgrade to Johnzon 1.2.14 
Closes gh-27200
 2021-07-08 18:44:08 +01:00
Andy Wilkinson
81a68651dc Upgrade to Jetty 9.4.43.v20210629 
Closes gh-27199
 2021-07-08 18:44:07 +01:00
Andy Wilkinson
d52117014f Upgrade to Jackson Bom 2.12.4 
Closes gh-27198
 2021-07-08 18:44:06 +01:00
Andy Wilkinson
c96ee0d448 Upgrade to Infinispan 12.1.6.Final 
Closes gh-27197
 2021-07-08 18:44:04 +01:00
Andy Wilkinson
958c6649f4 Upgrade to DB2 JDBC 11.5.6.0 
Closes gh-27196
 2021-07-08 18:44:03 +01:00
Andy Wilkinson
4b965ac1ef Upgrade to Caffeine 2.9.2 
Closes gh-27195
 2021-07-08 18:44:02 +01:00
Andy Wilkinson
bcbc742a0e Upgrade to AspectJ 1.9.7 
Closes gh-27194
 2021-07-08 18:44:00 +01:00
Andy Wilkinson
5ebe2f4539 Merge branch '2.5.x' 
Closes gh-27192
 2021-07-08 18:08:39 +01:00
dreis2211
00d3330c9a Avoid illegal reflective access on ZipEntry.xdostime 
See gh-27100
 2021-07-08 18:05:16 +01:00
Andy Wilkinson
87591d94ee Merge branch '2.5.x' 
Closes gh-27188
 2021-07-08 10:45:57 +01:00
Andy Wilkinson
ff79787def Avoid using deprecated API to get Kotlin Plugin's version 
Closes gh-27090
 2021-07-08 10:45:09 +01:00
Andy Wilkinson
bd1b73be94 Merge branch '2.5.x' 
Closes gh-27186
 2021-07-08 09:18:45 +01:00
Andy Wilkinson
283b4a6ed2 Improve error message for non-options-capable ConnectionFactory 
Fixes gh-26977
 2021-07-08 09:17:55 +01:00
Stephane Nicoll
7eb6cf71f6 Start building against Spring Integration 5.5.2 snapshots 
See gh-27166
 2021-07-08 08:52:18 +02:00
Stephane Nicoll
e426ff6196 Start building against Spring Kafka 2.7.4 snapshots 
See gh-27165
 2021-07-08 08:51:55 +02:00
Stephane Nicoll
745b79714f Start building against Spring Data 2021.0.3 snapshots 
See gh-27164
 2021-07-08 08:51:29 +02:00
Stephane Nicoll
36f5d6762b Start building against Spring HATEOAS 1.3.3 snapshots 
See gh-27184
 2021-07-08 08:51:04 +02:00
Stephane Nicoll
3119179c62 Start building against Spring Framework 5.3.9 snapshots 
See gh-27163
 2021-07-08 08:50:32 +02:00
Stephane Nicoll
74a0354bf1 Start building against Reactor 2020.0.9 snapshots 
See gh-27162
 2021-07-08 08:50:06 +02:00
Stephane Nicoll
815ccd14b5 Start building against Spring Data 2020.0.11 snapshots 
See gh-27161
 2021-07-08 08:45:17 +02:00
Stephane Nicoll
434d4a6f76 Start building against Spring HATEOAS 1.2.8 snapshots 
See gh-27183
 2021-07-08 08:44:52 +02:00
Stephane Nicoll
861f87911c Start building against Spring Framework 5.3.9 snapshots 
See gh-27160
 2021-07-08 08:44:23 +02:00
Stephane Nicoll
74d5fdbcd0 Start building against Reactor 2020.0.9 snapshots 
See gh-27159
 2021-07-08 08:43:53 +02:00
Andy Wilkinson
7c744db0e9 Merge branch '2.5.x' 
Closes gh-27180
 2021-07-07 17:57:25 +01:00
Andy Wilkinson
c21791e671 Test our Gradle plugin against Gradle 7.1.1 
Closes gh-27142
 2021-07-07 17:57:14 +01:00
Stephane Nicoll
fa1eb544c1 Merge branch '2.5.x' 
Closes gh-27155
 2021-07-06 09:10:13 +02:00
Stephane Nicoll
888393d63b Merge branch '2.4.x' into 2.5.x 
Closes gh-27154
 2021-07-06 09:10:03 +02:00
Stephane Nicoll
5ec0c7ed12 Polish "Fix duration to microseconds conversion" 
See gh-27149
 2021-07-06 09:07:48 +02:00
marckchr
a406a46fa1 Fix duration to microseconds conversion 
See gh-27149
 2021-07-06 09:07:47 +02:00
Madhura Bhave
ce1dff86df Merge branch '2.5.x' into main 
See gh-27140
 2021-07-02 15:44:13 -07:00
Madhura Bhave
c6acce569f Merge branch '2.4.x' into 2.5.x 
See gh-27139
 2021-07-02 15:43:15 -07:00
Madhura Bhave
877f618a69 Clarify that HATEOAS can be used with Webflux without starter 
Closes gh-26897
 2021-07-02 15:36:39 -07:00
Madhura Bhave
1dc8fa14c9 Merge branch '2.5.x' into main 
Closes gh-27140
 2021-07-01 16:02:35 -07:00
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
Stephane Nicoll
786d7cdb6e Merge branch '2.5.x' 
Closes gh-27118
 2021-06-29 09:09:14 +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