Commit Graph

27102 Commits

Author SHA1 Message Date
Phillip Webb
ce13235e76 Polish 2020-06-10 16:32:45 -07:00
Scott Frederick
9ae6816785 Merge branch '2.3.x'
Closes gh-21874
2020-06-10 13:57:06 -05:00
Scott Frederick
7a793a11fb Merge branch '2.2.x' into 2.3.x
Fixes gh-21036 in 2.3.1
2020-06-10 13:55:12 -05:00
Scott Frederick
0fa1d0ef2e Handle bind exceptions in management context
This commit updates the logic for handling binding exceptions in the
management context when it is separate from the application context.
The changes allow the exception details to be visible to
DefaultErrorAttributes without causing the servlet container to
detect an error condition.

Fixes gh-21036
2020-06-10 13:53:04 -05:00
Andy Wilkinson
ba7a42088e Merge branch '2.3.x' 2020-06-10 19:28:26 +01:00
Andy Wilkinson
fdd908d204 Merge branch '2.2.x' into 2.3.x 2020-06-10 19:28:18 +01:00
Andy Wilkinson
3927bd81eb Upgrade to Spring Integration 5.2.7.RELEASE
Closes gh-21778
2020-06-10 19:24:43 +01:00
Andy Wilkinson
4eea0329d3 Upgrade to Spring Data Moore SR8
Closes gh-21775
2020-06-10 19:24:12 +01:00
Andy Wilkinson
c9cae1f32b Merge branch '2.3.x' 2020-06-10 19:23:21 +01:00
Andy Wilkinson
97639939e1 Merge branch '2.2.x' into 2.3.x 2020-06-10 19:23:13 +01:00
Andy Wilkinson
9cffcf9e5b Merge branch '2.1.x' into 2.2.x 2020-06-10 19:22:37 +01:00
Andy Wilkinson
a8fcd1dd8c Merge branch '2.3.x' 2020-06-10 19:21:53 +01:00
Andy Wilkinson
d3ea55c175 Merge branch '2.2.x' into 2.3.x 2020-06-10 19:21:47 +01:00
Andy Wilkinson
0fd98f240c Merge branch '2.1.x' into 2.2.x 2020-06-10 19:21:33 +01:00
Andy Wilkinson
ea55bb32a2 Upgrade to Spring Data Lovelace-SR18
Closes gh-21774
2020-06-10 19:20:53 +01:00
Andy Wilkinson
4eba8e2dc2 Upgrade to Spring Integration 5.1.11.RELEASE
Closes gh-21777
2020-06-10 19:16:40 +01:00
Andy Wilkinson
afcba7c7fc Merge branch '2.3.x' 2020-06-10 19:08:03 +01:00
Andy Wilkinson
0f2f7812d9 Upgrade to Postgresql 42.2.14
Closes gh-21871
2020-06-10 19:06:45 +01:00
Andy Wilkinson
a9fffb3920 Upgrade to Netty tcNative 2.0.31.Final
Closes gh-21870
2020-06-10 19:06:44 +01:00
Andy Wilkinson
dd93b523a4 Merge branch '2.3.x'
Closes gh-21869
2020-06-10 19:02:29 +01:00
Andy Wilkinson
90bd433083 Allow child contexts to configure server properties
Previously, HttpMessageConvertersAutoConfiguration registered
ServerProperties. When this happened in a parent context, any child
contexts would skip registering ServerProperties due to its presence
in the parent context. This prevents the child contexts from
configuring their own server properties.

This commit updates HttpMessageConvertersAutoConfiguration to
bind server.servlet.encoding directly instead of enabling
ServerProperties. With ServerProperties no longer enabled in a parent
context, child contexts are now able to configure their own server
properties.

Fixes gh-21789
2020-06-10 18:56:57 +01:00
Stephane Nicoll
a8da75a396 Merge branch '2.3.x'
Closes gh-21867
2020-06-10 18:13:57 +02:00
Stephane Nicoll
6c926f7849 Merge pull request #21769 from tszmytka
* pr/21769:
  Back-off if a custom ReactiveSessionFactory is defined

Closes gh-21769
2020-06-10 18:13:08 +02:00
Tomek Szmytka
8890660a71 Back-off if a custom ReactiveSessionFactory is defined
This commit makes sure that CassandraReactiveDataAutoConfiguration does
not create a reactiveCassandraSessionFactory bean if the user has
provided their own.

See gh-21769
2020-06-10 18:10:05 +02:00
Andy Wilkinson
dbaa59680d Merge branch '2.3.x' 2020-06-10 17:04:44 +01:00
Andy Wilkinson
9ef9b63527 Upgrade to Undertow 2.1.3.Final
Closes gh-21865
2020-06-10 17:04:04 +01:00
Andy Wilkinson
9c639b1be2 Upgrade to Tomcat 9.0.36
Closes gh-21864
2020-06-10 17:04:04 +01:00
Andy Wilkinson
3e5fcee187 Upgrade to Spring Security 5.3.3.RELEASE
Closes gh-21863
2020-06-10 17:04:04 +01:00
Andy Wilkinson
52975e4480 Upgrade to Spring AMQP 2.2.7.RELEASE
Closes gh-21862
2020-06-10 17:04:04 +01:00
Andy Wilkinson
25cc16a54c Upgrade to RSocket 1.0.1
Closes gh-21861
2020-06-10 17:04:03 +01:00
Andy Wilkinson
df42b3ac39 Upgrade to R2DBC Bom Arabba-SR4
Closes gh-21860
2020-06-10 17:04:03 +01:00
Andy Wilkinson
6e68101b9f Upgrade to Postgresql 42.2.13
Closes gh-21859
2020-06-10 17:04:03 +01:00
Andy Wilkinson
bf83e237ea Upgrade to OkHttp3 3.14.9
Closes gh-21858
2020-06-10 17:04:03 +01:00
Andy Wilkinson
5e3d48114c Upgrade to Netty 4.1.50.Final
Closes gh-21857
2020-06-10 17:04:02 +01:00
Andy Wilkinson
3154655a72 Upgrade to Neo4j OGM 3.2.12
Closes gh-21856
2020-06-10 17:04:02 +01:00
Andy Wilkinson
fcb2d5df49 Upgrade to MongoDB 4.0.4
Closes gh-21855
2020-06-10 17:04:02 +01:00
Andy Wilkinson
98e19999d0 Upgrade to Log4j2 2.13.3
Closes gh-21854
2020-06-10 17:04:02 +01:00
Andy Wilkinson
39c25ff1c4 Upgrade to Lettuce 5.3.1.RELEASE
Closes gh-21853
2020-06-10 17:04:02 +01:00
Andy Wilkinson
08f37b3489 Upgrade to Kotlin Coroutines 1.3.7
Closes gh-21852
2020-06-10 17:04:01 +01:00
Andy Wilkinson
8687533e34 Upgrade to Johnzon 1.2.7
Closes gh-21851
2020-06-10 17:04:01 +01:00
Andy Wilkinson
ce8554211e Upgrade to Jetty 9.4.29.v20200521
Closes gh-21850
2020-06-10 17:04:01 +01:00
Andy Wilkinson
30355f38be Upgrade to Jetty Reactive HTTPClient 1.1.3
Closes gh-21849
2020-06-10 17:04:01 +01:00
Andy Wilkinson
1424ac406c Upgrade to Jaybird 3.0.9
Closes gh-21848
2020-06-10 17:04:01 +01:00
Andy Wilkinson
d7913ff1a8 Upgrade to Hibernate 5.4.17.Final
Closes gh-21847
2020-06-10 17:04:00 +01:00
Andy Wilkinson
2fef9629c5 Upgrade to Groovy 2.5.12
Closes gh-21846
2020-06-10 17:04:00 +01:00
Andy Wilkinson
c26c52d82b Upgrade to Flyway 6.4.4
Closes gh-21845
2020-06-10 17:04:00 +01:00
Andy Wilkinson
cfd5cb5496 Upgrade to Dropwizard Metrics 4.1.9
Closes gh-21844
2020-06-10 17:04:00 +01:00
Andy Wilkinson
5d8d2fe146 Upgrade to Couchbase Client 3.0.5
Closes gh-21843
2020-06-10 17:03:59 +01:00
Andy Wilkinson
c1e8f8626d Upgrade to Caffeine 2.8.4
Closes gh-21842
2020-06-10 17:03:59 +01:00
Andy Wilkinson
306ddf7d16 Upgrade to Byte Buddy 1.10.11
Closes gh-21841
2020-06-10 17:03:59 +01:00