Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
42,921 Commits 23 Branches 0 Tags
129c590bc50cfec992a8a249388ef24322a67444
Commit Graph

42921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Spring Builds
129c590bc5 Next development version (v3.1.1-SNAPSHOT) 2023-05-18 22:40:36 +00:00
Phillip Webb
1ec78e5437 Add devtools and docker-compose to test maven repository 
See gh-35548
 2023-05-18 15:15:16 -07:00
Scott Frederick
0af455f29b Set LATEST_GA in CI pipeline to true 
Closes gh-35557
 2023-05-18 15:27:51 -05:00
Scott Frederick
b20467281b Merge branch '3.0.x' 
See gh-35556
 2023-05-18 15:24:34 -05:00
Scott Frederick
f0ed2a8e4c Set LATEST_GA to false in CI pipeline 
Closes gh-35556
 2023-05-18 15:24:08 -05:00
Phillip Webb
5eae7652b4 Merge branch '3.0.x' 2023-05-18 13:08:09 -07:00
Phillip Webb
f5703778ca Merge branch '2.7.x' into 3.0.x 2023-05-18 13:08:03 -07:00
Phillip Webb
701ea30b3a Merge branch '2.6.x' into 2.7.x 2023-05-18 13:07:56 -07:00
Spring Builds
15d95ed5a0 Next development version (v2.6.16-SNAPSHOT) 2023-05-18 19:41:10 +00:00
Phillip Webb
037a824349 Merge branch '3.0.x' 2023-05-18 11:29:00 -07:00
Phillip Webb
24887b7742 Merge branch '2.7.x' into 3.0.x 2023-05-18 11:28:52 -07:00
Phillip Webb
d384a90567 Merge branch '2.6.x' into 2.7.x 2023-05-18 11:28:21 -07:00
Phillip Webb
d24ed66b2d Merge branch '2.5.x' into 2.6.x 2023-05-18 11:28:04 -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
Spring Builds
f8ac264bd1 Next development version (v2.5.16-SNAPSHOT) 2023-05-18 17:55:40 +00:00
Andy Wilkinson
f63f9c55f1 Merge branch '3.0.x' 2023-05-18 14:04:20 +01:00
Andy Wilkinson
72d405eb30 Merge branch '2.7.x' into 3.0.x 2023-05-18 14:04:09 +01:00
Andy Wilkinson
858c984b5d Merge branch '2.6.x' into 2.7.x 2023-05-18 14:03:52 +01:00
Andy Wilkinson
af89b29f0a Merge branch '2.5.x' into 2.6.x 
Closes gh-35561
 2023-05-18 14:03:31 +01:00
Phillip Webb
d7ff379fb8 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-35559
 2023-05-18 13:35:49 +01:00
Andy Wilkinson
3ce8bffa0d Merge branch '3.0.x' 2023-05-18 12:36:44 +01:00
Andy Wilkinson
8a5a7e110d Merge branch '2.7.x' into 3.0.x 2023-05-18 12:36:09 +01:00
Spring Builds
6103e81672 Next development version (v3.0.8-SNAPSHOT) 2023-05-18 11:11:27 +00:00
Spring Builds
0f2e5d0e39 Next development version (v2.7.13-SNAPSHOT) 2023-05-18 09:43:54 +00: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
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