Commit Graph

42992 Commits

Author SHA1 Message Date
Stephane Nicoll
6176eaa018 Merge branch '3.0.x'
Closes gh-35695
2023-06-01 14:53:37 +02:00
Stephane Nicoll
c0a6bf830b Merge branch '2.7.x' into 3.0.x
Closes gh-35688
2023-06-01 14:53:10 +02:00
Stephane Nicoll
db03dc7743 Upgrade CI to Docker 24.0.2
Closes gh-35687
2023-06-01 14:52:41 +02:00
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
Scott Frederick
715204dde9 Merge pull request #35665 from quaff
* pr/35665:
  Fix error in SSL bundle documentation

Closes gh-35665
2023-05-30 17:19:45 -05:00
Yanming Zhou
e8659da59b Fix error in SSL bundle documentation
See gh-35665
2023-05-30 17:15:50 -05:00
Scott Frederick
87fd490be1 Merge pull request #35655 from eddumelendez
* pr/35655:
  Polish spring-boot-smoke-test-data-mongo

Closes gh-35655
2023-05-30 17:12:08 -05:00
Eddú Meléndez
127f852cf9 Polish spring-boot-smoke-test-data-mongo
Remove `@ImportAutoConfiguration(SslAutoConfiguration.class)`, since
`SslAutoConfiguration.class` is already provided as an
auto-configuration with `@SpringBootTest`

See gh-35655
2023-05-30 17:11:53 -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
812a48e877 Merge pull request #35286 from bikash30851
* gh-35286:
  Polish "Document audience support in Oauth2 resource server"
  Document audience support in Oauth2 resource server

Closes gh-35286
2023-05-25 14:12:24 +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
Andy Wilkinson
ca1756ecf7 Merge branch '3.0.x' 2023-05-25 12:55:09 +01:00
Andy Wilkinson
bc6015c790 Merge branch '2.7.x' into 3.0.x 2023-05-25 12:54:58 +01:00
Andy Wilkinson
7c5fd06d77 Check out code and validate Gradle wrapper in PR workflow 2023-05-25 12:54:37 +01:00
Andy Wilkinson
74ae0de226 Merge branch '3.0.x' 2023-05-25 12:33:10 +01:00
Andy Wilkinson
8ebf5f2412 Merge branch '2.7.x' into 3.0.x 2023-05-25 12:32:13 +01:00
Andy Wilkinson
746f2aa77e Add workflow for building pull requests 2023-05-25 12:30:46 +01:00
Phillip Webb
25a076178e Merge branch '3.0.x' 2023-05-24 17:31:17 -07:00
Phillip Webb
02217d35d2 Merge branch '2.7.x' into 3.0.x 2023-05-24 17:31:07 -07:00
Phillip Webb
c88a768977 Merge branch '2.6.x' into 2.7.x 2023-05-24 17:30:52 -07:00
Phillip Webb
f8c9fee3b0 Merge branch '2.5.x' into 2.6.x 2023-05-24 17:30:39 -07:00
Phillip Webb
6c4781086f Remove unused CI files 2023-05-24 17:30:12 -07:00
Phillip Webb
4d0ab5f1e9 Merge branch '3.0.x' 2023-05-24 17:28:41 -07:00
Phillip Webb
69fe1aa159 Merge branch '2.7.x' into 3.0.x 2023-05-24 17:28:13 -07:00
Phillip Webb
5d1fcfa472 Merge branch '2.6.x' into 2.7.x 2023-05-24 17:18:58 -07:00
Phillip Webb
12b09acc87 Merge branch '2.5.x' into 2.6.x 2023-05-24 17:18:14 -07:00
Phillip Webb
46c8b58eb5 Update CI pipeline 2023-05-24 17:17:35 -07:00
Scott Frederick
40f5d650f9 Merge pull request #35625 from KitBolourchi
* pr/35625:
  Upgrade Kafka image used in integration tests

Closes gh-35625
2023-05-24 16:46:28 -05:00
kitbolourchi
1ac6e9ebe1 Upgrade Kafka image used in integration tests
See gh-35625
2023-05-24 16:12:08 -05:00
Scott Frederick
39d7dd283a Merge branch '3.0.x'
Closes gh-35623
2023-05-24 15:28:18 -05:00