Commit Graph

12193 Commits

Author SHA1 Message Date
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
Andy Wilkinson
d30251092b Test the Gradle Plugin against 7.0-milestone-1
Closes gh-25103
2021-02-04 10:16:48 +00:00
Phillip Webb
0e326d6b0f Extract some code samples from docs
See gh-6313
2021-02-03 18:10:44 -08:00
Phillip Webb
e0392c4558 Add additional dependencies for example code
Add additional dependencies useful for the example code.

See gh-6313
2021-02-03 17:53:52 -08:00
Phillip Webb
9f6f2d36df Polish documented application logged output
Update the documented application output based on the latest version.
2021-02-03 17:53:52 -08:00
Phillip Webb
b2a51e4504 Polish asciidoctor formatting 2021-02-03 17:47:36 -08:00
Phillip Webb
ae1be76cce Add pending-extract attribute to source
Add `pending-extract=true` to source blocks to help us identify
those that need to be extracted to a real source file.

See gh-6313
2021-02-03 17:45:40 -08:00
Phillip Webb
073f8c4b23 Polish spring-boot-docs
See gh-25089
2021-02-03 16:25:11 -08:00
Phillip Webb
2a85427324 Refine spring-boot-docs package restructure
Refine the package restructure started in 91ccc23462 to help provide
a solid foundation for code snippets. This commit renames many of the
classes so that they no longer end in `Example`. It also removes some
of the inner types that were previously used. Many tag comments have
also been moved to ensure that `import` statements are available in
the docs.

Closes gh-25089
2021-02-03 15:47:05 -08:00
Phillip Webb
91ccc23462 Restructure spring-boot-docs packages
Restructure the packages in `spring-boot-docs` so that they mirror
the documentation sections. There are now three main packages:
`springbootfeatures`, `productionreadyfeatures` and `howto`. Each
of the main packages has a subpackage named after the section headings.

Example code now uses consistent `// tag::` names and imports are
applied using `[tag=*]` whenever possible.

Test snippets have been moved to `src/main/java` so that only a single
import attribute needs to be defined.

Closes gh-25089
2021-02-02 17:09:45 -08:00
Andy Wilkinson
db781a0d84 Merge branch '2.4.x'
See gh-25077
2021-02-02 15:14:18 +00:00