Commit Graph

21316 Commits

Author SHA1 Message Date
Moritz Halbritter cbbbecce37 Merge branch '3.0.x' into 3.1.x 2023-06-19 21:04:09 +02:00
Moritz Halbritter 975e2d110c Polish CompositePropagationFactory
Remove shaded Guava import
2023-06-19 21:03:05 +02:00
Stephane Nicoll 30d5a988a9 Upgrade to Spring Retry 2.0.2
Closes gh-35753
2023-06-17 17:17:16 +02:00
Stephane Nicoll 139873733d Upgrade to Spring Data Bom 2023.0.1
Closes gh-35750
2023-06-17 17:17:16 +02:00
Stephane Nicoll 607c155d4c Upgrade to Spring Retry 2.0.2
Closes gh-35742
2023-06-17 17:14:33 +02:00
Stephane Nicoll 3194edefbd Upgrade to Spring LDAP 3.0.4
Closes gh-35741
2023-06-17 17:14:32 +02:00
Stephane Nicoll 381857b3d3 Upgrade to Spring Data Bom 2022.0.7
Closes gh-35738
2023-06-17 17:14:32 +02:00
Stephane Nicoll 33341f241d Upgrade to Spring Data Bom 2021.2.13
Closes gh-35728
2023-06-17 17:03:11 +02:00
Stephane Nicoll b4b6477899 Upgrade to Spring AMQP 2.4.13
Closes gh-35727
2023-06-17 17:03:10 +02:00
Phillip Webb 3d6c6a6611 Merge branch '3.0.x' into 3.1.x
Closes gh-35934
2023-06-16 16:15:04 -07:00
Phillip Webb af846da69b Merge branch '2.7.x' into 3.0.x
Closes gh-35933
2023-06-16 16:14:52 -07:00
Phillip Webb efa072204a Don't migrate properties that cause a circular reference
Update `PropertiesMigrationReporter` so that properties are only
migrated automatically when they don't cause a circular reference.

Fixes gh-35919
2023-06-16 16:14:41 -07:00
Phillip Webb 2f39ebfe89 Polish 2023-06-16 15:23:12 -07:00
Phillip Webb 1de7edb615 Remove accidentally committed code 2023-06-16 15:21:03 -07:00
Phillip Webb 5d6a507142 Merge branch '3.0.x' into 3.1.x 2023-06-16 14:35:23 -07:00
Phillip Webb 48e13af8c4 Merge branch '2.7.x' into 3.0.x 2023-06-16 14:34:54 -07:00
Phillip Webb b8d2c279ee Update copyright year of changed files 2023-06-16 14:32:43 -07:00
Scott Frederick e8301a065f Merge branch '3.0.x' into 3.1.x
Closes gh-35932
2023-06-16 16:10:48 -05:00
Scott Frederick fbba2df7bf Enable Gradle plugin tests on Java 20
Closes gh-35931
2023-06-16 16:10:24 -05:00
Phillip Webb baddf4c857 Merge branch '3.0.x' into 3.1.x 2023-06-16 13:54:01 -07:00
Phillip Webb 0fd1c89889 Polish 2023-06-16 13:53:33 -07:00
Phillip Webb 9b72cc41ab Polish 'Add support for multiple tracing propagation formats'
See gh-35611
2023-06-16 13:43:46 -07:00
Johnny Lim 06157837e5
Polish
See gh-35872
2023-06-16 12:39:03 -07:00
Phillip Webb 691b549e36 Merge branch '2.7.x' into 3.0.x 2023-06-16 10:18:43 -07:00
Phillip Webb f3f8610539 Polish 2023-06-16 10:17:08 -07:00
Sébastien Deleuze db8dee5aac Refine SpringApplication.Augmented.with Kotlin extension
This commit allows to specify multiple Kotlin classes.

See gh-35784
2023-06-16 14:22:18 +02:00
Andy Wilkinson 1652c27b3c Apply additional sources once when using SpringApplication.from()
Previously, when using SpringApplication.from() any additional
sources configured using with() would be applied to every
SpringApplication that was created within the scope of the call to
run(). This caused problems with Spring Cloud's bootstrap context
where the additional sources would be applied to both the user's
application and to the boostrap context's application.

This commit updates the hook that's used to apply the additional
sources so that it's only applied once. This results in the
additional sources only being added to the first SpringApplication
that is run.

Closes gh-35873
2023-06-16 10:39:20 +01:00
Phillip Webb c192fb85b2 Merge branch '3.0.x' into 3.1.x
Closes gh-35922
2023-06-15 14:26:55 -07:00
Phillip Webb 4c8b93b37d Merge branch '2.7.x' into 3.0.x
Closes gh-35920
2023-06-15 14:26:36 -07:00
Phillip Webb 137f4ee451 Support reporting of custom Log4J2 log levels from the LoggersEndpoint
Support custom Log4J2 log levels by changing `LoggerConfiguration` so
that it can now report levels using a `LevelConfiguration` object
rather than the limited `LogLevel` enum.

The `Log4J2LoggingSystem` class now uses `LevelConfiguration.ofCustom`
for custom logging levels, rather than throwing an exception.

The `LoggersEndpoint` has also been updated so that it can return the
custom logger name.

Fixes gh-35227
2023-06-15 14:03:22 -07:00
Andy Wilkinson 3d9a308053 Merge branch '3.0.x' into 3.1.x
Closes gh-35913
2023-06-15 15:50:07 +01:00
Andy Wilkinson eeea065595 Merge branch '2.7.x' into 3.0.x
Closes gh-35912
2023-06-15 15:49:36 +01:00
Andy Wilkinson e779fb0bc4 Validate constructor bound config props that implement Validator
Closes gh-33669
2023-06-15 15:29:20 +01:00
Andy Wilkinson 61752184f2 Merge branch '3.0.x' into 3.1.x
Closes gh-35911
2023-06-15 14:47:21 +01:00
Andy Wilkinson 7bb3caf914 Merge branch '2.7.x' into 3.0.x
Closes gh-35910
2023-06-15 14:47:01 +01:00
Andy Wilkinson ee606db34a Update Data REST starter description to mention Spring MVC
Closes gh-35678
2023-06-15 14:46:23 +01:00
Andy Wilkinson 251b5f2d0f Merge branch '3.0.x' into 3.1.x
Closes gh-35909
2023-06-15 14:38:31 +01:00
Andy Wilkinson a5981a4dac Merge branch '2.7.x' into 3.0.x
Closes gh-35908
2023-06-15 14:38:13 +01:00
Andy Wilkinson 9feb84e234 Add DynmicPropertySource to ordered list of property sources
Closes gh-32901
2023-06-15 14:36:38 +01:00
Moritz Halbritter be471c58fe Merge branch '3.0.x' into 3.1.x
Closes gh-35907
2023-06-15 13:49:57 +02:00
Moritz Halbritter 8cd8d21720 Add support for multiple tracing propagation formats
See gh-35611
2023-06-15 13:37:33 +02:00
Andy Wilkinson cb36df47c8 Merge branch '3.0.x' into 3.1.x
Closes gh-35905
2023-06-15 12:20:55 +01:00
Andy Wilkinson 6def7252d6 Merge branch '2.7.x' into 3.0.x
Closes gh-35904
2023-06-15 12:20:27 +01:00
Andy Wilkinson 088006ff60 Use ephemeral port for Hazelcast
When Hazelcast is started on a fixed port and that port is already in
use, it does not fail to start which makes the problem hard to
detect. A symptom of the problem is that clients will not be able to
connect and will either retry indefinitely or will timeout depending
on their configuration.

This commit updates the Hazelcast client tests to start the Hazelcast
instance on an ephemeral port and to customize the client
configuration with the instance's address before use. This should
allow the client tests to work reliably in an environment where
Hazelcast's default port is already in use.

Closes gh-35903
2023-06-15 12:19:34 +01:00
Andy Wilkinson 9b88128e3b Merge branch '3.0.x' into 3.1.x 2023-06-14 18:19:53 +01:00
Andy Wilkinson 4694e20628 Merge branch '2.7.x' into 3.0.x 2023-06-14 18:19:43 +01:00
Andy Wilkinson 7d07c0d09c Polish configuration related to predictive test selection
Most notably, this commit splits the tests that use Spring REST Docs
out into a separate task for which predictive test selection is
disabled. This allows it to be cached and use Gradle's built-in
up-to-date checking, thereby avoiding the generation of new snippets
and the need to then run the asciidoctor and asciidoctorPdf tasks.

It also updates spring-boot-smoke-test-junit-vintage to disable
predictive test selection so that we can continue to assert that
the some tests were executed.

See gh-35869
2023-06-14 18:15:04 +01:00
Stephane Nicoll f299a2473e Upgrade to Reactor Bom 2022.0.8
Closes gh-35747
2023-06-14 09:35:39 +02:00
Stephane Nicoll 61bae46deb Upgrade to Micrometer Tracing 1.1.2
Closes gh-35746
2023-06-14 09:35:38 +02:00
Stephane Nicoll b17c948d61 Upgrade to Micrometer 1.11.1
Closes gh-35745
2023-06-14 09:35:38 +02:00
Stephane Nicoll 4f3761c852 Upgrade to Logback 1.4.8
Closes gh-35885
2023-06-14 09:35:37 +02:00
Stephane Nicoll 9e642c9843 Upgrade to Hazelcast 5.2.4
Closes gh-35884
2023-06-14 09:35:32 +02:00
Stephane Nicoll 1093d172a4 Upgrade to Couchbase Client 3.4.7
Closes gh-35883
2023-06-14 09:35:25 +02:00
Stephane Nicoll d3ff04fa4b Upgrade to Reactor Bom 2022.0.8
Closes gh-35736
2023-06-14 09:23:44 +02:00
Stephane Nicoll 1900910008 Upgrade to Micrometer Tracing 1.0.7
Closes gh-35735
2023-06-14 09:23:44 +02:00
Stephane Nicoll 2d43f345de Upgrade to Micrometer 1.10.8
Closes gh-35734
2023-06-14 09:23:43 +02:00
Stephane Nicoll 7cf41e9e0a Upgrade to Logback 1.4.8
Closes gh-35881
2023-06-14 09:23:43 +02:00
Stephane Nicoll 10b66975dd Upgrade to Glassfish JAXB 4.0.3
Closes gh-35880
2023-06-14 09:23:38 +02:00
Stephane Nicoll 2dbfe54762 Upgrade to Couchbase Client 3.4.7
Closes gh-35879
2023-06-14 09:23:33 +02:00
Stephane Nicoll f2a44d7f06 Upgrade to Reactor Bom 2020.0.33
Closes gh-35726
2023-06-14 09:20:05 +02:00
Stephane Nicoll 7576117dd9 Upgrade to Micrometer 1.9.12
Closes gh-35725
2023-06-14 09:20:04 +02:00
Scott Frederick 7e6452edee Fix Redis URL property userinfo parsing
Fixes gh-35850
2023-06-13 16:42:19 -05:00
Andy Wilkinson b3e2f9a212 Merge branch '3.0.x' into 3.1.x
Closes gh-35868
2023-06-13 15:49:33 +01:00
Andy Wilkinson ac8ea1d841 Upgrade to Neo4j Java Driver 5.9.0
Closes gh-35867
2023-06-13 15:48:52 +01:00
Andy Wilkinson e12ae5add5 Merge branch '3.0.x' into 3.1.x
Closes gh-35865
2023-06-13 13:52:10 +01:00
Andy Wilkinson bdbbbc6470 Merge branch '2.7.x' into 3.0.x
Closes gh-35864
2023-06-13 13:51:51 +01:00
Andy Wilkinson 984dc1d58f Allow package-private main classes to be used with Devtools
Fixes gh-35858
2023-06-13 13:50:27 +01:00
Andy Wilkinson 1955139b72 Start building against Spring Integration 6.1.1 snapshots
See gh-35859
2023-06-13 11:04:31 +01:00
Sungchan Cho 96d5f8641c Fix typo in Docker Compose documentation
See gh-35818
2023-06-13 10:18:16 +02:00
Stephane Nicoll 71856687d7 Upgrade to Undertow 2.3.7.Final
Closes gh-35849
2023-06-12 08:46:00 +02:00
Stephane Nicoll c6bb958ce3 Upgrade to UnboundID LDAPSDK 6.0.9
Closes gh-35848
2023-06-12 08:45:56 +02:00
Stephane Nicoll 815fe626f8 Upgrade to Testcontainers 1.18.3
Closes gh-35847
2023-06-12 08:45:51 +02:00
Stephane Nicoll 9048686080 Upgrade to SQLite JDBC 3.41.2.2
Closes gh-35846
2023-06-12 08:45:45 +02:00
Stephane Nicoll bba8569c25 Upgrade to R2DBC Proxy 1.1.1.RELEASE
Closes gh-35845
2023-06-12 08:45:40 +02:00
Stephane Nicoll 009b4bbcd9 Upgrade to R2DBC MySQL 1.0.2
Closes gh-35844
2023-06-12 08:45:35 +02:00
Stephane Nicoll e51402ef59 Upgrade to R2DBC MSSQL 1.0.1.RELEASE
Closes gh-35843
2023-06-12 08:45:30 +02:00
Stephane Nicoll 10fbaea743 Upgrade to Netty 4.1.93.Final
Closes gh-35842
2023-06-12 08:45:25 +02:00
Stephane Nicoll dac5023c52 Upgrade to Lombok 1.18.28
Closes gh-35841
2023-06-12 08:45:21 +02:00
Stephane Nicoll 99aeb4eef6 Upgrade to Kafka 3.4.1
Closes gh-35840
2023-06-12 08:45:16 +02:00
Stephane Nicoll f3efc963b1 Upgrade to Json-smart 2.4.11
Closes gh-35839
2023-06-12 08:45:11 +02:00
Stephane Nicoll 63994f86bc Upgrade to Jersey 3.1.2
Closes gh-35838
2023-06-12 08:45:06 +02:00
Stephane Nicoll 4cdd2a86a2 Upgrade to JBoss Logging 3.5.1.Final
Closes gh-35837
2023-06-12 08:45:02 +02:00
Stephane Nicoll 68d82df065 Upgrade to Jaybird 5.0.2.java11
Closes gh-35836
2023-06-12 08:44:57 +02:00
Stephane Nicoll 2c013129c8 Upgrade to Jakarta Mail 2.1.2
Closes gh-35835
2023-06-12 08:44:52 +02:00
Stephane Nicoll 1468a63658 Upgrade to Jakarta Json 2.1.2
Closes gh-35834
2023-06-12 08:44:47 +02:00
Stephane Nicoll 3052bfed94 Upgrade to Jackson Bom 2.15.2
Closes gh-35833
2023-06-12 08:44:42 +02:00
Stephane Nicoll a8e924ca7e Upgrade to Infinispan 14.0.10.Final
Closes gh-35832
2023-06-12 08:44:37 +02:00
Stephane Nicoll 033b0b180b Upgrade to HSQLDB 2.7.2
Closes gh-35831
2023-06-12 08:44:32 +02:00
Stephane Nicoll cfdb61b50c Upgrade to Hibernate 6.2.4.Final
Closes gh-35830
2023-06-12 08:44:27 +02:00
Stephane Nicoll eae3453dfd Upgrade to Glassfish JAXB 4.0.3
Closes gh-35829
2023-06-12 08:44:22 +02:00
Stephane Nicoll 574094ec93 Upgrade to Git Commit ID Maven Plugin 5.0.1
Closes gh-35828
2023-06-12 08:44:18 +02:00
Stephane Nicoll 3d2c8d6941 Upgrade to Dropwizard Metrics 4.2.19
Closes gh-35827
2023-06-12 08:44:12 +02:00
Stephane Nicoll 633b7ba96f Upgrade to Byte Buddy 1.14.5
Closes gh-35826
2023-06-12 08:44:07 +02:00
Stephane Nicoll 27ee605f91 Upgrade to Tomcat 10.1.9
Closes gh-35819
2023-06-10 10:11:29 +02:00
Stephane Nicoll 02a601eae3 Fix checkstyle violation 2023-06-10 08:52:54 +02:00
Scott Frederick 767ec4e22e Support encrypted PKCS8 private keys in SSL bundles
Properties `ssl.bundle.pem.mybundle.keystore.private-key-password`
and `ssl.bundle.pem.mybundle.truststore.private-key-password` have
been added for configuring the password required to decrypt an
encrypted private key.

Only PKCS8 private keys with encryption are supported. PKCS1 and EC
private keys with encryption are much more complex to decrypt, and
are not supported.

Fixes gh-35652
2023-06-09 11:52:36 -05:00
Stephane Nicoll 261cb721e9 Fix checkstyle violation 2023-06-09 17:02:10 +02:00
Stephane Nicoll ddeee2bcbf Upgrade to Undertow 2.3.7.Final
Closes gh-35814
2023-06-09 15:48:19 +02:00
Stephane Nicoll a720f3aa59 Upgrade to UnboundID LDAPSDK 6.0.9
Closes gh-35813
2023-06-09 15:48:18 +02:00
Andy Wilkinson 39276f8302 Adapt to deprecation of rejectIllegalHeader
Closes gh-35442
2023-06-09 15:48:18 +02:00
Stephane Nicoll ad0ce41f8a Upgrade to Undertow 2.2.25.Final
Closes gh-35801
2023-06-09 15:35:10 +02:00
Stephane Nicoll 1201d8fa01 Upgrade to UnboundID LDAPSDK 6.0.9
Closes gh-35800
2023-06-09 15:35:10 +02:00
Stephane Nicoll 9f0a631700 Upgrade to Netty 4.1.93.Final
Closes gh-35811
2023-06-09 15:25:01 +02:00
Stephane Nicoll 00aaecbcdd Upgrade to Lombok 1.18.28
Closes gh-35810
2023-06-09 15:24:56 +02:00
Stephane Nicoll 496c0e709f Upgrade to JBoss Logging 3.5.1.Final
Closes gh-35809
2023-06-09 15:24:51 +02:00
Stephane Nicoll daebfb2885 Upgrade to Jakarta Mail 2.1.2
Closes gh-35808
2023-06-09 15:24:46 +02:00
Stephane Nicoll c2566ebffb Upgrade to Jakarta Json 2.1.2
Closes gh-35807
2023-06-09 15:24:40 +02:00
Stephane Nicoll 3ef975e596 Upgrade to Infinispan 14.0.10.Final
Closes gh-35806
2023-06-09 15:24:35 +02:00
Stephane Nicoll 5ea5f59328 Upgrade to HSQLDB 2.7.2
Closes gh-35805
2023-06-09 15:24:30 +02:00
Stephane Nicoll 30bd14e7c5 Upgrade to Git Commit ID Plugin 5.0.1
Closes gh-35804
2023-06-09 15:24:25 +02:00
Stephane Nicoll 766ac6343b Upgrade to Dropwizard Metrics 4.2.19
Closes gh-35803
2023-06-09 15:24:19 +02:00
Stephane Nicoll 0bd08a6233 Upgrade to Netty 4.1.93.Final
Closes gh-35797
2023-06-09 13:14:57 +02:00
Stephane Nicoll ef90c11a1a Upgrade to Lombok 1.18.28
Closes gh-35796
2023-06-09 13:14:52 +02:00
Stephane Nicoll 461f2fa054 Upgrade to Infinispan 13.0.18.Final
Closes gh-35795
2023-06-09 13:14:48 +02:00
Stephane Nicoll 9306d0868a Upgrade to Dropwizard Metrics 4.2.19
Closes gh-35794
2023-06-09 13:14:40 +02:00
Scott Frederick 8f31a5772e Set authSource in MongoDB Docker Compose connection details
When authentication credentials are provided in environment variables
for the official MongoDB Docker image, the authentication source must
also be set to the `admin` database.

Fixes gh-35777
2023-06-08 16:20:57 -05:00
Andy Wilkinson fba0aa805f Merge branch '2.7.x' into 3.0.x
Closes gh-35788
2023-06-08 13:37:27 +01:00
Andy Wilkinson 5e97f869d0 Remove unnecessary usage of Supplier
Closes gh-35787
2023-06-08 12:39:31 +01:00
Andy Wilkinson 443d9f9bd2 Start building against Spring GraphQL 1.1.5 snapshots
See gh-35775
2023-06-07 16:04:35 +01:00
Andy Wilkinson ce85290d01 Merge branch '3.0.x'
Closes gh-35773
2023-06-07 11:27:26 +01:00
Andy Wilkinson 51e980200a Merge branch '2.7.x' into 3.0.x
Closes gh-35772
2023-06-07 11:27:01 +01:00
Andy Wilkinson ca50cd8c8a Stop using an infinite timeout for connecting to Hazelcast
Closes gh-35771
2023-06-07 11:22:50 +01:00
Moritz Halbritter ebbb4d319d Polish 2023-06-07 10:53:03 +02:00
Moritz Halbritter 2e37c0da18 Merge branch '3.0.x'
Closes gh-35769
2023-06-07 09:32:14 +02:00
Moritz Halbritter a9b4e9327c Merge branch '2.7.x' into 3.0.x
Closes gh-35768
2023-06-07 09:32:07 +02:00
twobiers 0dbc0fcf91 Move property notes up to external configuration section
See gh-35662
2023-06-07 09:29:23 +02:00
Moritz Halbritter 0cf93f1aa4 Merge branch '3.0.x'
Closes gh-35767
2023-06-07 09:08:54 +02:00
Steve Riesenberg ba9f92fa86 Improve OAuth2 Client section of docs
* Add an OpenID Connect login client example
* Update redirect-uri examples to match Security docs and not require
  any customization
* Update client-authentication-method for Spring Security 6 usage
* Update provider configuration example to align with Spring
  Authorization Server
* Format Java DSL according to Spring Security docs
* Use Kotlin DSL
* Update redirection endpoint base uri example to use ant pattern

See gh-35679
2023-06-07 09:07:14 +02:00
Moritz Halbritter 28a3cee5a2 Merge branch '3.0.x'
Closes gh-35766
2023-06-07 08:57:54 +02:00
Moritz Halbritter 85720a5d90 Merge branch '2.7.x' into 3.0.x
Closes gh-35765
2023-06-07 08:57:38 +02:00
Bernardo Bulgarelli 51afaa79a7 Add @AliasFor annotation to EndpointCloudFoundryExtension
See gh-35716
2023-06-07 08:45:57 +02:00
Moritz Halbritter 49597db77d Merge branch '3.0.x'
Closes gh-35764
2023-06-07 08:28:03 +02:00
Moritz Halbritter 9149fc3e77 Merge branch '2.7.x' into 3.0.x
Closes gh-35763
2023-06-07 08:27:19 +02:00
Moritz Halbritter 2927d50d18 Add JavaVersion.TWENTY
Closes gh-35758
2023-06-07 08:23:05 +02:00
Yanming Zhou 7a5f6d4123 Expose spring.ssl bundle keys
See gh-35667
2023-06-06 17:50:47 +02:00
Andy Wilkinson bd2fff1fd1 Fix `@ServiceConnection` in native tests
Using `@ServiceConnection` results in the definition of one or more
connection details beans. These bean definitions use an instance
supplier which is not supported by AOT. This results in a failure during
AOT processing.

This commit introduces a BeanRegistrationExcludeFilter to exclude from
AOT processing the beans created from a `@ServiceConnection`. They are
not needed as the registrar will run again in the native image and
define the beans at which point the use of an instance supplier is
supported again.

Fixes gh-35663
2023-06-06 12:05:00 +01:00
Andy Wilkinson 9731934360 Start building against Spring Session 3.1.1 snapshots
See gh-35755
2023-06-06 07:36:38 +01:00
Andy Wilkinson 7627a465b9 Start building against Spring Security 6.1.1 snapshots
See gh-35754
2023-06-06 07:36:38 +01:00
Andy Wilkinson b0ea771f21 Start building against Spring Retry 2.0.2 snapshots
See gh-35753
2023-06-06 07:36:37 +01:00
Andy Wilkinson e92ea34b98 Start building against Spring GraphQL 1.2.1 snapshots
See gh-35752
2023-06-06 07:36:37 +01:00
Andy Wilkinson 036b982dd7 Start building against Spring Framework 6.0.10 snapshots
This reverts commit bc63c511 as Framework's previous behavior has
been restored.

See gh-35751
2023-06-06 07:36:37 +01:00
Andy Wilkinson 3eaaf58536 Start building against Spring Data Bom 2023.0.1 snapshots
See gh-35750
2023-06-06 07:36:36 +01:00
Andy Wilkinson 59b676107f Start building against Spring Authorization Server 1.1.1 snapshots
See gh-35749
2023-06-06 07:36:36 +01:00
Andy Wilkinson e801b833f1 Start building against Spring AMQP 3.0.5 snapshots
See gh-35748
2023-06-06 07:36:36 +01:00
Andy Wilkinson 27a9ed8022 Start building against Reactor Bom 2022.0.8 snapshots
See gh-35747
2023-06-06 07:36:36 +01:00
Andy Wilkinson 26a0268ff9 Start building against Micrometer Tracing 1.1.2 snapshots
See gh-35746
2023-06-06 07:36:35 +01:00
Andy Wilkinson d77b37d039 Start building against Micrometer 1.11.1 snapshots
See gh-35745
2023-06-06 07:36:35 +01:00
Phillip Webb 1669b81af7 Add 'fromApplication' and 'with' Kotlin extension functions
Update `SpringApplicationExtensions.kt` with `fromApplication` and
`with` functions that make `SpringApplication.from(...)` easier to use
with Kotlin.

Fixes gh-35756
2023-06-05 21:49:41 -07:00
Phillip Webb ff35ed4be1 Merge branch '3.0.x' 2023-06-05 17:18:18 -07:00
Phillip Webb f641ce037d Merge branch '2.7.x' into 3.0.x 2023-06-05 17:17:33 -07:00
Phillip Webb 4eda5bd36f Polish 2023-06-05 17:17:07 -07:00
Andy Wilkinson e9cd0c1f3a Restore compatibility with Flyway 9.0.x
Closes gh-35721
2023-06-05 20:48:46 +01:00
Andy Wilkinson d32c7c52b7 Start building against Spring Session 3.0.2 snapshots
See gh-35744
2023-06-05 20:02:44 +01:00
Andy Wilkinson b4fc9d6c50 Start building against Spring Security 6.0.4 snapshots
See gh-35743
2023-06-05 20:02:44 +01:00
Andy Wilkinson e670a091d7 Start building against Spring Retry 2.0.2 snapshots
See gh-35742
2023-06-05 20:02:44 +01:00
Andy Wilkinson 185ca73445 Start building against Spring LDAP 3.0.4 snapshots
See gh-35741
2023-06-05 20:02:43 +01:00
Andy Wilkinson 3960f8630d Start building against Spring Integration 6.0.6 snapshots
See gh-35740
2023-06-05 20:02:43 +01:00
Andy Wilkinson 22e8a41efa Start building against Spring Framework 6.0.10 snapshots
This reverts commit 9d56b419 as Framework's previous behavior has
been restored.

See gh-35739
2023-06-05 20:02:43 +01:00
Andy Wilkinson d8078f1c12 Start building against Spring Data Bom 2022.0.7 snapshots
See gh-35738
2023-06-05 20:02:42 +01:00
Andy Wilkinson 225fa6fbb5 Start building against Spring AMQP 3.0.5 snapshots
See gh-35737
2023-06-05 17:41:36 +01:00
Andy Wilkinson 31f0a69469 Start building against Reactor Bom 2022.0.8 snapshots
See gh-35736
2023-06-05 17:41:31 +01:00
Andy Wilkinson c07d8bef17 Start building against Micrometer Tracing 1.0.7 snapshots
See gh-35735
2023-06-05 17:41:26 +01:00
Andy Wilkinson 538aad723a Start building against Micrometer 1.10.8 snapshots
See gh-35734
2023-06-05 17:41:21 +01:00
Andy Wilkinson 5e963b02a7 Start building against Spring WS 3.1.7 snapshots
See gh-35732
2023-06-05 12:36:14 +01:00
Andy Wilkinson adc2077be3 Start building against Spring Session Bom 2021.2.2 snapshots
See gh-35731
2023-06-05 12:36:13 +01:00
Andy Wilkinson a47112bbeb Start building against Spring Security 5.7.9 snapshots
See gh-35730
2023-06-05 12:36:11 +01:00
Andy Wilkinson c680a892fe Start building against Spring Data Bom 2021.2.13 snapshots
See gh-35728
2023-06-05 11:21:40 +01:00
Andy Wilkinson a04f6b3b02 Start building against Spring AMQP 2.4.13 snapshots
See gh-35727
2023-06-05 11:21:36 +01:00
Andy Wilkinson 163f5052c1 Start building against Reactor Bom 2020.0.33 snapshots
See gh-35726
2023-06-05 11:21:31 +01:00
Andy Wilkinson d92012b82f Start building against Micrometer 1.9.12 snapshots
See gh-35725
2023-06-05 11:21:26 +01:00
Andy Wilkinson cdcebe452c Polish "Test Gradle plugin against Gradle 8.2-rc-1"
See gh-35708
2023-06-05 10:59:30 +01:00
rafaelrc7 ed47e09c13 Implement validity check to spring.rabbitmq.host config property
As discussed on issue #35628, at some point the host property accepted
multiple comma-separated hosts. However, this was not intended, and for
better clarification, it was decided to implement a clearer error
message for this situation.

See gh-35684
2023-06-05 09:56:06 +02:00
Andy Wilkinson 45ce18e1c7 Polish "Test Gradle plugin against Gradle 8.2-rc-1"
See gh-35708
2023-06-02 15:35:34 +01:00
Andy Wilkinson d6192a0fa1 Merge branch '3.0.x'
Closes gh-35708
2023-06-02 15:18:13 +01:00
Andy Wilkinson 5a793a6d49 Merge branch '2.7.x' into 3.0.x
Closes gh-35707
2023-06-02 15:17:35 +01:00
Andy Wilkinson 5623fe3b94 Test Gradle plugin against Gradle 8.2-rc-1
Closes gh-35699
2023-06-02 13:23:36 +01: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
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