Commit Graph

21334 Commits

Author SHA1 Message Date
Stephane Nicoll 67fc2f9346 Merge branch '3.1.x' 2023-06-14 09:36:47 +02: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 4950e2a6b7 Merge branch '3.1.x' 2023-06-13 16:42:38 -05: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 21a54ec66d Merge branch '3.1.x' 2023-06-13 13:52:36 +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
Moritz Halbritter c73315b4a3 Add property to prevent observations starting with a prefix
For example, setting management.observations.enable.denied.prefix=false
will prevent all observations starting with 'denied.prefix'

Closes gh-34802
2023-06-13 14:04:33 +02:00
Moritz Halbritter 7b90fbb0b2 Add property to specify the order of ServerHttpObservationFilter
The property is named 'management.observations.http.server.filter.order'

Closes gh-35067
2023-06-13 12:14:58 +02:00
Andy Wilkinson 1955139b72 Start building against Spring Integration 6.1.1 snapshots
See gh-35859
2023-06-13 11:04:31 +01:00
Moritz Halbritter 491e12ab5e Add property to disable Spring Security observations
Setting 'management.observations.spring-security.enabled' installs an
ObservationPredicate, which prevents all observations starting with
'spring.security.' to be created.

Closes gh-34802
2023-06-13 11:18:05 +02:00
Moritz Halbritter 6eede829d2 Merge branch '3.1.x' 2023-06-13 10:21:06 +02:00
Sungchan Cho 96d5f8641c Fix typo in Docker Compose documentation
See gh-35818
2023-06-13 10:18:16 +02:00
Moritz Halbritter 5b06224af5 Add property for common key/values on observations
- Deprecates 'management.metrics.tags.*'

Closes gh-33241
2023-06-13 09:56:42 +02:00
Moritz Halbritter 214f06083b Auto-configure OtlpHttpSpanExporter only if property is set
- Remove the default value of 'management.otlp.tracing.endpoint'

Closes gh-35596
2023-06-13 08:14:22 +02:00
Stephane Nicoll cd018aff9c Merge branch '3.1.x' 2023-06-12 09:45:49 +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 8589401b65 Merge branch '3.1.x' 2023-06-10 10:23:45 +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 07c57577b0 Merge branch '3.1.x' 2023-06-09 12:01:25 -05: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 cae0b873a5 Merge branch '3.1.x' 2023-06-08 16:21:25 -05: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 b9c2c289b3 Start working on Spring Boot 3.2
This commit also disables the creation of forward merge issues
when merging into main. Forward merge issues will be re-enabled
once 3.1.1 has been released.
2023-06-08 17:22:21 +01:00
Andy Wilkinson b9f7df6cc2 Merge branch '3.0.x'
Closes gh-35789
2023-06-08 13:39:26 +01: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
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
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 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 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 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 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
Andy Wilkinson 6ad71c9b0c Reduce number of CLI calls to improve startup time with devtools
Update `DockerComposeLifecycleManager` so that `docker ps` is
not called multiple times.

See gh-35435
2023-05-17 16:27:00 -07:00
Phillip Webb b0c76c1f79 Cache docker commands to improve startup time with devtools
Update `DockerCli` so that the docker commands are cached. This helps
improve startup time when using devtools with docker compose.

See 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 6b0b6ccf49 Move docker compose readiness code and make it package-private
The `ReadinessCheck` interface has been removed making the dedicated
package less necessary. By relocating the code we can make more of it
pacakge-private.

See gh-35544
2023-05-17 16:26:59 -07:00
Phillip Webb 060581d078 Remove pluggable docker compose ReadinessCheck
Remove pluggable `ReadinessCheck` interface and only use the
`TcpConnectServiceReadinessCheck` implementation for now. We
may re-introduce pluggable checks in a future version.

See gh-35544
2023-05-17 16:26:59 -07:00
Andy Wilkinson 3d41e41b94 Polish
Make logger a static field.
2023-05-17 16:26:59 -07:00
Johnny Lim 54f85b1181 Fix since version for ImageReference
See gh-35459
2023-05-17 16:02:32 -05:00
Andy Wilkinson 1097164a0e Merge branch '3.0.x'
Closes gh-35457
2023-05-17 10:18:58 +01:00
Andy Wilkinson aabb164892 Merge branch '2.7.x' into 3.0.x
Closes gh-35456
2023-05-17 10:18:30 +01:00
Andy Wilkinson d66563d544 Polish "Improve formatting of Kotlin permitAll example"
See gh-35454
2023-05-17 10:12:05 +01:00
Junsu Park 11a1de1e64 Improve formatting of Kotlin permitAll example
See gh-35454
2023-05-17 10:11:29 +01:00
Stephane Nicoll 7c62a6ad3d Upgrade to Spring Integration 6.1.0
Closes gh-35314
2023-05-17 08:55:01 +02:00
Phillip Webb ae90add7c7 Polish 2023-05-16 14:04:48 -07:00
Phillip Webb 595fc13b34 Future proof SpringApplication.from(...) by returning a wrapper type
Update `SpringApplication.run` to that it returns a wrapper which
provides access to the `ApplicationContext` rather than the
`ApplicationContext` directly.

This should provide a natural place to add more accessors in the future
should we need to.

Closes gh-35451
2023-05-16 14:04:48 -07:00
Ben Gilbert 7674c55cd7 Align spring.flyway.execute-in-transaction property with Flyway default
See gh-35447
2023-05-16 15:05:48 -05:00
Andy Wilkinson f5ff8007be Adapt to deprecation of rejectIllegalHeader
Closes gh-35442
2023-05-16 19:46:43 +01:00
Sébastien Deleuze becff01db1 Improve Kotlin Testcontainers samples
Make those code samples more idiomatic.

See gh-35446
2023-05-16 19:28:47 +01:00
Andy Wilkinson c631f04391 Upgrade to Spring Integration 5.5.18
Closes gh-35294
2023-05-16 19:23:36 +01:00
Andy Wilkinson 541c58336b Upgrade to Undertow 2.3.6.Final
Closes gh-35450
2023-05-16 19:22:43 +01:00
Andy Wilkinson 7ce95225cb Upgrade to Spring Session 3.1.0
Closes gh-35317
2023-05-16 19:22:39 +01:00
Andy Wilkinson b4b870a531 Upgrade to Spring GraphQL 1.2.0
Closes gh-35312
2023-05-16 19:22:38 +01:00
Andy Wilkinson df35f035b4 Upgrade to Spring Authorization Server 1.1.0
Closes gh-35308
2023-05-16 19:22:37 +01:00
Brian Clozel b26115711f Remove unnecessary test for GraphQL Connection
This commit removes an unnecessary test that checks for the pagination
and Connection support in Spring for GraphQL. After a change in
spring-projects/spring-graphql#707, we no longer can test this in
isolation, nor does it make sense to test this integration that
deeply.

See gh-35449
2023-05-16 18:49:19 +01:00
Andy Wilkinson 99b2de02b3 Upgrade to Undertow 2.3.6.Final
Closes gh-35448
2023-05-16 16:45:24 +01:00
Andy Wilkinson 6c7e151cb2 Upgrade to Spring GraphQL 1.1.4
Closes gh-35303
2023-05-16 16:45:19 +01:00
Andy Wilkinson 1dbe09c553 Revert "Upgrade to Testcontainers 1.18.1"
This reverts commit a6db093ec4.

See gh-35430
2023-05-16 11:21:01 +01:00
Andy Wilkinson 37cc6b6a70 Merge branch '3.0.x'
Closes gh-35444
2023-05-16 09:27:30 +01:00
Andy Wilkinson c39a37cd23 Exclude developmentOnly dependences from AOT processing classpaths
Fixes gh-35433
2023-05-16 09:26:20 +01:00
Stephane Nicoll 2de6577140 Upgrade to Spring Security 6.1.0
Closes gh-35316
2023-05-16 07:49:23 +02:00
Stephane Nicoll 416b9122ac Upgrade to Netty 4.1.92.Final
Closes gh-35443
2023-05-16 07:48:39 +02:00
Stephane Nicoll 47cd3bb052 Upgrade to Netty 4.1.92.Final
Closes gh-35441
2023-05-16 07:46:24 +02:00
Stephane Nicoll a9739e109f Upgrade to Hazelcast 5.1.6
Closes gh-35440
2023-05-16 07:46:20 +02:00
Phillip Webb 08c3cccc92 Merge branch '3.0.x' 2023-05-15 22:20:39 -07:00
Phillip Webb 4e305cc209 Merge branch '2.7.x' into 3.0.x 2023-05-15 22:20:32 -07:00
Phillip Webb a75cd014fc Merge branch '2.6.x' into 2.7.x 2023-05-15 22:20:23 -07:00
Phillip Webb 95d1cb9884 Merge branch '2.5.x' into 2.6.x 2023-05-15 22:20:11 -07:00
Phillip Webb 8316a96515 Polish 2023-05-15 22:19:06 -07:00
Phillip Webb 25b0a4a67b Merge branch '2.5.x' into 2.6.x
Fixes gh-35438
2023-05-15 22:12:57 -07:00
Andy Wilkinson 086b1e5f58 Stop WebFilterChainPostProcessor from causing eager init
Fixes gh-35437
2023-05-15 22:12:32 -07:00
Phillip Webb 1ca1145875 Test compatibility with SnakeYAML 1.32 and 1.33 versions
Closes gh-35434
2023-05-15 10:15:51 -07:00
Stephane Nicoll a6db093ec4 Upgrade to Testcontainers 1.18.1
Closes gh-35430
2023-05-15 16:15:18 +02:00
Stephane Nicoll 6b6c3d79d6 Upgrade to Spring Kafka 3.0.7
Closes gh-35376
2023-05-15 16:15:17 +02:00
Stephane Nicoll d0ba57658c Upgrade to SAAJ Impl 3.0.2
Closes gh-35432
2023-05-15 16:15:16 +02:00
Stephane Nicoll 64cc8212d9 Upgrade to jOOQ 3.18.4
Closes gh-35431
2023-05-15 16:15:10 +02:00
Stephane Nicoll ac8a756485 Upgrade to Spring Kafka 3.0.7
Closes gh-35375
2023-05-15 16:12:57 +02:00