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

42940 Commits

This Branch
This Branch
All Branches
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
52360755af Merge pull request #35609 from ThomasKasene 
* pr/35609:
  Polish "Fix description of build-image[-no-fork] Maven plugin goals"
  Fix description of build-image[-no-fork] Maven plugin goals

Closes gh-35609
 2023-05-24 13:30:14 +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
Stephane Nicoll
bf91ec18c1 Merge pull request #35568 from dreis2211 
* pr/35568:
  Remove unnecessary exclude from spring-restdocs-mockmvc

Closes gh-35568
 2023-05-22 16:31:43 +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
Stephane Nicoll
ca8ebbf4ab Merge pull request #35576 from izeye 
* pr/35576:
  Polish

Closes gh-35576
 2023-05-22 16:22:26 +02:00
Johnny Lim
1b5fc89b43 Polish 
See gh-35576
 2023-05-22 16:17:05 +02:00
Stephane Nicoll
aa4dd4aae2 Merge pull request #35577 from eddumelendez 
* pr/35577:
  Polish

Closes gh-35577
 2023-05-22 15:43:36 +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
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