Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
42,897 Commits 23 Branches 0 Tags
713d74d7946d2a155f736b49fa8b05f7ef174bbc
Commit Graph

42897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
45254fa7cb Merge branch '3.0.x' 2023-05-18 08:24:04 +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
ed3c9b210a Merge branch '2.7.x' into 3.0.x 2023-05-18 08:22:47 +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
022004d780 Merge pull request #35460 from sjohnr 
* pr/35460:
  Polish "Add property defaults for Spring Authorization Server"
  Add property defaults for Spring Authorization Server

Closes gh-35460
 2023-05-17 17:09:06 -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
b24b72c19d Merge branch '3.0.x' 2023-05-17 16:46:52 -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
d6a1a3d71a Merge pull request #35455 from be-hase 
* pr/35455:
  Polish "Fix invalid Zipkin Reporter back-off behavior"
  Fix invalid Zipkin Reporter back-off behavior

Closes gh-35455
 2023-05-17 16:42:29 -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
59a4018cbe Merge branch 'gh-35435' 
Closes 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
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
d018aa8f6d Merge branch 'gh-35544' 
Closes 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
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
Scott Frederick
1e29053886 Merge branch '3.0.x' 
Closes gh-35542
 2023-05-17 16:56:38 -05:00
Scott Frederick
9245f3c25e Merge branch '2.7.x' into 3.0.x 
Closes gh-35543
 2023-05-17 16:56:13 -05:00
Scott Frederick
c0797eea1d Upgrade CI to Docker 24.0.0 
Closes gh-35506
 2023-05-17 16:55:10 -05:00
Andy Wilkinson
417113f196 Merge branch '3.0.x' 2023-05-17 22:32:55 +01:00
Andy Wilkinson
881b2fdc1f Merge branch '2.7.x' into 3.0.x 2023-05-17 22:32:18 +01:00
Andy Wilkinson
1cd3a32f1f Merge branch '2.6.x' into 2.7.x 2023-05-17 22:31:56 +01:00
Scott Frederick
a8273e1dbc Merge pull request #35459 from izeye 
* pr/35459:
  Fix since version for ImageReference

Closes gh-35459
 2023-05-17 16:11:29 -05:00
Johnny Lim
54f85b1181 Fix since version for ImageReference 
See gh-35459
 2023-05-17 16:02:32 -05:00
Andy Wilkinson
7f9fd042fb Upgrade to Undertow 2.2.24.Final 
Closes gh-35541
 2023-05-17 21:43:21 +01:00
Andy Wilkinson
47f1fc57d9 Upgrade to Tomcat 9.0.75 
Closes gh-35540
 2023-05-17 21:43:20 +01:00
Andy Wilkinson
2e8ec62cd4 Upgrade to Thymeleaf Extras SpringSecurity 3.0.5.RELEASE 
Closes gh-35539
 2023-05-17 21:25:42 +01:00
Andy Wilkinson
ba7485bf48 Upgrade to Spring WS 3.1.6 
Closes gh-35538
 2023-05-17 21:25:37 +01:00
Andy Wilkinson
1e5797f350 Upgrade to Spring Security 5.6.10 
Closes gh-35537
 2023-05-17 21:25:32 +01:00
Andy Wilkinson
83cbe3fc2c Upgrade to Spring Integration 5.5.18 
Closes gh-35536
 2023-05-17 21:25:27 +01:00
Andy Wilkinson
fa9a5a3a73 Upgrade to Spring Framework 5.3.27 
Closes gh-35535
 2023-05-17 21:25:22 +01:00
Andy Wilkinson
e2cd60b213 Upgrade to Spring Batch 4.3.8 
Closes gh-35534
 2023-05-17 21:25:17 +01:00
Andy Wilkinson
e5ef0682fb Upgrade to Spring AMQP 2.4.12 
Closes gh-35533
 2023-05-17 21:25:12 +01:00
Andy Wilkinson
d0bbf8433a Upgrade to Reactor Bom 2020.0.32 
Closes gh-35532
 2023-05-17 21:25:07 +01:00