Commit Graph

20990 Commits

Author SHA1 Message Date
Scott Frederick
f29a0d8c29 Merge branch '3.0.x'
Closes gh-35690
2023-05-31 17:12:19 -05:00
Scott Frederick
6a763f9be4 Merge branch '2.7.x' into 3.0.x
Closes gh-35689
2023-05-31 17:11:41 -05:00
Scott Frederick
c847db77e6 Correct precedence in description of MongoDB properties
Closes gh-35686
2023-05-31 17:09:45 -05:00
Scott Frederick
a02eb48528 Fix building of MongoDB connection string with authentication db
This commit restores the previous behavior of MongoDB auto-
configuration, where the value of the
`spring.data.mongodb.authentication-database` is set in the
credentials when provided.

Fixes gh-35567
2023-05-31 16:16:25 -05:00
Scott Frederick
593fa1dc42 Allow Mongo database property to override database in URI
This commit restores the previous behavior of MongoDB auto-
configuration, where the value of the `spring.data.mongodb.database`
property takes precedence over the database specified in a
`spring.data.mongodb.uri` property.

Fixes gh-35566
2023-05-31 11:20:53 -05:00
Yanming Zhou
e8659da59b Fix error in SSL bundle documentation
See gh-35665
2023-05-30 17:15:50 -05:00
Andy Wilkinson
0ec804f6c3 Upgrade to Testcontainers 1.18.2
Closes gh-35677
2023-05-30 17:34:14 +01:00
Andy Wilkinson
f0c40a469b Merge branch '3.0.x'
Closes gh-35654
2023-05-26 18:13:14 +01:00
Andy Wilkinson
a58e98af05 Fix binding to constructor bound lateinit properties
Closes gh-35603
2023-05-26 18:12:21 +01:00
Moritz Halbritter
eb9077df86 Document how to customize the JDBC parameters when using Docker Compose
Closes gh-35636
2023-05-26 13:28:40 +02:00
Andy Wilkinson
127004b4c5 Merge branch '3.0.x'
Closes gh-35647
2023-05-26 10:29:53 +01:00
Andy Wilkinson
5ad0d49ec1 Fix hints for @Bean config props that could be constructor bound
Previously, if a `@ConfigurationProperties`-annotated `@Bean` method
returned a type that looked like it could be constructor bound, the
registered runtime hints were incorrect. With only the bean's class
to work with, the hints registrar would incorrectly determine that
the type would be constructor bound and would not register the hints
required for Java bean binding.

This commit updates the registrar to allow the caller to provide a
Bindable which knows both what should be bound and how it should be
bound, thereby allowing the registrar to generate the correct hints.
The tests for the AOT processor have also been updated to remove
duplication of the tests in BindableRuntimeHintsRegistrarTests and
to focus on the contribution creating Bindable instances with the
bind method that is required to produce the correct reflection hints.

Closes gh-35564

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2023-05-26 10:28:49 +01:00
Andy Wilkinson
1d2a41fd1a Merge branch '3.0.x'
Closes gh-35646
2023-05-26 09:41:55 +01:00
Andy Wilkinson
eb60cf4988 Remove duplication of BindableRuntimeHintsRegistrarTests
There were several tests in CPBFIAPT that were duplicating tests in
BindableRuntimeHintsRegistrarTests. To test the AOT processor, all
that is really necessary is to assert that the expected types are
found and passed to BindableRuntimeHintsRegistrar. The tests for
BindableRuntimeHintsRegistrar are then responsible for asserting
that the expected hints are generated for the various different
types.

Closes gh-35645
2023-05-26 09:41:09 +01:00
Andy Wilkinson
75f55cc35a Merge branch '3.0.x'
Closes gh-35644
2023-05-26 09:15:05 +01:00
Andy Wilkinson
f03f062770 Move BindMethod to context.properties.bind and expose on Bindable
Closes gh-35642

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2023-05-26 09:13:58 +01:00
Andy Wilkinson
604a1e9538 Merge branch '3.0.x'
Closes gh-35641
2023-05-26 08:51:57 +01:00
Phillip Webb
581a32b107 Polish ConfigurationPropertiesBean
Closes gh-35640
2023-05-26 08:51:21 +01:00
Andy Wilkinson
fa49e2b6c6 Merge branch '3.0.x'
Closes gh-35639
2023-05-26 08:42:59 +01:00
Phillip Webb
bfbae581d7 Extract BindMethodAttribute class
Create a `BindMethodAttribute` class to manage attribute logic.

Closes gh-35638
2023-05-26 08:33:47 +01:00
Andy Wilkinson
6a74f63143 Merge branch '3.0.x'
Closes gh-35634
2023-05-25 14:20:17 +01:00
Andy Wilkinson
a9f89a1e3c Merge branch '2.7.x' into 3.0.x
Closes gh-35633
2023-05-25 14:19:58 +01:00
Andy Wilkinson
f452a86175 Polish "Document audience support in Oauth2 resource server"
See gh-35286
2023-05-25 14:11:44 +01:00
Bikash Adhikari
13c5c6efb1 Document audience support in Oauth2 resource server
See gh-35286
2023-05-25 14:11:27 +01:00
kitbolourchi
1ac6e9ebe1 Upgrade Kafka image used in integration tests
See gh-35625
2023-05-24 16:12:08 -05:00
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