Stephane Nicoll
1855f96d07
Polish "Document spring.config.additional-location should be used early"
...
See gh-26085
2021-04-14 10:06:06 +02:00
Shannon Carey
b0b1c04fc4
Document spring.config.additional-location should be used early
...
See gh-26085
2021-04-14 10:03:56 +02:00
Stephane Nicoll
0837844ba9
Merge branch '2.4.x'
2021-04-14 09:08:12 +02:00
Stephane Nicoll
8b7c512974
Merge branch '2.3.x' into 2.4.x
2021-04-14 09:08:00 +02:00
Stephane Nicoll
90fccd7097
Upgrade to SAAJ Impl 1.5.3
...
Closes gh-26104
2021-04-14 08:47:27 +02:00
Stephane Nicoll
54d23bac9d
Upgrade to Micrometer 1.6.6
...
Closes gh-26103
2021-04-14 08:47:26 +02:00
Stephane Nicoll
3a8736a112
Upgrade to Lettuce 6.0.4.RELEASE
...
Closes gh-26102
2021-04-14 08:47:25 +02:00
Stephane Nicoll
0429ab4b88
Upgrade to HSQLDB 2.5.2
...
Closes gh-26101
2021-04-14 08:47:24 +02:00
Stephane Nicoll
00b53b5bdb
Upgrade to Glassfish JAXB 2.3.4
...
Closes gh-26100
2021-04-14 08:47:22 +02:00
Stephane Nicoll
cb2a7dd4cb
Upgrade to SAAJ Impl 1.5.3
...
Closes gh-26099
2021-04-14 08:28:19 +02:00
Stephane Nicoll
cb1d7a3bc8
Upgrade to Micrometer 1.5.13
...
Closes gh-26098
2021-04-14 08:28:18 +02:00
Stephane Nicoll
7c85ebc9c9
Upgrade to Lettuce 5.3.7.RELEASE
...
Closes gh-26097
2021-04-14 08:28:16 +02:00
Stephane Nicoll
274cfc0af0
Upgrade to HSQLDB 2.5.2
...
Closes gh-26096
2021-04-14 08:28:14 +02:00
Stephane Nicoll
4a5cb3f29e
Upgrade to Glassfish JAXB 2.3.4
...
Closes gh-26095
2021-04-14 08:28:13 +02:00
Stephane Nicoll
caa21b0fbe
Upgrade to Flatten Maven Plugin 1.2.7
...
Closes gh-26094
2021-04-14 08:28:12 +02:00
Stephane Nicoll
f8768c053a
Upgrade to Micrometer 1.7.0-RC1
...
Closes gh-25934
2021-04-14 08:17:09 +02:00
Stephane Nicoll
7723e7f130
Upgrade to Spring HATEOAS 1.3.0
...
Closes gh-25927
2021-04-14 08:16:30 +02:00
Phillip Webb
b2b9d55838
Merge branch '2.4.x'
...
Closes gh-26092
2021-04-13 21:33:49 -07:00
Phillip Webb
a2219ba4c5
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26091
2021-04-13 21:33:33 -07:00
Phillip Webb
95a92653e1
Merge pull request #26086 from dreis2211
...
* pr/26086:
Fix Docker update detection on CI
Closes gh-26086
2021-04-13 21:33:14 -07:00
dreis2211
505e6a1b4c
Fix Docker update detection on CI
...
See gh-26086
2021-04-13 21:28:35 -07:00
Phillip Webb
6cc116b9fb
Merge branch '2.4.x'
2021-04-13 21:06:55 -07:00
Phillip Webb
c0e12ce5a3
Merge branch '2.3.x' into 2.4.x
2021-04-13 21:06:36 -07:00
Phillip Webb
f29c707e6c
Increase SampleSessionApplicationTests timeout
...
Increase timeout in `SampleSessionApplicationTests` to fix flaky local
builds.
2021-04-13 21:05:26 -07:00
Andy Wilkinson
f45202e86f
Ensure String to RSA key converters can be used
...
Add tests to ensure that RSA key converters can be used with an
auto-configured security setup.
See gh-26089
Closes gh-24891
2021-04-13 19:13:11 -07:00
Phillip Webb
51c3e18011
Support binding with BeanFactory ConversionService
...
Update `BindConverter` so that multiple `ConverterServices` can be
specified when binding. This change allows `ConversionServiceDeducer`
to add both the `BeanFactory` conversion service as well as a
custom `ApplicationConversionService` when beans annotated with
`@ConfigurationPropertiesBinding` are found.
Fixes gh-26089
2021-04-13 19:13:06 -07:00
Phillip Webb
5581ec0e29
Make getSharedInstance() unmodifiable
...
Update `ApplicationConversionService.getSharedInstance()` so that the
instance returned is unmodifiable and converters cannot be added or
removed from it.
Closes gh-26088
2021-04-13 19:13:03 -07:00
Andy Wilkinson
47709ec0e4
Align buildSrc's Kotlin version with main project's
...
See gh-26080
2021-04-13 20:49:10 +01:00
Andy Wilkinson
b0cce645dd
Use a non-deprecated class to identify kotlin-gradle-plugin-api jar
...
See gh-26080
2021-04-13 20:29:36 +01:00
Andy Wilkinson
962fa06d9b
Merge branch '2.4.x'
...
Closes gh-26082
2021-04-13 20:14:37 +01:00
Andy Wilkinson
a58b25b5db
Add package-info to o.s.b.test.autoconfigure.data.Cassandra
...
Closes gh-26081
2021-04-13 20:14:29 +01:00
Andy Wilkinson
4cbe6836a0
Polish o.s.b.liquibase package-info
2021-04-13 20:09:38 +01:00
Andy Wilkinson
0d0a6919b8
Merge pull request #26078 from dreis2211
...
* gh-26078:
Fix Spring Data Elasticsearch deprecations
Closes gh-26078
2021-04-13 20:06:11 +01:00
dreis2211
4a1924ed73
Fix Spring Data Elasticsearch deprecations
...
See gh-26078
2021-04-13 20:05:48 +01:00
Andy Wilkinson
6f2b4aa685
Upgrade to Kotlin 1.5.0-RC
...
Closes gh-26080
Closes gh-25498
2021-04-13 19:51:03 +01:00
Andy Wilkinson
5289b50a1a
Polish indentation
2021-04-13 19:07:52 +01:00
Andy Wilkinson
773f2e0e04
Merge pull request #26041 from chughts
...
* gh-26041:
Add reference to IBM MQ Spring Boot starter
Closes gh-26041
2021-04-13 18:17:24 +01:00
Soheel Chughtai
18b017690a
Add reference to IBM MQ Spring Boot starter
...
See gh-26041
2021-04-13 18:17:15 +01:00
Andy Wilkinson
2e25a256d5
Allow the auto-configured RabbitMQ ConnectionFactory to be customized
...
Closes gh-6719
2021-04-13 18:14:38 +01:00
Stephane Nicoll
a481b4aec2
Upgrade to HSQLDB 2.5.2
...
Closes gh-26051
2021-04-13 18:07:51 +02:00
Stephane Nicoll
15f0d3d2f3
Upgrade to Nimbus JOSE JWT 9.8.1
...
Closes gh-26077
2021-04-13 18:05:22 +02:00
Stephane Nicoll
bcd79751c6
Upgrade to OAuth2 OIDC SDK 9.3.3
...
Closes gh-26076
2021-04-13 18:05:20 +02:00
Stephane Nicoll
51dc0baf02
Upgrade to Lettuce 6.1.1.RELEASE
...
Closes gh-26075
2021-04-13 18:05:18 +02:00
Andy Wilkinson
5873dddc1c
Attempt to stabilise web server tests that use h2c
...
Apache HttpClient 5.1 doesn't cope with Jetty 10 sending
SETTINGS_ENABLE_CONNECT_PROTOCOL in the settings frame. It also appears
to be unstable when using Undertow, resulting in a failure and
"UT005032: Listener not making progress on framed channel, closing
channel to prevent infinite loop" being logged on the server-side.
Local experimentation suggests that Jetty's HTTP/2 client is more
robust and that it does not trigger the problem with Undertow. It also
fixes the problem with SETTINGS_ENABLE_CONNECT_PROTOCOL when testing
against Jetty 10 so this commit updates the tests to use Jetty's client.
Closes gh-26040
2021-04-13 16:15:49 +01:00
Stephane Nicoll
17a13de855
Upgrade to Undertow 2.2.7.Final
...
Closes gh-26073
2021-04-13 15:43:09 +02:00
Stephane Nicoll
7ad5793e1e
Upgrade to Tomcat 9.0.45
...
Closes gh-26072
2021-04-13 15:43:09 +02:00
Stephane Nicoll
7d5e7cecd8
Upgrade to Sun Mail 1.6.7
...
Closes gh-26071
2021-04-13 15:43:09 +02:00
Stephane Nicoll
75506df0ed
Upgrade to Selenium HtmlUnit 2.49.1
...
Closes gh-26070
2021-04-13 15:43:08 +02:00
Stephane Nicoll
bdc910fb1a
Upgrade to Rabbit AMQP Client 5.12.0
...
Closes gh-26069
2021-04-13 15:43:08 +02:00
Stephane Nicoll
888330eb9d
Upgrade to Netty tcNative 2.0.38.Final
...
Closes gh-26068
2021-04-13 15:43:08 +02:00