Commit Graph

20965 Commits

Author SHA1 Message Date
Stephane Nicoll
dcb97594c3 Merge branch '3.0.x'
Closes gh-35618
2023-05-24 13:30:54 +02:00
Stephane Nicoll
44c2090092 Polish "Fix description of build-image[-no-fork] Maven plugin goals"
See gh-35609
2023-05-24 13:28:01 +02:00
Thomas Kåsene
e84025b1b8 Fix description of build-image[-no-fork] Maven plugin goals
See gh-35609
2023-05-24 13:24:37 +02:00
Scott Frederick
703883d302 Merge branch '3.0.x'
Closes gh-35610
2023-05-23 14:36:46 -05:00
Scott Frederick
72fd94f2b5 Align bean name with Spring Data Elasticsearch requirements
Fixes gh-33651
2023-05-23 14:36:02 -05:00
Moritz Halbritter
157b71b333 Add missing defaults for docker compose properties
Closes gh-35598
2023-05-23 10:53:15 +02:00
Moritz Halbritter
b82e7a72b1 Move @Testcontainers before @SpringBootTest in documentation
Closes gh-35572
2023-05-23 09:33:25 +02:00
Moritz Halbritter
d841490f5f Enable ZipkinProperties in ZipkinAutoConfiguration
Closes gh-35592
2023-05-23 09:22:39 +02:00
Moritz Halbritter
ad108952c8 Fix JavaDoc in ServiceConnection
Closes gh-35594
2023-05-23 09:10:51 +02:00
Stephane Nicoll
9643dbeed2 Merge branch '3.0.x'
Closes gh-35590
2023-05-22 16:31:55 +02:00
Christoph Dreis
b2b5728995 Remove unnecessary exclude from spring-restdocs-mockmvc
See gh-35568
2023-05-22 16:31:22 +02:00
Stephane Nicoll
7a9bb55fdf Merge branch '3.0.x'
Closes gh-35589
2023-05-22 16:24:56 +02:00
Johnny Lim
1b5fc89b43 Polish
See gh-35576
2023-05-22 16:17:05 +02:00
Eddú Meléndez
a3caf8102e Polish
See gh-35577
2023-05-22 15:43:14 +02:00
Scott Frederick
0ca3ab7249 Polish Javadoc
See gh-35545
2023-05-19 14:20:14 -05:00
Phillip Webb
1ec78e5437 Add devtools and docker-compose to test maven repository
See gh-35548
2023-05-18 15:15:16 -07:00
Phillip Webb
c2961a1e4a Exclude docker-compose and devtools during AOT processing
Update `ProcessAotMojo` so that `spring-boot-docker-compose` and
`spring-boot-devtools` are not included on the classpath.

Fixes gh-35548
2023-05-18 11:21:13 -07:00
Andy Wilkinson
713d74d794 Merge branch '3.0.x'
See gh-35554
2023-05-18 09:32:06 +01:00
Andy Wilkinson
54e769be3a Polish
See gh-35553
2023-05-18 09:31:49 +01:00
Andy Wilkinson
dd74f8caba Merge branch '3.0.x'
Closes gh-35554
2023-05-18 08:57:08 +01:00
Andy Wilkinson
af9cd8cf0b Merge branch '2.7.x' into 3.0.x
Closes gh-35553
2023-05-18 08:56:49 +01:00
Phillip Webb
418dd1ba5b Return 406 status code if welcome page is not accepted
Add `WelcomePageNotAcceptableHandlerMapping` which will return
an HTTP 406 status if a suitable welcome page is found but
cannot be accepted for the request.

An additional mapper is used so that we don't need to change
the order of the `WelcomePageHandlerMapping`. It's possible
that users may have additional root handler mappings
registered to run after the `WelcomePageHandlerMapping`
and we still need to respect those.

Fixes gh-35552
2023-05-18 08:55:45 +01:00
Andy Wilkinson
b6e56c85a0 Upgrade to Json-smart 2.4.11
Closes gh-35551
2023-05-18 08:23:18 +01:00
Andy Wilkinson
e6160fca8e Upgrade to Jersey 3.1.2
Closes gh-35550
2023-05-18 08:23:02 +01:00
Andy Wilkinson
cc2bb7cade Upgrade to Json-smart 2.4.11
Closes gh-35549
2023-05-18 08:17:37 +01:00
Andy Wilkinson
75ffbc921d Account for new loggers property in FlywayPropertiesTets
See gh-35158
2023-05-18 08:03:25 +01:00
Phillip Webb
e3aac5913e Polish property order
Keep "flyway teams" properties at the end.
2023-05-17 17:32:06 -07:00
Phillip Webb
cf95ae92ea Allow flyway loggers to be configured and provide SLF4J default
Add `spring.flyway.loggers` property which can be used to configure
Flyway loggers and has a default value of "slf4j".

Closes gh-35158
2023-05-17 17:24:29 -07:00
Phillip Webb
d7b4353e99 Polish "Add property defaults for Spring Authorization Server"
See gh-35460
2023-05-17 17:06:54 -07:00
Steve Riesenberg
42c3cba18e Add property defaults for Spring Authorization Server
See gh-35460
2023-05-17 17:06:39 -07:00
Phillip Webb
3b1f4e6296 Upgrade to Spring Batch 5.0.2
Closes gh-35309
2023-05-17 16:47:09 -07:00
Phillip Webb
f88cc5eb94 Upgrade to Spring Batch 5.0.2
Closes gh-35300
2023-05-17 16:45:46 -07:00
Phillip Webb
0743da4987 Merge branch '3.0.x'
Closes gh-35546
2023-05-17 16:42:38 -07:00
Phillip Webb
4072588c29 Polish "Fix invalid Zipkin Reporter back-off behavior"
See gh-35455
2023-05-17 16:38:03 -07:00
ryosuke-hasebe
903e19854d Fix invalid Zipkin Reporter back-off behavior
Update `ReporterConfiguration` so that `spanReporter` back off
if a `Reporter` bean is defined. Prior to this commit, only
`AsyncReporter` beans would be considered.

See gh-35455
2023-05-17 16:36:19 -07:00
Phillip Webb
9bacf4218c Set 'spring.docker.compose.readiness.wait' property in devtools
Default 'spring.docker.compose.readiness.wait' to `ONLY_IF_STARTED`
when using devtools.

See gh-35435
2023-05-17 16:27:00 -07:00
Andy Wilkinson
6ad71c9b0c Reduce number of CLI calls to improve startup time with devtools
Update `DockerComposeLifecycleManager` so that `docker ps` is
not called multiple times.

See gh-35435
2023-05-17 16:27:00 -07:00
Phillip Webb
b0c76c1f79 Cache docker commands to improve startup time with devtools
Update `DockerCli` so that the docker commands are cached. This helps
improve startup time when using devtools with docker compose.

See gh-35435
2023-05-17 16:27:00 -07:00
Phillip Webb
a8602a1814 Allow docker compose service readiness checks to be bypassed
Add `spring.docker.compose.readiness.wait` property that can be used to
determine how Spring Boot should wait for docker compose services to
become ready.

Fixes gh-35545
2023-05-17 16:27:00 -07:00
Phillip Webb
6b0b6ccf49 Move docker compose readiness code and make it package-private
The `ReadinessCheck` interface has been removed making the dedicated
package less necessary. By relocating the code we can make more of it
pacakge-private.

See gh-35544
2023-05-17 16:26:59 -07:00
Phillip Webb
060581d078 Remove pluggable docker compose ReadinessCheck
Remove pluggable `ReadinessCheck` interface and only use the
`TcpConnectServiceReadinessCheck` implementation for now. We
may re-introduce pluggable checks in a future version.

See gh-35544
2023-05-17 16:26:59 -07:00
Andy Wilkinson
3d41e41b94 Polish
Make logger a static field.
2023-05-17 16:26:59 -07:00
Johnny Lim
54f85b1181 Fix since version for ImageReference
See gh-35459
2023-05-17 16:02:32 -05:00
Andy Wilkinson
1097164a0e Merge branch '3.0.x'
Closes gh-35457
2023-05-17 10:18:58 +01:00
Andy Wilkinson
aabb164892 Merge branch '2.7.x' into 3.0.x
Closes gh-35456
2023-05-17 10:18:30 +01:00
Andy Wilkinson
d66563d544 Polish "Improve formatting of Kotlin permitAll example"
See gh-35454
2023-05-17 10:12:05 +01:00
Junsu Park
11a1de1e64 Improve formatting of Kotlin permitAll example
See gh-35454
2023-05-17 10:11:29 +01:00
Stephane Nicoll
7c62a6ad3d Upgrade to Spring Integration 6.1.0
Closes gh-35314
2023-05-17 08:55:01 +02:00
Phillip Webb
ae90add7c7 Polish 2023-05-16 14:04:48 -07:00
Phillip Webb
595fc13b34 Future proof SpringApplication.from(...) by returning a wrapper type
Update `SpringApplication.run` to that it returns a wrapper which
provides access to the `ApplicationContext` rather than the
`ApplicationContext` directly.

This should provide a natural place to add more accessors in the future
should we need to.

Closes gh-35451
2023-05-16 14:04:48 -07:00