Commit Graph

12203 Commits

Author SHA1 Message Date
Andy Wilkinson
3200d52b15 Upgrade to AssertJ 3.19.0
Closes gh-25229
2021-02-12 12:02:08 +00:00
Andy Wilkinson
6e77c27da5 Upgrade to AppEngine SDK 1.9.86
Closes gh-25228
2021-02-12 12:02:07 +00:00
Andy Wilkinson
da3f0dc1c7 Merge branch '2.4.x'
Closes gh-25186
2021-02-11 20:12:43 +00:00
Andy Wilkinson
9ba28a8b99 Merge branch '2.3.x' into 2.4.x
Closes gh-25185
2021-02-11 20:12:30 +00:00
Andy Wilkinson
bd64e05203 Instrument AMQP AbstractCF when defined as a ConnectionFactory
Fixes gh-25138
2021-02-11 20:09:40 +00:00
Stephane Nicoll
5017d59d56 Merge branch '2.4.x'
Closes gh-25184
2021-02-11 13:55:42 +01:00
Stephane Nicoll
75fc896321 Avoid Illegal reflective access warnings with devtools
This commit improves RestartClassLoader to use a method introduced in
SmartClassLoader to avoid triggering a warning on Java 11 and later.

See https://github.com/spring-projects/spring-framework/issues/26403

Closes gh-24857
2021-02-11 13:55:10 +01:00
Andy Wilkinson
55c47c8b5d Merge branch '2.4.x'
Closes gh-25183
2021-02-11 10:24:11 +00:00
Andy Wilkinson
698672e1cb Merge branch '2.3.x' into 2.4.x
Closes gh-25182
2021-02-11 10:23:20 +00:00
Andy Wilkinson
82dc2dffbd Select specific CLI distribution in CLI's integration tests
Previously, CommandLineInvoker would use the first -bin.zip file found
in build/distributions. If this directory contained multiple zips from
building different versions of Spring Boot, this could result in the
tests being run against the wrong version of the CLI.

This commit updates CommandLineInvoker look for a specific zip in
build/distributions, using the version from gradle.properties to
identify it.

Closes gh-25179
2021-02-11 10:20:30 +00:00
Andy Wilkinson
249b38e07d Merge branch '2.4.x'
Closes gh-25175
2021-02-10 19:42:20 +00:00
Andy Wilkinson
9da3b65ff3 Merge branch '2.3.x' into 2.4.x
Closes gh-25174
2021-02-10 19:41:56 +00:00
Stephane Nicoll
b92bb9332b Polish "Filter properties with a particular prefix"
See gh-24718
2021-02-10 17:32:18 +01:00
Andy Wilkinson
708cbd7294 Ignore events from other contexts when waiting for DS init to complete
Fixes gh-24966
2021-02-10 15:07:44 +00:00
bono007
ad7c69a9cd Filter properties with a particular prefix
This commit improves the configprops endpoint to allow filtering
properties based on a particular prefix

See gh-24718
2021-02-10 15:30:02 +01:00
Stephane Nicoll
0f9fb13141 Fix formatting 2021-02-10 15:25:41 +01:00
Stephane Nicoll
a2118e985a Merge branch '2.4.x'
Closes gh-25170
2021-02-10 15:17:26 +01:00
Stephane Nicoll
46bc551c2b Merge branch '2.3.x' into 2.4.x
Closes gh-25169
2021-02-10 15:14:21 +01:00
Stephane Nicoll
1524793a92 Fix use of deprecated Cassandra properties in integration tests
Closes gh-25148
2021-02-10 15:12:20 +01:00
Andy Wilkinson
514aede91e Merge branch '2.4.x'
Closes gh-25168
2021-02-10 12:20:02 +00:00
Andy Wilkinson
45e6c12cb6 Consider transitives when identifying project dependencies
Previously, when building a layered jar, the Gradle plugin only
considered a configuration's direct dependencies when identifying
project dependencies. This resulted in transitive project dependencies
being missed when deciding which dependencies belong in the
application layer.

This commit updates ResolvedDependencies to consider all projects
from the root project when collecting the IDs of local projects. This
ensures that any project dependency, no matter where it appears in the
dependency graph, is successfully identified.

Fixes gh-25163
2021-02-10 12:10:07 +00:00
Stephane Nicoll
d436521472 Merge branch '2.4.x'
Closes gh-25167
2021-02-10 10:46:56 +01:00
Stephane Nicoll
7cb1605c11 Merge branch '2.3.x' into 2.4.x
Closes gh-25166
2021-02-10 10:45:54 +01:00
Stephane Nicoll
e5098697cb Polish "Validate Cassandra defaults"
See gh-25130
2021-02-10 10:18:28 +01:00
bono007
f71ab69aeb Validate Cassandra defaults
See gh-25130
2021-02-10 10:15:31 +01:00
Stephane Nicoll
d28d82d355 Merge branch '2.4.x'
Closes gh-25164
2021-02-10 09:41:28 +01:00
Stephane Nicoll
acc8f3708b Update copyright of changed file
See gh-25150
2021-02-10 09:37:04 +01:00
bono007
4ef82c45ac Fix defaults for Cassandra's initQueryTimeout and idleTimeout
See gh-25150
2021-02-10 09:36:17 +01:00
Madhura Bhave
301e80be8c Fix raw types error 2021-02-09 14:15:08 -08:00
Madhura Bhave
c05cb21ab7 Add a property to disable the /actuator discovery page
Closes gh-24693
2021-02-09 11:36:29 -08:00
Andy Wilkinson
3610fe50b7 Always use SimpleDriverDataSource when creating Liquibase DataSource
Closes gh-24944
2021-02-09 17:10:03 +00:00
Stephane Nicoll
dca643500a Polish "Make Scheduler consistent for Spring Integration"
See gh-25109
2021-02-09 17:06:43 +01:00
Artem Bilan
c5491cfdd7 Make Scheduler consistent for Spring Integration
Currently Spring Integration creates its own `TaskScheduler` bean if one
does not exist in the context yet. When we add `@EnableScheduling`,
Spring Boot auto-configures one for us, but this one comes with slightly
different options than the default in Spring Integration.

This commit makes sure that Spring Integration reuses the
auto-configured TaskScheduler if possible, regardless of the user
opting-in for `@EnabledScheduling`.

See gh-25109
2021-02-09 17:06:43 +01:00
Andy Wilkinson
78e1a812e2 Try to stabilise Cassandra tests by increasing request timeout
Closes gh-25146
2021-02-09 15:51:24 +00:00
Andy Wilkinson
6521d39867 Merge branch '2.4.x'
Closes gh-25143
2021-02-09 14:12:36 +00:00
Andy Wilkinson
caa9249987 Merge branch '2.3.x' into 2.4.x
Closes gh-25142
2021-02-09 14:11:59 +00:00
Andy Wilkinson
7898b6afb0 Remove duplicate publication from spring-boot-docs
Fixes gh-25132
2021-02-09 14:10:58 +00:00
Stephane Nicoll
c120f789d5 Merge branch '2.4.x'
Closes gh-25141
2021-02-09 15:04:58 +01:00
Stephane Nicoll
9218965104 Merge branch '2.3.x' into 2.4.x
Closes gh-25140
2021-02-09 15:04:28 +01:00
dreis2211
4937547b8a Fix build deprecation warnings about duplicate jar entries
See gh-25116
2021-02-09 14:45:58 +01:00
Stephane Nicoll
a9a8d3a167 Merge branch '2.4.x'
Closes gh-25137
2021-02-09 09:49:59 +01:00
izeye
63ee99bf75 Polish
See gh-25093
2021-02-09 09:48:35 +01:00
Stephane Nicoll
ee59f644ed Merge branch '2.4.x'
Closes gh-25136
2021-02-09 09:45:37 +01:00
Stephane Nicoll
b2818680fd Polish "Clarify usage of BufferingApplicationStartup"
See gh-25075
2021-02-09 09:44:19 +01:00
Oleg Sukhov
853dbc3de3 Clarify usage of BufferingApplicationStartup
See gh-25075
2021-02-09 09:21:52 +01:00
Stephane Nicoll
948f61b4ca Polish contribution
See gh-25006
2021-02-09 09:10:56 +01:00
dreis2211
634dd979d1 Migrate from deprecated methods in AbstractWebFluxEndpointHandlerMapping
See gh-25006
2021-02-09 09:10:42 +01:00
Phillip Webb
23ebf017c0 Extract code samples from docs
See gh-6313
2021-02-04 15:55:35 -08:00
Andy Wilkinson
7a3bd6d44f Merge branch '2.4.x'
Closes gh-25106
2021-02-04 11:44:29 +00:00
Andy Wilkinson
297e3079d0 Fix handling of UriTemplateRequestEntity in TestRestTemplate
A change [1] in Spring Framework 5.3 means that getUrl() on a
RequestEntity will throw an UnsupportedOperationException if the
entity was created using a template.

This commit updates TestRestTemplate to check for instances of
UriTemplateRequestEntity and to resolve the URI using the
entity's UriTemplateHandler instead of calling getUrl() directly.

Fixes gh-25097

[1] a0f4d81db7
2021-02-04 10:59:00 +00:00