Commit Graph

5055 Commits

Author SHA1 Message Date
Andy Wilkinson 1bcd127ad0 Merge branch '3.0.x' into 3.1.x
Closes gh-37609
2023-09-27 18:10:04 +01:00
Andy Wilkinson c486892a9b Fix additional metadata location for spring.webflux.multipart.streaming
Closes gh-37608
2023-09-27 18:09:14 +01:00
Andy Wilkinson 0d2eaa716c Polish "Add config prop for JMS listener's sessionTransacted flag"
See gh-37473
2023-09-27 15:07:36 +01:00
Vedran Pavic 79e2cb3ec1 Add config prop for JMS listener's sessionTransacted flag
This commit introduces `spring.jms.listener.session-transacted` property
in order to enable explicit configuration of `sessionTransacted` on the
`DefaultMessageListenerContainer`.

Prior to this commit, `sessionTransacted` would be configured implicitly
based on presence of `JtaTransactionManager`.

See gh-37473
2023-09-27 15:06:52 +01:00
Andy Wilkinson b7facec4a1 Rename spring.jms.listener.acknowledge-mode
Closes gh-37602
2023-09-27 14:41:09 +01:00
Andy Wilkinson 3adc70fd40 Polish "Add properties for JmsTemplate session's ack mode and transacted flag"
See gh-37500
2023-09-27 10:25:19 +01:00
Vedran Pavic 5ba4e2793d Add properties for JmsTemplate session's ack mode and transacted flag
See gh-37500
2023-09-27 10:19:45 +01:00
Andy Wilkinson b63efd17b8 Merge branch '3.1.x'
Closes gh-37595
2023-09-27 09:48:01 +01:00
Andy Wilkinson 5015327886 Merge branch '3.0.x' into 3.1.x
Closes gh-37594
2023-09-27 09:47:49 +01:00
Andy Wilkinson 6b107530f5 Polish "Use Neo4jManagedTypes to populate the mapping context"
See gh-37574
2023-09-27 09:33:56 +01:00
Michael Simons e0a5de01ca Use Neo4jManagedTypes to populate the mapping context
See gh-37574
2023-09-27 09:33:37 +01:00
Andy Wilkinson ecc670772a Make user details service auto-configs back off more readily
Previously auto-configuration of a user details service (imperative
or reactive) would only back off on the presence of certain beans.
This led to situations where the im-memory service was
auto-configured and the default password was logged even though
another authentication mechanism was in use.

This commit updates the auto-configuration so that it backs off
when depending on Spring Security's OAuth2 Client and OAuth2
Resource Server modules. In the imperative case it will also back
off when depending on the SAML 2 provider.

Closes gh-35338
2023-09-26 16:47:19 +01:00
Andy Wilkinson ab06d10d64 Fix checkpoint-restore with replaced or wrapped HikariDataSource
Closes gh-37580
2023-09-26 12:31:12 +01:00
Andy Wilkinson ee9c74556d Make reactive security back off without authentication manager
If there's no authentication manager bean or no bean from which
one can be created, Spring Security's reactive support may fail to
bootstrap due to a null authentication manager.

This commit causes the auto-configuration that enables WebFlux
security to back off in the absence of an AuthenticationManager bean
and a ReactiveUserDetailsService (from which Spring Security can
create an AuthenticationManager) bean. Other reactive security
auto-configuration that can configure things such that WebFlux security
can be bootstrapped without an AuthenticationManager has been updated
to enable WebFlux security rather than relying on another
auto-configuration class to do so.

Fixes gh-37504
2023-09-25 15:31:45 +01:00
Andy Wilkinson a7666ba8a5 Merge branch '3.1.x'
Closes gh-37554
2023-09-22 17:49:23 +01:00
Andy Wilkinson c838c707d8 Merge branch '3.0.x' into 3.1.x
Closes gh-37553
2023-09-22 17:44:44 +01:00
Andy Wilkinson e2982a3a07 Merge branch '2.7.x' into 3.0.x
Closes gh-37552
2023-09-22 17:44:30 +01:00
Andy Wilkinson feae7be0a1 Polish "Fix handling of JMS listener concurrency properties"
See gh-37180
2023-09-22 17:43:57 +01:00
Vedran Pavic 366607f517 Fix handling of JMS listener concurrency properties
Update JMS listener concurrency configuration to set the same minimum
and maximum number of consumers when users specify only the minimum
using `spring.jms.listener.concurrency` property.

Prior to this commit, when using `spring.jms.listener.concurrency` to
set the minimum number of consumers without also specifying
`spring.jms.listener.max-concurrency` would result in effective
concurrency where the actual minimum number of consumers is always 1,
while the maximum number of consumers is the value of
`spring.jms.listener.concurrency`.

See gh-37180
2023-09-22 17:43:56 +01:00
Vedran Pavic 433bd337f4 Rename JMS listener minimum concurrency property
This commit renames `spring.jms.listener.concurrency` property to
`spring.jms.listener.min-concurrency` in order to better align it with
`spring.jms.listener.max-concurrency`.

See gh-37451
2023-09-21 16:17:39 +02:00
Phillip Webb f55184a998 Update copyright year of changed files 2023-09-20 17:16:31 -07:00
Phillip Webb 2075f6c685 Merge branch '3.1.x' 2023-09-20 17:16:13 -07:00
Phillip Webb 78eb8f90d1 Merge branch '3.0.x' into 3.1.x 2023-09-20 17:12:27 -07:00
Phillip Webb 9b5062e5bb Merge branch '2.7.x' into 3.0.x 2023-09-20 17:06:55 -07:00
Phillip Webb b83e7b42bb Update copyright year of changed files 2023-09-20 16:05:44 -07:00
Moritz Halbritter cc214aac40 Merge branch '3.1.x'
Closes gh-37483
2023-09-20 11:30:42 +02:00
Moritz Halbritter b2dc52fc74 Merge branch '3.0.x' into 3.1.x
Closes gh-37482
2023-09-20 11:30:26 +02:00
Moritz Halbritter 5ec358099c Merge branch '2.7.x' into 3.0.x
Closes gh-37481
2023-09-20 11:29:38 +02:00
Moritz Halbritter 0ed455b058 Apply SAML2 sign-request even if metadata url is set
Closes gh-33747
2023-09-20 10:33:55 +02:00
Moritz Halbritter 8f52990c45 Merge branch '3.0.x' into 3.1.x
Closes gh-37457
2023-09-19 13:16:57 +02:00
Moritz Halbritter 99473362d8 Merge branch '2.7.x' into 3.0.x
Closes gh-37456
2023-09-19 13:16:40 +02:00
Moritz Halbritter 95690f7327 Fall back to all media types if encountering invalid Accept header
A warn log message is printed, and if log level is set to debug, the
exception stacktrace is logged, too.

Closes gh-37455
2023-09-19 09:52:02 +02:00
Moritz Halbritter bc7414d106 Merge branch '3.1.x' 2023-09-18 16:09:23 +02:00
Moritz Halbritter 7d505dc5b3 Polish JavaDoc 2023-09-18 15:27:07 +02:00
Johnny Lim 8f4ccb0535 Polish
See gh-37393
2023-09-15 11:44:06 +01:00
Moritz Halbritter 73c25d7156 Provide RestClientSsl as a bean
Closes gh-37400
2023-09-15 10:41:37 +02:00
Moritz Halbritter 3b15d46455 Use virtual threads on Spring Data Redis if enabled
Closes gh-35942
2023-09-14 14:30:47 +02:00
Andy Wilkinson 4f6e50b55a Make Spring Pulsar's Caffeine cache provider available to test compile
See gh-34763
2023-09-14 13:01:21 +01:00
Andy Wilkinson c5f7f11a13 Align with repackaging of CaffeineCacheProvider in Spring Pulsar
See gh-34763
2023-09-14 11:39:39 +01:00
Moritz Halbritter 92500720a7 Polish "Introduce configuration property for strict servlet compliance"
See gh-37242
2023-09-13 10:46:34 +02:00
Yanming Zhou 05b87c5fe8 Introduce configuration property for strict servlet compliance
The property is named spring.servlet.multipart.strict-servlet-compliance

See gh-37242
2023-09-13 10:42:22 +02:00
Johnny Lim c2b78830ff Polish
See gh-37340
2023-09-13 10:26:54 +02:00
Mahmoud Ben Hassine 626d858d81 Update Batch tests
Related to: https://github.com/spring-projects/spring-batch/issues/4245

Closes gh-37348
2023-09-12 14:05:15 +02:00
Moritz Halbritter 8a1f6d4f32 Merge branch '3.1.x'
Closes gh-37335
2023-09-11 16:50:44 +02:00
Stephane Nicoll 24eadd70ed Adapt to Spring Framework API change
This commit adapts to API changes in Spring Framework, see
spring-projects/spring-framework#31117

Previously, the "autowired" executable to use for a bean was always
resolved, even if a custom code fragment didn't really need it. This
is key for binding of immutable configuration properties as we use an
instance supplier for it.

This changes means that the workaround added in maintenance releases
can be removed.

See gh-37337
2023-09-11 16:03:27 +02:00
Andy Wilkinson 14a59a33dc Test that GraphQL QueryDSL auto-config backs off without Query DSL
See gh-34974
2023-09-11 15:00:22 +01:00
Moritz Halbritter e2d84fa462 Make SslStoreBundle implementations immutable
Closes gh-37222
2023-09-11 15:39:25 +02:00
Stephane Nicoll 078b399a93 Upgrade to Neo4j Java Driver 5.12.0
Closes gh-37324
2023-09-11 15:15:58 +02:00
Stephane Nicoll 18177451a9 Upgrade to Couchbase Client 3.4.10
Closes gh-37313
2023-09-11 15:15:57 +02:00
Brian Clozel c951c4c212 Polish GraphQL auto-configuration changes
This commit fixes build issues, as the recent changes surfaced an
existing problem: QueryDsl auto-configurations were not guarded by
classpath conditions for QueryDsl Core.

See gh-34974
2023-09-11 12:55:27 +02:00
Andy Wilkinson 4085425f91 Polish "Support unwrapping in ValidatorAdapter"
See gh-37119
2023-09-11 11:03:33 +01:00
Zisis Pavloudis eb6b151c41 Support unwrapping in ValidatorAdapter
See gh-37119
2023-09-11 10:42:32 +01:00
Andy Wilkinson 0242ba8a13 Merge branch '3.1.x' 2023-09-11 10:32:34 +01:00
Andy Wilkinson 7754dd290a Merge branch '3.0.x' into 3.1.x 2023-09-11 10:32:24 +01:00
Andy Wilkinson 994bafdfd9 Merge branch '2.7.x' into 3.0.x 2023-09-11 10:32:13 +01:00
Marten Deinum 5141e5c4ac Fix description of brokerUrl property in ArtemisProperties
Update description to refer to url instead of port.

See gh-37260
2023-09-11 10:31:19 +01:00
Stephane Nicoll 0206c30238 Upgrade to Couchbase Client 3.4.10
Closes gh-37297
2023-09-11 10:53:53 +02:00
Stephane Nicoll a52d7e255b Upgrade to Couchbase Client 3.4.10
Closes gh-37289
2023-09-11 10:51:59 +02:00
Brian Clozel 16940518c1 Polish GraphQL QueryBE and QueryDSL auto-configurations
Closes gh-34974
2023-09-08 17:52:42 +02:00
Brian Clozel 32b65e85ae Add config property for GraphQL Schema Mapping Inspection
This commit adds a new `spring.graphql.schema.inspection.enabled`
property, which is `true` by default.
This property enables the logging at the INFO level of the GraphQL
Schema inspection report.
During startup, Spring for GraphQL will inspect the schema and report
fields and registrations that are unmapped in the application.

Closes gh-36252
2023-09-08 14:58:24 +02:00
dkswnkk 1d7c0108d0 Capitalize order constant in TomcatWebServerFactoryCustomizer
See gh-37211
2023-09-08 11:28:29 +02:00
Andy Wilkinson ed5d16de84 Upgrade to Jetty 12
Closes gh-36073
2023-09-07 13:59:15 +01:00
Phillip Webb d9af7cec14 Merge pull request #37197 from onobc
* pr/37197:
  Polish 'Add Pulsar ConnectionDetails support'
  Add Pulsar ConnectionDetails support

Closes gh-37197
2023-09-06 12:26:59 -07:00
Phillip Webb 750c597225 Polish 'Add Pulsar ConnectionDetails support'
See gh-37197
2023-09-06 12:18:09 -07:00
Chris Bono 089fef0392 Add Pulsar ConnectionDetails support
Add `ConnectionDetails` support for Apache Pulsar and provide adapters
for Docker Compose and Testcontainers.

See gh-37197
2023-09-06 12:12:25 -07:00
Moritz Halbritter d84c81d18f Reduce logging in WelcomePageHandlerMapping on invalid Accept headers
Closes gh-37118
2023-09-06 14:23:27 +02:00
anessi 320dd0e24e Add virtual host support for Rabbit Stream
Add a new property 'spring.rabbitmq.stream.virtual-host' which can be
used to set a custom virtual host for streams.

See gh-37189
2023-09-06 10:17:51 +02:00
Chris Bono 6e7b845bdf Add support for Apache Pulsar
Add support for Apache Pulsar using the Spring for Apache Pulsar
project.

See gh-34763

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2023-09-05 17:01:51 -07:00
Moritz Halbritter 8f78acd548 Merge branch '3.1.x' 2023-09-05 15:28:23 +02:00
Moritz Halbritter 1962f4ecb7 Merge branch '3.0.x' into 3.1.x 2023-09-05 15:24:25 +02:00
Moritz Halbritter a69ff3bd59 Merge branch '2.7.x' into 3.0.x 2023-09-05 15:21:51 +02:00
Moritz Halbritter 76e51bc92f Only enable needed Couchbase services in integration tests 2023-09-05 15:10:12 +02:00
Andy Wilkinson 41f66fa7ec Merge branch '3.1.x'
Closes gh-37159
2023-08-31 15:23:40 +01:00
Andy Wilkinson c7063af63a Merge branch '3.0.x' into 3.1.x
Closes gh-37158
2023-08-31 15:23:21 +01:00
Andy Wilkinson 67e1ee5dcf Fix ordering of Jetty's WebSocketUpgradeFilter
Closes gh-37115
2023-08-31 15:22:26 +01:00
Moritz Halbritter f1f4e9c008 Implement RestClientBuilderConfigurer
Closes gh-36265
2023-08-31 14:01:44 +02:00
Johnny Lim 30eacd553d Add Javadoc since for new setTaskExecutor method
See gh-37117
2023-08-30 11:30:23 +01:00
Stephane Nicoll 19df3934c6 Upgrade to Flyway 9.21.2
Closes gh-37076
2023-08-23 11:27:27 +02:00
Stephane Nicoll 0f20fc2bbe Merge branch '3.1.x' 2023-08-22 14:45:10 +02:00
Stephane Nicoll 10873b0e7c Merge branch '3.0.x' into 3.1.x 2023-08-22 14:45:02 +02:00
Stephane Nicoll e8d329d99f Polish 2023-08-22 14:44:02 +02:00
Moritz Halbritter 450cd712c9 Merge branch '3.1.x'
Closes gh-37016
2023-08-17 12:18:46 +02:00
Moritz Halbritter a6b63d285c Merge branch '3.0.x' into 3.1.x
Closes gh-37015
2023-08-17 12:18:11 +02:00
Moritz Halbritter d3816651ce Merge branch '2.7.x' into 3.0.x
Closes gh-37014
2023-08-17 12:02:33 +02:00
Moritz Halbritter dc62e5fbc3 Polish "Set max request header size on Netty when using HTTP/2"
See gh-36766
2023-08-17 11:50:18 +02:00
Nerses Aznauryan ee5b23bb02 Set max request header size on Netty when using HTTP/2
Fix an issue that server.max-http-request-header-size doesn't have an
effect on Netty server with http2 enabled.

See gh-36766
2023-08-17 11:47:01 +02:00
Stephane Nicoll 37467c79d0 Polish "Reuse JOOQ helper to determine the dialect to use"
See gh-36991
2023-08-16 15:56:16 +02:00
Ramil Sayetov 36b5500ad0 Reuse JOOQ helper to determine the dialect to use
See gh-36991
2023-08-16 15:51:44 +02:00
Scott Frederick 73874911ad Adapt to changes in Spring Data snapshots
See gh-36680
2023-08-15 14:30:16 -05:00
Stephane Nicoll 85b4362ec6 Adapt to change in Spring Framework snapshots 2023-08-15 17:08:29 +02:00
Phillip Webb 2ef2529c93 Refine Flyway extension mapping
Change `ConfigurationExtensionMapper` to a helper class that can
create a `Consumer` to use with the `PropertyMapper`.

See gh-36364
2023-08-14 09:25:58 -07:00
Phillip Webb 8edec21a6f Update copyright year of changed files 2023-08-13 20:44:44 -07:00
Phillip Webb 407fa780c8 Polish 2023-08-13 20:44:44 -07:00
Phillip Webb d73d8f8e4f Merge branch '3.1.x' 2023-08-13 19:15:56 -07:00
Phillip Webb 155300525e Polish 2023-08-13 19:15:38 -07:00
Phillip Webb 848a61a3a8 Merge branch '3.0.x' into 3.1.x 2023-08-13 18:50:33 -07:00
Phillip Webb 9805723415 Update copyright year of changed files 2023-08-13 18:50:13 -07:00
Phillip Webb a0089c5c76 Merge branch '2.7.x' into 3.0.x 2023-08-13 18:44:36 -07:00
Phillip Webb 46773dd5df Update copyright year of changed files 2023-08-13 18:19:05 -07:00
Phillip Webb 527b2f2cac Polish 2023-08-13 18:18:48 -07:00
Andy Wilkinson b581ab0d3a Upgrade to Flyway 9.21.1
Closes gh-36887
2023-08-09 20:45:32 +01:00
Andy Wilkinson 6c3c8398d0 Upgrade to Elasticsearch Client 8.9.0
Closes gh-36886
2023-08-09 20:45:31 +01:00
Andy Wilkinson 3c7d400f0d Merge branch '3.1.x'
Closes gh-36866
2023-08-09 13:01:43 +01:00
Andy Wilkinson cac157b2a6 Merge branch '3.0.x' into 3.1.x
Closes gh-36865
2023-08-09 13:01:33 +01:00
Andy Wilkinson 7c77668372 Merge branch '2.7.x' into 3.0.x
Closes gh-36864
2023-08-09 13:01:23 +01:00
Andy Wilkinson c1f2efe00c Document that spring.security.filter properties are Servlet-only
Closes gh-33551
2023-08-09 12:56:33 +01:00
Moritz Halbritter 5b00d5f89b Auto-configure SimpleAsyncTaskScheduler when virtual threads are enabled
This auto-configures a new SimpleAsyncTaskSchedulerBuilder bean in the
context. This bean is configured to use virtual threads, if enabled.

SimpleAsyncTaskSchedulerCustomizers can be used to customize the built
SimpleAsyncTaskScheduler.

If virtual threads are enabled, the application task scheduler is
configured to be a SimpleAsyncTaskScheduler.

Adds a new configuration property spring.task.scheduling.simple
.concurrency-limit

Closes gh-36609
2023-08-09 13:43:08 +02:00
Stephane Nicoll 38dbc644ae Add auto-configuration for JdbcClient
Closes gh-36579
2023-08-09 11:18:25 +02:00
Moritz Halbritter b5a48e926d Handle timeout of latch await in tests 2023-08-08 13:12:48 +02:00
Moritz Halbritter 62fb45f75f Replace contains/put/get pattern with computeIfAbsent 2023-08-08 13:12:47 +02:00
Moritz Halbritter 7bb337aeb1 Polish tests 2023-08-08 13:12:47 +02:00
Moritz Halbritter ed9169501e Polish 2023-08-08 13:12:47 +02:00
Stephane Nicoll acf6bb644a Merge branch '3.1.x'
Closes gh-36773
2023-08-07 14:09:07 +02:00
Stephane Nicoll 10fecc855c Merge branch '3.0.x' into 3.1.x
Closes gh-36772
2023-08-07 14:08:57 +02:00
Stephane Nicoll e7706b4201 Merge branch '2.7.x' into 3.0.x
Closes gh-36771
2023-08-07 14:08:48 +02:00
Stephane Nicoll 5e11bac1da Polish "Configure ActiveMQConnectionFactory properly without spring-jms"
See gh-36767
2023-08-07 14:05:31 +02:00
Eddú Meléndez bcfaad2cb8 Configure ActiveMQConnectionFactory properly without spring-jms
Previously, if spring-jms is not available and a non-pool connection
factory is requested (the default), no `CachingConnectionFactory` is
created. This commit makes sure to separate the two conditions, so
that a connection factory can be obtained even if spring-jms is not
on the classpath.

See gh-36767
2023-08-07 14:03:27 +02:00
Moritz Halbritter 1a8b8ce26e Revert "Revise synchronized blocks"
This reverts commit 497bbf9c2d.
2023-08-03 17:26:31 +02:00
Moritz Halbritter d93d05ade2 Revert "Use virtual threads in BackgroundPreinitializer if enabled"
This reverts commit 4bbc336321.
2023-08-03 17:24:56 +02:00
Marc Becker 36e31c0612 Add resource hints for MessageSource
This only registers the default locations, not the one users can provide
via 'spring.messages.basename'.

This is similar to the approach taken for schema.sql and data.sql
in class SqlInitializationScriptsRuntimeHints.

See gh-36682
2023-08-03 12:56:06 +01:00
Andy Wilkinson 8ce5fb5f06 Merge branch '3.1.x'
Closes gh-36701
2023-08-03 12:44:43 +01:00
Andy Wilkinson 664581eb90 Merge branch '3.0.x' into 3.1.x
Closes gh-36700
2023-08-03 12:44:26 +01:00
Andy Wilkinson c6dc505932 Auto-configure JsonpMapper even with user-defined transport
Closes gh-36698
2023-08-03 12:44:13 +01:00
Moritz Halbritter 4bbc336321 Use virtual threads in BackgroundPreinitializer if enabled
Closes gh-36695
2023-08-03 11:16:16 +02:00
Andy Wilkinson 48813a0e5b Merge branch '3.1.x'
Closes gh-36697
2023-08-03 10:11:43 +01:00
Andy Wilkinson 12a2c615a9 Merge branch '3.0.x' into 3.1.x
Closes gh-36696
2023-08-03 10:10:22 +01:00
Andy Wilkinson 803c155e69 Order default customizers so that they can be overridden
Closes gh-36674
2023-08-03 10:09:27 +01:00
Moritz Halbritter 497bbf9c2d Revise synchronized blocks
- Replace synchronized with Lock when guarding long-running operations
- Remove unnecessary synchronization in FileSystemWatcher
- Replace HashMap with ConcurrentHashMap in Restarter
- Remove unnecessary locking on AtomicBoolean in
  SpringApplicationBuilder
- Remove unnecessary locking in SimpleFormatter

Closes gh-36670
2023-08-03 09:23:46 +02:00
Andy Wilkinson 77e382ec64 Polish "Add support for using an AuthTokenManager with Neo4j"
See gh-36650
2023-08-02 14:30:03 +01:00
Michael Simons 1f0a3901b2 Add support for using an AuthTokenManager with Neo4j
Neo4j Java driver introduced support for an `AuthTokenManager` that can
be used to define expiring tokens for authentication with a database.

This commit adds an `ObjectProvider<AuthTokenManager> authTokenManagers`
parameter to the corresponding auto configuration class. If the provider
resolves to a unique object, that `AuthTokenManager` will have precedence
over any static token.

See gh-36650
2023-08-02 14:30:03 +01:00
Stephane Nicoll a223834d57 Polish "Order auto-configured ProblemDetailsExceptionHandler beans"
See gh-36288
2023-08-02 15:28:01 +02:00
Maurice Zeijen 9955ee7e8a Order auto-configured ProblemDetailsExceptionHandler beans
Add `@Order(0)` to the WebMVC and Webflux
`ProblemDetailsExceptionHandler` beans. This makes it easier to create
custom `@ControllerAdvice` beans that must be ordered before or after
the `ProblemDetailsExceptionHandler`.

See gh-36288
2023-08-02 15:27:44 +02:00
Moritz Halbritter 3a9fadf30f Enable virtual threads for Kafka listener
Closes gh-36396
2023-08-02 10:59:19 +02:00
Scott Frederick f2ad08c292 Add since version to deprecated config properties
See gh-36482
2023-08-01 16:13:22 -05:00
Andy Wilkinson 806aa45279 Merge branch '3.1.x'
Closes gh-36661
2023-08-01 18:14:03 +01:00
Andy Wilkinson 0d646d7c26 Polish "Support ServiceConnection beans in slice tests"
See gh-36037
2023-08-01 18:12:53 +01:00
Stephane Nicoll 75bb862255 Remove dead code 2023-08-01 16:51:48 +02:00
Moritz Halbritter 19859a9023 Simplify TaskExecutionAutoConfiguration 2023-08-01 15:40:05 +02:00
Moritz Halbritter 4ba7463d75 Polish 2023-08-01 15:34:52 +02:00
Moritz Halbritter 51008a7d39 Add ThreadPoolTaskSchedulerBuilder and deprecate TaskSchedulerBuilder
Closes gh-36651
2023-08-01 10:32:58 +02:00
Stephane Nicoll 922f66a85d Merge branch '3.1.x'
Closes gh-36654
2023-07-31 17:16:17 +02:00
Michael Simons ef3b99ee51 Fix test declaration in Neo4jAutoConfigurationTests
The test was annotated `@Bean`, must be `@Test`.

See gh-36649
2023-07-31 17:12:57 +02:00
Moritz Halbritter e4c38e59a9 Implement SimpleAsyncTaskExecutorBuilder
The SimpleAsyncTaskExecutorBuilder can be used to create
SimpleAsyncTaskExecutor. It will be auto-configured into the context.
SimpleAsyncTaskExecutorCustomizer can be used to customize the built
SimpleAsyncTaskExecutor.

If virtual threads are enabled:
- SimpleAsyncTaskExecutor will use virtual threads
- SimpleAsyncTaskExecutorBuilder will be used as the application task
  executor

A new property 'spring.task.execution.simple.concurrency-limit' has been
added to control the concurrency limit of the SimpleAsyncTaskExecutor

Closes gh-35711
2023-07-31 14:08:00 +02:00
Moritz Halbritter 32c91af440 Add ThreadPoolTaskExecutorBuilder and deprecate TaskExecutorBuilder
Closes gh-36637
2023-07-31 11:51:17 +02:00
Moritz Halbritter 1347b998e6 Remove @ConditionalOnVirtualThreads
See gh-36624
See gh-35892
2023-07-28 14:28:16 +02:00
Moritz Halbritter 9e212875c3 Remove VirtualThreads bean
Reverts eeb1e1fc35

See gh-36615
See gh-36387
2023-07-28 14:28:15 +02:00
Moritz Halbritter bf48819222 Implement @ConditionalOnThreading
Closes gh-36624
2023-07-28 14:28:15 +02:00
Moritz Halbritter b1a3dad16c Configure virtual threads on the RabbitMQ listener
Closes gh-36387
2023-07-27 16:32:53 +02:00
Moritz Halbritter eeb1e1fc35 Add VirtualThreads bean and auto-configuration
This bean is only in the context if virtual threads are enabled. It can
be used to get access to the virtual thread executor.
2023-07-27 16:32:51 +02:00
Moritz Halbritter 3cc9a3bb32 Remove duplicate applicationTaskExecutor bean method
See gh-35710
2023-07-27 11:27:29 +02:00
Moritz Halbritter 39f6b85039 Polish 2023-07-27 09:14:04 +02:00
Moritz Halbritter 9cb5763794 Add property to set changeConsumerThreadName for Kafka
Closes gh-36343
2023-07-26 13:59:19 +02:00
Moritz Halbritter 49ae8c0998 Auto-configure Kafka's threadNameSupplier
Closes gh-36344
2023-07-26 13:59:19 +02:00
Stephane Nicoll b0438b0f03 Polish "Allow custom RSocket WebsocketServerSpecs to be defined"
See gh-29567
2023-07-26 13:45:26 +02:00
Leo Li f840141652 Allow custom RSocket WebsocketServerSpecs to be defined
See gh-29567
2023-07-26 13:42:06 +02:00
Stephane Nicoll 54066791f9 Polish "Add RabbitMQ container forceStop property"
See gh-36539
2023-07-26 11:20:36 +02:00
Gary Russell 8b716a2f6c Add RabbitMQ container forceStop property
See gh-36539
2023-07-26 11:16:52 +02:00
Johnny Lim 96c9915f12 Polish
See gh-36565
2023-07-26 10:00:56 +02:00
Andy Wilkinson b476d368db Polish "Make HikariDataSource participate in checkpoint-restore"
See gh-36422
2023-07-25 17:19:58 +01:00
Christoph Strobl 9240f971fb Make HikariDataSource participate in checkpoint-restore
See gh-36422
2023-07-25 16:27:56 +01:00
Andy Wilkinson 14d2675aab Add `@ConditionalOnCheckpointRestore`
Closes gh-36536
2023-07-25 16:27:46 +01:00
Moritz Halbritter 6050fff078 Auto-configure observability for R2DBC
The new ConnectionFactoryDecorator can be used to decorate the
ConnectionFactory built by the ConnectionFactoryBuilder.

The new R2dbcObservationAutoConfiguration configures a
ConnectionFactoryDecorator to attach a ObservationProxyExecutionListener
to ConnectionFactories. This enables Micrometer Observations for R2DBC
queries.

Closes gh-33768
2023-07-25 17:01:55 +02:00
Stephane Nicoll d04daf9184 Merge branch '3.1.x'
Closes gh-36533
2023-07-24 16:32:10 +02:00
Stephane Nicoll a607056b98 Merge branch '3.0.x' into 3.1.x
Closes gh-36532
2023-07-24 16:31:56 +02:00
Stephane Nicoll 259fac57a9 Merge branch '2.7.x' into 3.0.x
Closes gh-36531
2023-07-24 16:29:56 +02:00
Stephane Nicoll 854c162966 Polish "Fail fast if job name does not exist"
See gh-36060
2023-07-24 16:21:44 +02:00
Akshay Dubey c38cd74542 Fail fast if job name does not exist
See gh-36060
2023-07-24 16:15:04 +02:00
Stephane Nicoll 740ed18fa7 Merge branch '3.1.x'
Closes gh-36530
2023-07-24 16:10:20 +02:00
Stephane Nicoll 89066b4d1e Merge branch '3.0.x' into 3.1.x
Closes gh-36529
2023-07-24 16:09:32 +02:00
Stephane Nicoll 73cc54ad34 Prevent PostConstruct to be used in production code
Closes gh-36528
2023-07-24 16:08:50 +02:00
Christoph Dreis 343c9c6f7e Remove references to Atomikos and Bitronix
See gh-35562
2023-07-21 16:23:14 +01:00
Andy Wilkinson 290ef3ccf6 Merge branch '3.1.x'
Closes gh-36493
2023-07-21 15:28:23 +01:00
Andy Wilkinson c38bca04c4 Merge branch '3.0.x' into 3.1.x
Closes gh-36492
2023-07-21 15:28:02 +01:00
Andy Wilkinson 6a2a3e2b26 Merge branch '2.7.x' into 3.0.x
Closes gh-36491
2023-07-21 15:06:34 +01:00
Andy Wilkinson 5a0f1bbe9b Polish "Correct description of overrides for spring.redis.url"
See gh-36477
2023-07-21 14:47:54 +01:00
Johnny Lim 1effd3723f Correct description of overrides for spring.redis.url
See gh-36477
2023-07-21 14:47:25 +01:00
Andy Wilkinson 3affb3342e Deprecate auto-configuration for InfluxDB
Closes gh-35190
2023-07-20 13:31:10 +01:00
Stephane Nicoll 311fa6272d Polish "Add service connection for Testcontainers ActiveMQ"
This also adds support for Docker Compose.

See gh-35080
2023-07-20 13:03:41 +02:00
Eddú Meléndez 63121dd08a Add service connection for Testcontainers ActiveMQ
See gh-35080
2023-07-20 13:03:41 +02:00
Moritz Halbritter 54e99d68fa Auto-configure ObservationRegistry on ScheduledTaskRegistrar
The TaskSchedulingAutoConfiguration.taskScheduler auto-configuration now
no longer backs off on SchedulingConfigurer beans.

Closes gh-36119
2023-07-20 09:43:12 +02:00
Andy Wilkinson e0d021b710 Merge branch '3.1.x'
Closes gh-36446
2023-07-18 21:16:49 +01:00
Andy Wilkinson fe123e5b10 Fix handling of additional-hosts with Mongo
Closes gh-36441
2023-07-18 21:15:20 +01:00
Andy Wilkinson 283dc37db3 Make AnnotatedControllerConfigurer use applicationTaskExecutor
Closes gh-36388
2023-07-18 15:35:31 +01:00
Stephane Nicoll c6e47b86d7 Move Flyway configuration extension properties to dedicated namespace
This commit harmonizes the handling of ConfigurationExtension for
Flyway. The existing Oracle and SQLServer extensions are now mapped from
flway.oracle and flyway.sqlserver, respectively. The existing properties
have been deprecated in favor of the new location.

Closes gh-36444
2023-07-18 16:15:50 +02:00
Stephane Nicoll 8da706603e Add support for flyway.postgresql.transactional.lock
Closes gh-32629
2023-07-18 15:44:38 +02:00
Stephane Nicoll 71406977c2 Harmonize configuration of Flyway SQL Server extension
Closes gh-36440
2023-07-18 13:58:18 +02:00
Stephane Nicoll fb640c04e7 Upgrade to Flyway 9.20.1
Closes gh-36364

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
2023-07-18 13:58:17 +02:00
Andy Wilkinson d205d10519 Configure WebFlux's blocking execution to use applicationTaskExecutor
Closes gh-36331
2023-07-18 11:18:25 +01:00
Stephane Nicoll c19a0a76c0 Merge branch '3.1.x'
Closes gh-36421
2023-07-17 13:23:15 +02:00
Johnny Lim 9b38db6672 Polish PemSslBundleProperties
See gh-36281
2023-07-17 13:22:27 +02:00
Andy Wilkinson f33874e98e Allow auto-configured applicationTaskExecutor to use virtual threads
With this commit, when virtual threads are enabled, the auto-configured
applicationTaskExecutor changes from a ThreadPoolTaskExecutor to a
SimpleAsyncTaskExecutor with virtual threads enabled.

As before, any TaskDecorator bean is applied to the auto-configured
executor and the spring.task.execution.thread-name-prefix property is
applied. Other spring.task.execution.* properties are ignored as they
are specific to a pool-based executor.

Closes gh-35710
2023-07-17 10:01:16 +01:00
Stephane Nicoll 783bfb62e2 Merge branch '3.1.x'
Closes gh-36420
2023-07-17 10:04:14 +02:00
Stephane Nicoll d2912c6442 Update copyright year of changed files
See gh-36306
2023-07-17 09:40:57 +02:00
Christoph Dreis 8321887d6a Fix typos
See gh-36306
2023-07-17 09:40:16 +02:00
Andy Wilkinson f2a50919a9 Merge branch '3.1.x'
Closes gh-36410
2023-07-14 10:42:28 +01:00
Andy Wilkinson 3f4474031f Merge branch '3.0.x' into 3.1.x
Closes gh-36409
2023-07-14 10:42:05 +01:00
Pengfei-Lu 8697d9ddd5 Correct conditions on auto-configured JacksonJsonpMapper
See gh-36109

Signed-off-by: Pengfei-Lu <459360594@qq.com>
2023-07-13 18:10:21 +01:00
Andy Wilkinson 07be2990a2 Merge branch '3.1.x'
Closes gh-36294
2023-07-10 13:52:57 +01:00
Andy Wilkinson 0d06747b41 Fix problem with @ and : chars in Mongo username and password
Fixes gh-36261
2023-07-10 13:35:08 +01:00
Andy Wilkinson 3b90919313 Polish RestClient auto-config and tests
For consistency, replace webClient and WebClient with restClient and
RestClient. This also address a bean name clash between
RestClientAutoConfiguration's RestClient.Builder bean and
WebClientAutoConfiguration's WebClient.Builder bean that were both
previously named webClientBuilder.
2023-07-06 12:22:54 +01:00
Spencer Gibb 89880a773c Add RestClientAutoConfiguration to AutoConfiguration.imports
See gh-36249
2023-07-06 11:38:48 +01:00
Phillip Webb cfdc173e34 Add RestClient SSL support
Add `RestClientSsl` support class to help apply an `SslBundle` to a
`RestClient.Builder`.

See gh-36213
2023-07-05 21:22:52 +01:00
Phillip Webb 5e01c66552 Add RestClient HttpMessageConverters support
Update `RestClientAutoConfiguration` to apply `HttpMessageConverters`
configuration.

See gh-36213
2023-07-05 21:17:42 +01:00
Phillip Webb 2d2f050262 Polish 'Add initial support for RestClient'
See gh-36213
2023-07-05 21:17:23 +01:00
Arjen Poutsma a1a5acf128 Add initial support for RestClient
Introduce initial support for Spring Framework's `RestClient`, in the
form of a `RestClientCustomizer` and `RestClientAutoConfiguration`.

See gh-36213
2023-07-05 21:16:02 +01:00
Andy Wilkinson 4feaa28fd1 Polish "Support custom token validators for OAuth2"
See gh-35874
2023-07-05 14:01:08 +01:00
Roman Golovin 7500dab321 Support custom token validators for OAuth2
See gh-35874
2023-07-05 11:48:48 +01:00
Andy Wilkinson ce8253ea95 Merge branch '3.1.x'
Closes gh-36238
2023-07-05 09:51:35 +01:00
Andy Wilkinson c9f8d92656 Merge branch '3.0.x' into 3.1.x
Closes gh-36237
2023-07-05 09:47:43 +01:00
Andy Wilkinson 2350d9c870 Adapt to Data changes missed due to predictive test selection
See gh-36190
2023-07-04 12:39:52 +01:00
Andy Wilkinson 5a9ca67fba Start building against Spring Framework 6.2.0-M2 snapshots
See gh-36198
2023-07-04 10:20:33 +01:00
Andy Wilkinson ec8e1e2c95 Start building against Spring Data Bom 2023.1.0 snapshots
See gh-36190
2023-07-04 09:44:53 +01:00
Phillip Webb 77245c3bd0 Merge branch '3.1.x'
Closes gh-36164
2023-07-02 19:47:24 +01:00
Phillip Webb 1f68db06ba Merge branch '3.0.x' into 3.1.x
Closes gh-36163
2023-07-02 19:47:17 +01:00
Phillip Webb f1b0d76d9b Merge branch '2.7.x' into 3.0.x
Closes gh-36162
2023-07-02 19:46:45 +01:00
Phillip Webb b6990940b1 Polish 'Choose SAML party based on entity ID rather than always using first'
See gh-35902
2023-07-02 19:02:08 +01:00
Lasse Lindqvist 864af59adc Choose SAML party based on entity ID rather than always using first
Update `Saml2RelyingPartyRegistrationConfiguration` so that
`RelyingPartyRegistrations` uses `collectionFromMetadataLocation`
rather than `fromMetadataLocation` and searches candidates for a
matching entity ID.

Prior to this commit, it was possible for the wrong provider to be
used if multiple candidates existed in the returned metadata.

See gh-35902
2023-07-02 18:54:34 +01:00
Andy Wilkinson 8fa80426b4 Merge branch '3.1.x'
Closes gh-36133
2023-06-30 11:26:49 +01:00
Johnny Lim 58a9961a31 Name methods consistently in KafkaConnectionDetails
See gh-35733
2023-06-30 11:26:25 +01:00
Scott Frederick c22cbb0e2d Merge branch '3.1.x'
Closes gh-36124
2023-06-29 16:55:19 -06:00
Scott Frederick 0a51c466f4 Merge branch '3.0.x' into 3.1.x
Closes gh-36123
2023-06-29 16:54:45 -06:00
Andy Wilkinson abaade28ea Merge branch '3.1.x'
Closes gh-36122
2023-06-29 18:10:52 +01:00
Andy Wilkinson e2f8fcf292 Merge branch '3.0.x' into 3.1.x
Closes gh-36121
2023-06-29 18:10:33 +01:00
Andy Wilkinson 6effd6061c Provide hints when template auto-config is excluded
Fixes gh-35682
2023-06-29 18:09:30 +01:00
Andy Wilkinson b5a131d966 Merge branch '3.1.x'
Closes gh-36100
2023-06-27 20:31:16 +01:00
Andy Wilkinson ba8b1717fb Merge branch '3.0.x' into 3.1.x
Closes gh-36099
2023-06-27 20:30:47 +01:00
Andy Wilkinson 79cd3a027a Merge branch '2.7.x' into 3.0.x
Closes gh-36098
2023-06-27 20:30:24 +01:00
Andy Wilkinson 9e1f2c4257 Tolerate Flway 9.20
Closes gh-36029
2023-06-27 20:22:24 +01:00
Andy Wilkinson 98d459d76c Revert "Merge branch '3.1.x'"
See gh-36092
2023-06-27 14:16:20 +01:00
Andy Wilkinson 6851904651 Merge branch '3.1.x'
Closes gh-36092
2023-06-27 14:03:09 +01:00
Andy Wilkinson 9a57611ef5 Merge branch '3.0.x' into 3.1.x
Closes gh-36091
2023-06-27 14:02:57 +01:00
Andy Wilkinson ffbef7bb80 Test server.max-http-request-header-size with Undertow
Closes gh-36047
2023-06-27 13:50:04 +01:00
Andy Wilkinson b645eb32ac Remove deprecated code that was to be removed in 3.2
Closes gh-36034
2023-06-23 18:14:22 +01:00
Andy Wilkinson 357c67a999 Merge branch '3.1.x' 2023-06-23 15:58:51 +01:00
Andy Wilkinson 3f7fe25cb9 Merge branch '3.0.x' into 3.1.x
Closes gh-36044
2023-06-23 15:58:36 +01:00
Andy Wilkinson 2fae5de245 Merge branch '2.7.x' into 3.0.x
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
See gh-35915
2023-06-23 12:38:12 +01:00
ThomazPassarelli f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking
See gh-35915
2023-06-23 12:16:26 +01:00
Phillip Webb 212acf44f7 Merge branch '3.1.x' 2023-06-21 12:28:20 -07:00
Phillip Webb 7a2fc9e636 Fix checkstyle violation
See gh-35914
2023-06-21 12:27:56 -07:00
Phillip Webb 2ce36b15b3 Merge branch '3.1.x' 2023-06-21 12:11:07 -07:00
Phillip Webb 3c7fbf3423 Polish 'Apply SslConfigurer in addition to configured mappers'
See gh-35914
2023-06-21 12:10:36 -07:00
Fernando Cappi e6b5322f3e Apply SslConfigurer in addition to configured mappers
Update `ReactorClientHttpConnectorFactory` to that SSL configuration
is applied in addition to any configured mappers.

Prior to this commit, SSL configuration would prevent configured
mappers from being applied.

See gh-35914
2023-06-21 12:10:36 -07:00
Andy Wilkinson 295702003d Merge branch '3.1.x' 2023-06-21 15:29:38 +01:00
Andy Wilkinson 7266d4863b Merge branch '3.0.x' into 3.1.x
Closes gh-36009
2023-06-21 15:29:23 +01:00
Andy Wilkinson 39c382713b Initialize WebSocket infrastructure when using WebFlux and Jetty
In Spring Framework 5.x with Jetty 9, the reactive
JettyRequestUpgradeStrategy was able to initialize Jetty's WebSocket
infrastructure itself. With Jetty 10 this is no longer possible and
Boot must perform the initialization as part of preparing the
reactive JettyWebServer.

This commit updates the reactive WebSocket auto-configuration to
initialize Jetty's WebSocket infrastructure as part of creating the
reactive JettyWebServer.

Fixes gh-33347
2023-06-21 14:59:50 +01:00
Andy Wilkinson 1e17d8eeea Upgrade to Liquibase 4.22.0
Closes gh-35956
2023-06-19 16:30:52 +01:00
Andy Wilkinson 454aae92d6 Upgrade to Flyway 9.19.4
Closes gh-35948
2023-06-19 16:07:41 +01:00
Phillip Webb 23eb7ec1f8 Merge branch '3.1.x' 2023-06-16 14:35:44 -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
Phillip Webb 854b29b8fb Polish 2023-06-16 14:32:14 -07:00
Phillip Webb 13f16da716 Merge branch '3.1.x' 2023-06-16 14:00:12 -07:00
Phillip Webb baddf4c857 Merge branch '3.0.x' into 3.1.x 2023-06-16 13:54:01 -07:00
Jonatan Ivanov 85934c3919
Merge branch '3.1.x'
Closes gh-35930
2023-06-16 13:03:08 -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
Andy Wilkinson 2c06f274dc Merge branch '3.1.x' 2023-06-15 12:21:08 +01: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
Moritz Halbritter 140c37ceba Enable virtual threads on Jetty
Closes gh-35703
2023-06-15 11:01:11 +02:00
Moritz Halbritter 3e4a9f5204 Add property to limit maximum connections for Jetty
Closes gh-35899
2023-06-15 09:42:51 +02:00
Moritz Halbritter f81787e65d Enable virtual threads on Tomcat
Closes gh-35704
2023-06-15 08:30:09 +02:00
Moritz Halbritter 6e604ad65c Implement @ConditionalOnVirtualThreads
Closes gh-35892
2023-06-15 08:30:09 +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
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
Andy Wilkinson 39276f8302 Adapt to deprecation of rejectIllegalHeader
Closes gh-35442
2023-06-09 15:48:18 +02: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 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
Yanming Zhou 7a5f6d4123 Expose spring.ssl bundle keys
See gh-35667
2023-06-06 17:50:47 +02: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 e9cd0c1f3a Restore compatibility with Flyway 9.0.x
Closes gh-35721
2023-06-05 20:48:46 +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
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
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 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
Stephane Nicoll 7a9bb55fdf Merge branch '3.0.x'
Closes gh-35589
2023-05-22 16:24:56 +02:00
Eddú Meléndez a3caf8102e Polish
See gh-35577
2023-05-22 15:43:14 +02: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 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 ae90add7c7 Polish 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
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
Johnny Lim 4239b96943 Polish
See gh-35417
2023-05-15 11:33:10 +02:00
Johnny Lim e4bf2187bc Revert accidental author changes in FlywayAutoConfiguration
See commit 7ffacf43f3

See gh-35418
2023-05-15 11:27:37 +02:00
Moritz Halbritter aa0fa42ebd Merge branch '3.0.x'
Closes gh-35425
2023-05-15 11:22:13 +02:00
Moritz Halbritter 9e963bce58 Add Hibernate runtime hints
This adds hints for the two No JtaPlatform candidates as well as for
the naming strategies.

Closes gh-35423
2023-05-15 11:12:02 +02:00
Phillip Webb e3ed87d165 Merge branch '3.0.x' 2023-05-12 13:21:52 -07:00
Phillip Webb 92e420a098 Merge branch '2.7.x' into 3.0.x 2023-05-12 13:14:12 -07:00
Phillip Webb e9c4a5d663 Polish 2023-05-12 13:01:30 -07:00
Moritz Halbritter b70399e998 Merge branch '3.0.x' 2023-05-12 12:03:32 +02:00
Moritz Halbritter 7b4056df7f Merge branch '2.7.x' into 3.0.x 2023-05-12 12:00:11 +02:00
Moritz Halbritter 700e89097c Polish
See https://stackoverflow.com/questions/28671903/the-hashsett-removeall-method-is-surprisingly-slow
2023-05-12 11:57:33 +02:00
Steve Riesenberg 10feecbd08 Fix redirect to login page for token requests
Fixes an issue where auto-configuration for Spring Authorization Server
was overriding the default exception handling (AuthenticationEntryPoint)
resulting in anonymous requests to the token endpoint being redirected
to the Spring Security login page instead of returning 401 Unauthorized.

Auto-configuration now registers a defaultAuthenticationEntryPointFor
that is added to any other entry points already configured.

See gh-35368
2023-05-10 11:32:06 +02:00
Christoph Dreis 6086e81ccd Fix configuring replica set via PropertiesMongoConnectionDetails
See gh-35370
2023-05-10 11:23:19 +02:00
Moritz Halbritter 9f787050b4 Merge branch '3.0.x'
Closes gh-35381
2023-05-10 11:08:33 +02:00
Moritz Halbritter 53d2a9fb34 Merge branch '2.7.x' into 3.0.x
Closes gh-35380
2023-05-10 10:58:03 +02:00
Moritz Halbritter ec4d52e381 Add ReactiveResponseConsumer classpath check to http5 auto-configuration
Closes gh-34964
2023-05-10 10:47:08 +02:00
Moritz Halbritter 0ebb32e7f0 Merge branch '3.0.x'
Closes gh-35379
2023-05-10 10:28:57 +02:00
Moritz Halbritter 7e50485b23 Merge branch '2.7.x' into 3.0.x
Closes gh-35378
2023-05-10 10:28:47 +02:00
Moritz Halbritter 947ac8df73 Map MinIdle and MaxValidationTime to R2DBC pools
Closes gh-34724
2023-05-10 10:16:43 +02:00
Stefano Cordio d802ca017b Small assertions improvements
See gh-34796
2023-05-10 08:38:07 +02:00
Johnny Lim ff9fd1abeb Polish
See gh-35185
2023-05-10 08:31:36 +02:00
Christoph Dreis 2d1a403605 Fix javadoc in OAuth2AuthorizationServerPropertiesMapper
See gh-35366
2023-05-09 16:38:45 +01:00
Andy Wilkinson 2b6b178560 Merge branch '3.0.x'
Closes gh-35362
2023-05-09 12:24:04 +01:00
Andy Wilkinson 6c1c8fb405 Merge branch '2.7.x' into 3.0.x
Closes gh-35361
2023-05-09 12:23:49 +01:00
Andy Wilkinson 7427e2d527 Polish "Fix test for backing off when a TransactionManager is already defined"
See gh-35336
2023-05-09 12:04:38 +01:00
davin111 cf5500fc78 Fix test for backing off when a TransactionManager is already defined
See gh-35336
2023-05-09 12:03:06 +01:00
Scott Frederick a474e54cf3 Merge branch '3.0.x'
Closes gh-35244
2023-05-05 16:20:41 -05:00
Scott Frederick cf180fa1cc Merge branch '2.7.x' into 3.0.x
Closes gh-35243
2023-05-05 16:07:23 -05:00
Scott Frederick 5d91c24f63 Update Couchbase image tag used in tests
Closes gh-35228
2023-05-05 14:45:58 -05:00
Marc Leroux b61834c92d Replace Mockito argument captors with assertArg
See gh-35015
2023-05-05 11:34:55 +02:00
Scott Frederick 1143396531 Add smoke tests to verify Couchbase SSL connections
See gh-34811
2023-05-04 17:09:52 -05:00
Scott Frederick d4107a8185 Add smoke tests to verify Cassandra SSL connections
See gh-25602
2023-05-04 16:11:28 -05:00
Phillip Webb 8e18862582 Merge branch '3.0.x' 2023-05-02 15:41:26 -07:00
Phillip Webb 8d1fb3be4f Fix index error on test
See gh-35241
2023-05-02 15:41:07 -07:00
Phillip Webb a890323758 Merge branch '3.0.x' 2023-05-02 14:52:42 -07:00
Phillip Webb 0f242ab3f7 Merge branch '2.7.x' into 3.0.x 2023-05-02 14:52:16 -07:00
Phillip Webb 6b646f6a8e Update copyright year of changed files 2023-05-02 14:52:12 -07:00
Phillip Webb cd5f0dff21 Merge branch '3.0.x'
Closes gh-35242
2023-05-02 14:51:24 -07:00
Phillip Webb 722cbc66c6 Merge branch '2.7.x' into 3.0.x
Closes gh-35241
2023-05-02 14:51:13 -07:00
Phillip Webb 5ef0ee0ed4 Prevent early initialization of SessionRepository beans
Replace `SessionRepositoryFilterConfiguration` filter registration bean
with a `DelegatingFilterProxyRegistrationBean` so that
`SessionRepository` beans are not initialized early.

Fixes gh-35240
2023-05-02 14:47:15 -07:00
Scott Frederick 3bb271e320 Add smoke test to verify Redis SSL connection
See gh-34815
2023-05-02 13:52:50 -05:00
Andy Wilkinson aafe343ce6 Merge branch '3.0.x'
Closes gh-35237
2023-05-02 16:19:54 +01:00
Andy Wilkinson 9a39bf284b Merge branch '2.7.x' into 3.0.x
Closes gh-35235
2023-05-02 16:19:30 +01:00
Andy Wilkinson 7c2c2ebb1b Make ApplicationAvailabilityBean receive events with lazy init
Fixes gh-35161
2023-05-02 16:19:08 +01:00
Moritz Halbritter 735c43ce9b Merge branch '2.7.x' into 3.0.x 2023-05-02 14:38:48 +02:00
Moritz Halbritter 312f0c17ed Set initial ElasticSearch heap size in integration tests 2023-05-02 14:37:13 +02:00
Moritz Halbritter 944d77491b Set initial heap size for ElasticSearch integration tests 2023-05-02 14:25:35 +02:00
Moritz Halbritter 1ce88f25b4 Merge branch '3.0.x' 2023-05-02 14:08:37 +02:00
Moritz Halbritter 037cb8c5b0 Merge branch '2.7.x' into 3.0.x 2023-05-02 13:57:37 +02:00
Moritz Halbritter c1cef099d2 Limit maximum heap of ElasticSearch in tests 2023-05-02 13:40:59 +02:00
Moritz Halbritter d7a9f87b64 Disable Neo4j tests on aarch64 linux and mac
See gh-35228
2023-05-02 13:40:59 +02:00
Moritz Halbritter 9f109fe785 Disable Couchbase integration tests on aarch64 linux and mac
See gh-35228
2023-05-02 13:40:59 +02:00
Andy Wilkinson 419d8c22b2 Merge branch '3.0.x'
Closes gh-35231
2023-05-02 11:58:58 +01:00
Andy Wilkinson 8f291abc2b Merge branch '2.7.x' into 3.0.x
Closes gh-35230
2023-05-02 11:58:33 +01:00
Juhan Aasaru 3b70286747 Correct list of annotations equivalent to @SpringBootApplication
See gh-35180
2023-05-02 11:57:18 +01:00
Andy Wilkinson b1d0433d74 Handle Kafka servers as strings and rely on Kafka's parsing
Closes gh-34770
2023-05-02 08:38:40 +01:00
Phillip Webb fc5339f81c Polish 2023-04-30 23:27:06 -07:00
Phillip Webb 403481ff96 Add 'required' parameter to ConnectionDetailsFactories
Update `ConnectionDetailsFactories` so that callers can now declare if
a result is required or not and improve exception hierarchy.

See gh-35168
2023-04-29 21:10:07 -07:00
Andy Wilkinson 09527995d1 Polish 2023-04-28 17:56:12 +01:00
Moritz Halbritter 176cc20c36 Polish FlywayConfiguration 2023-04-28 13:15:39 +02:00
Moritz Halbritter 27ab98b49d Polish ConnectionDetailsFactories 2023-04-28 13:15:39 +02:00
Andy Wilkinson d7da77bda8 Remove support for service connections to InfluxDB
Closes gh-35189
2023-04-28 09:49:39 +01:00
Scott Frederick 428434c873 Polish SslOptions usage
Change getter methods to return arrays, as this is how most client
library usages need the options.

See gh-34814
2023-04-27 16:37:46 -05:00
Scott Frederick 226c3005d4 Add SSL bundle support to Redis auto-configuration
Update Redis auto-configuration with Lettuce and Jedis drivers to
allow SSL configuration with an SSL bundle.

Closes gh-34815
2023-04-27 15:24:55 -05:00
Andy Wilkinson 9a0b5e0178 Merge branch '3.0.x'
Closes gh-35173
2023-04-26 12:48:50 +01:00
Andy Wilkinson 7ee1622995 Merge branch '2.7.x' into 3.0.x
Closes gh-35172
2023-04-26 12:48:16 +01:00
Andy Wilkinson 6b9bc012a5 Check that BPP and BFPP bean methods won't cause eager initialization
Closes gh-35164
2023-04-26 11:47:03 +01:00
Phillip Webb b5c9e7c06a Polish SslOptions usage
Add helper method and tighten usage so that exceptions are thrown when
options cannot be applied.

See gh-34814
2023-04-25 22:39:47 -07:00
Phillip Webb 423c60acfa Add SSL bundle support to Elasticsearch auto-configuration
Update Elasticsearch RestClient auto-configuration so that an SSL
can be configured via an SSL bundle.

Closes gh-35155
2023-04-25 17:20:05 -07:00
Phillip Webb 19221f00f3 Deprecate `spring.cassandra.ssl` configuration property
Deprecate the `spring.cassandra.ssl` configuration property in favor
of `spring.cassandra.ssl.enabled`.

See gh-25602
2023-04-24 16:39:55 -07:00
Scott Frederick ff35cc80d7 Allow Couchbase SSL to be enabled without custom trust material
Closes gh-35147
2023-04-24 14:51:58 -05:00
Scott Frederick 1d44b45b5d Deprecate Couchbase SSL keyStore properties
The properties `spring.couchbase.env.ssl.key-store`
and `spring.couchbase.env.ssl.key-store-password`
are deprecated in favor of configuring an SSL bundle with
`spring.couchbase.env.ssl.bundle`. The older properties
have somewhat confusing names, since they are used to
configure a trust store in Couchbase, and they don't
provide all the options that an SSL bundle provides.

Closes gh-35135
2023-04-24 14:45:40 -05:00
Andy Wilkinson 9cd04c55fb Merge branch '3.0.x'
Closes gh-35132
2023-04-24 16:01:51 +01:00
Andy Wilkinson 598e090e8f Merge branch '2.7.x' into 3.0.x
Closes gh-35131
2023-04-24 15:07:43 +01:00
Andy Wilkinson 90952a2dd9 Do not turn a null Flyway-specific password into an empty string
It prevents using PGPASS for authentication with Postgres.

Fixes gh-35110
2023-04-24 14:44:04 +01:00
Andy Wilkinson 7ffacf43f3 Use main DataSource when there are no migration-specific conn details
Fixes gh-35109
2023-04-24 13:18:56 +01:00
Phillip Webb 6ea2547de4 Add SSL bundle support to WebClient auto-configuration
Introduce `WebClientSsl` interface and auto-configuration to allow a
WebClient builder to have custom SSL configuration applied.

The previous `ClientHttpConnectorConfiguration` has been been changed
to now create `ClientHttpConnectorFactory` instances which can be used
directly or by `AutoConfiguredWebClientSsl`.

Closes gh-18556
2023-04-21 20:39:18 -07:00
Phillip Webb c59c8cc674 Change SslOptions to use null for defaults rather than empty sets
Update `SslOptions` so that `null` is used for default values rather
than empty sets. Most libraries use `null` to indicate defaults so
aligning our class makes things easier.

See gh-34814
2023-04-21 16:18:44 -07:00
Scott Frederick fd5fd1491a Add SSL bundle support to MongoDB auto-configuration
Update MongoDB auto-configuration so that an SSL can be configured
via an SSL bundle.

Closes gh-35042
2023-04-21 01:13:09 -07:00
Scott Frederick 1618aa2dac Add SSL bundle support to Couchbase auto-configuration
Update Couchbase auto-configuration so that an SSL can be configured
via an SSL bundle.

Closes gh-34811
2023-04-21 01:13:09 -07:00
Scott Frederick 682457377a Add SSL bundle support to Cassandra auto-configuration
Update Cassandra auto-configuration so that an SSL can be configured
via an SSL bundle.

Closes gh-25602
2023-04-21 01:13:09 -07:00
Scott Frederick 66db13b962 Refactor web server support to use SslBundles
Update Tomcat, Jetty, Undertow and Netty servers so that an SslBundle
is used to apply SSL configuration. Existing `Ssl` properties are
internally adapted to an `SslBundle` using the `WebServerSslBundle`
class. Additionally, if `Ssl.getBundle()` returns a non-null value the
the `SslBundles` bean will be used to find a registered bundle by name.

See gh-34814
2023-04-21 01:02:47 -07:00
Scott Frederick 8e1f24f98f Add SSL bundle auto-configuration support
Add auto-configuration for SSL bundles including new configuration
properties that can be used to define a bundle.

SSL bundle properties are provided under the `spring.ssl.bundle` key.
Currently `jks` and `pem` variants are support. Both are configured
as a `Map` where the bundle name is the key.

A typical example would be:

    spring:
      ssl:
        bundle:
          pem:
            mybundle
              key:
                password: secret
              keystore:
                certificate: classpath:mycert.pem
                private-key: classpath:mykey.pem

A `SslBundleRegistrar` interface is also provided to allow programmatic
contributions to the auto-configured `SslBundleRegistry`.

See gh-34814
2023-04-21 01:01:54 -07:00
Andy Wilkinson cbc03783d0 Allow startup to contiune when ConnectionDetailsFactory load fails
Prior to this commit, a failure to load a ConnectionDetailsFactory
caused startup to fail. This causes problems when some of a
factory's required classes were not available, for examle when using
spring-boot-docker-compose without Actuator.

Fixes gh-35100
2023-04-20 15:00:46 +01:00
Andy Wilkinson a03fe8befc Enable customization of JWK Set URI decoder builders
Closes gh-20750
2023-04-19 17:23:53 +01:00
Stephane Nicoll 366f7a85c9 Merge branch '3.0.x'
Closes gh-35069
2023-04-19 18:01:43 +02:00
Stephane Nicoll 6933796f2a Merge branch '2.7.x' into 3.0.x
Closes gh-35068
2023-04-19 18:01:16 +02:00
Stephane Nicoll 1b832d82f8 Polish "Back off if a custom ApplicationAvailability bean is present"
See gh-34347
2023-04-19 17:25:10 +02:00
Taeik Lim 5e95ba8448 Back off if a custom ApplicationAvailability bean is present
See gh-34347
2023-04-19 17:24:59 +02:00
Andy Wilkinson f5e654748c Polish "Add customizer for conversion service used by Spring Batch"
See gh-34769
2023-04-19 14:15:08 +01:00
Claudio Nave cafa6f5d9c Add customizer for conversion service used by Spring Batch
See gh-34769
2023-04-19 13:25:31 +01:00
Stephane Nicoll a323bd90a8 Polish "Reintroduce support for ActiveMQ"
See gh-35048
2023-04-19 13:08:14 +02:00
Martin BENDA 3e9908a797 Reintroduce support for ActiveMQ
See gh-35048
2023-04-19 11:00:40 +02:00
Andy Wilkinson 7b3e687f05 Deprecate OAuth2ClientPropertiesRegistrationAdapter
This commit deprecates OAuth2ClientPropertiesRegistrationAdapter as
it wasn't really an adapter because it provides a static utility
method rather than adapting one contract to another. A replacement,
OAuth2ClientPropertiesMapper, is introduced that maps the OAuth2
client properties to the required types.

Closes gh-34714
2023-04-18 20:43:34 +01:00
Andy Wilkinson 4eb7558707 Polish "Add properties to support device grant"
See gh-34957
2023-04-18 19:34:13 +01:00
Steve Riesenberg 25b582c822 Add properties to support device grant
This commit adds the following properties under
spring.security.oauth2.authorizationserver.client.[registration-id]:

* endpoint.device-authorization-uri
* endpoint.device-verification-uri
* token.device-code-time-to-live

See gh-34957
2023-04-18 19:15:12 +01:00
Andy Wilkinson e2ee1ed50d Fix password handling in Flyway auto-configuration
Previously, FlywayProperties returned an empty string when its
password had not been set. This prevented the desired fallback to
JdbcConnectionDetails.

Fixes gh-35046
2023-04-18 11:52:50 +01:00
Phillip Webb 81a972af8d Refactor testcontainers service connections
Update restcontainers service connections support so that
technology specific `@ServiceConnector` annotations are not longer
required.

A single `@ServiceConnector` annotation can now be used to create
all `ConnectionDetail` beans.

Closes gh-35017
2023-04-17 00:45:39 -07:00
Phillip Webb 2951cc7594 Polish 2023-04-17 00:42:28 -07:00
Phillip Webb 1849b82334 Don't apply configuration-properties from auto-configuration plugin
Update the auto-configuration gradle plugin so that the
configuration-properties plugin is not longer automatically applied.
This  allows us to have auto-configuration modules that don't ship
configuration properties.

Closes gh-35028
2023-04-17 00:41:25 -07:00
Phillip Webb 053c968fb4 Polish 2023-04-14 17:44:15 -07:00
Phillip Webb 00dc942e94 Migrate to Spring Security lambda config
Closes gh-35011
2023-04-14 17:39:48 -07:00
Andy Wilkinson 397f16ce2d Upgrade to Flyway 9.16.3
Closes gh-34990
2023-04-14 17:59:46 +01:00
Stephane Nicoll c4c4eb93ae Start building against Spring Security 6.1.0-RC1 snapshots
See gh-34969
2023-04-14 14:52:57 +02:00
Andy Wilkinson d4980ea993 Always define connection details beans
Closes gh-34776
2023-04-13 18:02:35 +01:00
Andy Wilkinson 466b81f13d Merge branch '3.0.x' 2023-04-13 14:41:40 +01:00
Andy Wilkinson 0e51cd583a Merge branch '2.7.x' into 3.0.x 2023-04-13 14:27:00 +01:00
Andy Wilkinson e70226b48e Adapt to breaking changes in Spring Security internals
See gh-34948
2023-04-13 14:11:20 +01:00
Phillip Webb e9a198a68f Merge branch '3.0.x' 2023-04-12 22:16:35 -07:00
Stephane Nicoll 9a4a522004 Polish "Start building against Spring Security 6.0.3 snapshots"
See gh-34952
2023-04-12 12:29:58 +02:00
Stephane Nicoll 3f022867f4 Polish "Start building against Spring Security 5.7.8 snapshots"
See gh-34948
2023-04-12 12:26:43 +02:00
Stephane Nicoll 2dcb849c0f Merge branch '3.0.x'
Closes gh-34939
2023-04-11 16:39:00 +02:00
Stephane Nicoll 320db790e7 Merge branch '2.7.x' into 3.0.x
Closes gh-34938
2023-04-11 16:38:46 +02:00
Stephane Nicoll 4b8829364e Polish "Use removeIf rather than Iterator-based removal"
See gh-34762
2023-04-11 16:32:26 +02:00
SeasonPan 0d13e31827 Use removeIf rather than Iterator-based removal
See gh-34762
2023-04-11 16:20:43 +02:00
Stephane Nicoll 029e47c647 Merge branch '3.0.x'
Closes gh-34937
2023-04-11 16:15:33 +02:00
Stephane Nicoll 55125c7a5c Update copyright header of changed file
See gh-34844
2023-04-11 16:13:23 +02:00
Sanghyuk Jung d4fe272ce5 Remove outdated reference to JPA in BatchProperties
See gh-34844
2023-04-11 16:12:31 +02:00
Stephane Nicoll ab1e0f51c6 Merge branch '3.0.x'
Closes gh-34936
2023-04-11 16:07:10 +02:00
Stephane Nicoll 03d42deaea Polish "Fix hint to include all Liquibase resources in default location"
See gh-34729
2023-04-11 16:02:09 +02:00
Andrii Bohutskyi 408d5246bc Fix hint to include all Liquibase resources in default location
See gh-34729
2023-04-11 15:56:23 +02:00
Johnny Lim 7dbc7e7e39 Remove unused test configuration
See gh-34818
2023-04-11 15:28:21 +02:00
Stephane Nicoll 47baad1e44 Upgrade to Neo4j Java Driver 5.7.0
Closes gh-34934
2023-04-11 14:48:07 +02:00
Stephane Nicoll bd0561fc10 Upgrade to Neo4j Java Driver 5.7.0
Closes gh-34930
2023-04-11 14:45:41 +02:00
Phillip Webb 463701db18 Merge branch '3.0.x' 2023-04-10 16:22:57 -07:00
Phillip Webb d442bfbeff Polish 2023-04-10 16:22:11 -07:00
Stephane Nicoll d823d7b0b1 Upgrade to Undertow 2.2.24.Final
Closes gh-34910
2023-04-07 16:02:57 +02:00
Andy Wilkinson 16b126a481 Merge branch '2.7.x' into 3.0.x
Closes gh-34799
2023-03-28 14:44:33 +01:00
Andy Wilkinson c9e69b13b1 Resolve placeholders in reference config against all other config
Fixes gh-34643
2023-03-28 14:43:53 +01:00
Andy Wilkinson bb0ec34e7b Resolve placeholders in reference config against all other config
Fixes gh-34643
2023-03-28 14:28:16 +01:00
Andy Wilkinson d69335d94a Use driver class name from JdbcConnectionDetails
Fixes gh-34777
2023-03-27 11:39:28 +01:00
Andy Wilkinson b91f814e42 Fix incomplete assertions
See gh-34503
2023-03-24 16:48:45 +00:00
Andy Wilkinson 8ec266bea4 Add infrastructure for pluggable connection details factories
See gh-34658

Co-Authored-By: Phillip Webb <pwebb@vmware.com>
Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
2023-03-24 10:04:21 +00:00
Andy Wilkinson ac55caa463 Add ConnectionDetail support to Redis auto-configuration
Update Redis auto-configuration so that `RedisConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:26 +00:00
Andy Wilkinson 69f31cb6c0 Add ConnectionDetail support to Rabbit auto-configuration
Update Rabbit auto-configuration so that `RabbitConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:25 +00:00
Andy Wilkinson de8fb04814 Add ConnectionDetail support to Neo4J auto-configuration
Update Neo4J auto-configuration so that `Neo4jConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:25 +00:00
Andy Wilkinson 2ef33dc81f Add ConnectionDetail support to Mongo auto-configuration
Update Mongo auto-configuration so that `MongoConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:25 +00:00
Andy Wilkinson 042f0c8520 Add ConnectionDetail support to Kafka auto-configuration
Update Kafka auto-configuration so that `KafkaConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:25 +00:00
Andy Wilkinson d860d875b9 Add ConnectionDetail support to Influx auto-configuration
Update Influx auto-configuration so that `InfluxDbConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:24 +00:00
Andy Wilkinson 4cc7958c0b Add ConnectionDetail support to Elasticsearch auto-configuration
Update Elasticsearch auto-configuration so that
`ElasticsearchConnectionDetails` beans may be optionally used to
provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:24 +00:00
Andy Wilkinson 9f187bb13a Add ConnectionDetail support to Couchbase auto-configuration
Update Couchbase auto-configuration so that
`CouchbaseConnectionDetails` beans may be optionally used to provide
connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:24 +00:00
Andy Wilkinson 4307fdc0a0 Add ConnectionDetail support to Cassandra auto-configuration
Update Cassandra auto-configuration so that `CassandraConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:23 +00:00
Andy Wilkinson 61e9fe8cd4 Add ConnectionDetail support to R2DBC auto-configuration
Update R2DBC auto-configuration so that `R2dbcConnectionDetails` beans
may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:23 +00:00
Andy Wilkinson d09ac00824 Add ConnectionDetail support to JDBC auto-configuration
Update JDBC auto-configuration so that `JdbcConnectionDetails` beans
may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 01:22:44 -07:00
Andy Wilkinson aa91f2b8b6 Introduce ConnectionDetails interface
Add a `ConnectionDetails` tagging interface which will be used
to mark beans that are a source of configuration settings for
connection to a remove service. When such beans are available,
they will take precedence over any connection-related
configuration properties. Configuration properties that are not
related to the connection itself, such as properties that control
the size and behavior of a connection pool, will still used.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 01:14:31 -07:00
Andy Wilkinson 1eb5bbe3ea Polish "Allow ProblemDetailsExceptionHandlers to be proxied"
See gh-34503
2023-03-23 20:38:41 +00:00
Volkan Yazıcı b96a8dd370 Allow ProblemDetailsExceptionHandlers to be proxied
See gh-34503
2023-03-23 20:08:43 +00:00
Andy Wilkinson 6d5e76e14e Polish "Configure support for GraphQL pagination and sorting"
See gh-34677
2023-03-23 13:41:05 +00:00
Brian Clozel 7109542e3f Configure support for GraphQL pagination and sorting
This commit auto-configures the new pagination and sorting support for
Spring for GraphQL, if Spring Data is available.
The `GraphQlAutoConfiguration` now contributes a `CursorStrategy` bean
that is used to set up the pagination and sorting data fetching
infrastructure.

This commit also configures by default a
`ConnectionTypeDefinitionConfigurer` that automatically detects
`*Connection` types and contributes the relevant schema definitions
according to the Relay spec.

See gh-34677
2023-03-23 13:40:24 +00:00
Andy Wilkinson 919c8aa218 Merge branch '3.0.x'
Closes gh-34731
2023-03-23 10:02:27 +00:00
Andy Wilkinson fa63f6cc9e Stop using an instance supplier in EntityScanPackages' bean definition
Closes gh-34371
2023-03-23 10:02:14 +00:00
Andy Wilkinson f06536f642 Polish Authorization Server auto-configuration 2023-03-22 19:26:38 +00:00
Madhura Bhave e6f602cec0 Polish "Add Spring Authorization Server support"
See gh-34003
2023-03-21 17:00:35 -07:00
Steve Riesenberg 25d77ee70b Add Spring Authorization Server support
See gh-34003
2023-03-21 17:00:35 -07:00
Scott Frederick cf5b654f96 Polish "Switch to single topic for same intervals in Spring Kafka retry config"
See gh-34504
2023-03-21 13:48:20 -05:00
Abhijeet Mishra 4abf6f95ae Switch to single topic for same intervals in Spring Kafka retry config
See gh-34504
2023-03-21 13:48:20 -05:00
Andy Wilkinson f6add35f8b Upgrade to Tomcat 10.1.7
Closes gh-34674
2023-03-21 10:07:21 +00:00
Scott Frederick 3d65be0e1c Merge branch '3.0.x'
Closes gh-34660
2023-03-20 18:39:26 -05:00
Scott Frederick 86a1cfff6f Merge branch '2.7.x' into 3.0.x
Closes gh-34659
2023-03-20 18:39:11 -05:00
Scott Frederick 6dc0f90e00 Polish "Disable embedded web auto-config when not using embedded web server"
See gh-34332
2023-03-20 18:38:04 -05:00
Guirong Hu b2facecb12 Disable embedded web auto-config when not using embedded web server
See gh-34332
2023-03-20 18:14:58 -05:00
Andy Wilkinson 4be288f672 Upgrade to Tomcat 9.0.73
Closes gh-34655
2023-03-20 21:07:57 +00:00
Andy Wilkinson 59921d823c Merge branch '3.0.x'
Closes gh-34606
2023-03-14 15:04:36 +00:00
Andy Wilkinson d9c5f274c8 Merge branch '2.7.x' into 3.0.x
Closes gh-34605
2023-03-14 15:03:53 +00:00
1993heqiang a3bb3b1510 Polish name of JettyServletWebServerFactory bean method
See gh-34421
2023-03-14 15:02:12 +00:00
Andy Wilkinson ef6c9853e9 Merge branch '3.0.x'
Closes gh-34604
2023-03-14 14:58:49 +00:00
Andy Wilkinson 03865eebd7 Polish "Fix Javadoc in JobLauncherApplicationRunner"
See gh-34596
2023-03-14 14:58:01 +00:00
Sanghyuk Jung 03acc0273e Fix Javadoc in JobLauncherApplicationRunner
See gh-34596
2023-03-14 14:55:27 +00:00
Andy Wilkinson eda299df90 Configure exception resolver for `@GraphQlExceptionHandler` methods
To apply `@ControllerAdvice` exception handling to non-controller
DataFetcher implementations like QueryDslDataFetcher,
QueryByExampleDataFetcher, and others, this commit exposes the
DataFetcherExceptionResolver from AnnotatedControllerConfigurer as a
bean. The existing auto-configured for DataFetcherExceptionResolver
then picks this up and passes it into the builder used to create the
GraphQlSource.

Closes gh-34526
2023-03-14 12:10:34 +00:00
Andy Wilkinson daba3ce52b Upgrade to Tomcat 10.1.7
Closes gh-34582
2023-03-10 19:32:15 +00:00
Andy Wilkinson 1e5169846f Fix handling of deprecated identityprovider verification.credentials
Fixes gh-34525
2023-03-09 10:36:16 +00:00
Scott Frederick 8c3bf88aba Merge branch '3.0.x' 2023-03-02 15:01:23 -06:00
Scott Frederick f28bb221a2 Suppress Spring Kafka deprecation warning
See gh-34441
2023-03-02 15:01:05 -06:00
Moritz Halbritter 2becf70c2a Polish "Add RabbitTemplateCustomizer"
See gh-34050
2023-03-01 13:03:21 +01:00
dzcr 5f77c1cd77 Add RabbitTemplateCustomizer
See gh-34050
2023-03-01 12:57:03 +01:00
Phillip Webb b20b5edf2a Polish 2023-02-23 13:00:30 -08:00
Andy Wilkinson 6885c3432e Upgrade to Spring Kafka 3.0.3
Closes gh-34354
2023-02-23 16:50:07 +00:00
Andy Wilkinson 525cba1b6f Upgrade to Neo4j Java Driver 5.4.0
Closes gh-34344
2023-02-23 09:41:41 +00:00
Phillip Webb 157091a811 Merge branch '3.0.x' 2023-02-22 18:36:57 -08:00
Phillip Webb 0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00
Andy Wilkinson f6e208c647 Merge branch '3.0.x'
See gh-34235
2023-02-22 21:29:28 +00:00
Andy Wilkinson 88de3cc089 Temporarily remove auto-config for Reactor context propagation
See gh-34201
2023-02-22 21:10:59 +00:00
Phillip Webb b07269a018 Merge branch '3.0.x' 2023-02-21 23:20:07 -08:00
Phillip Webb c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
Andy Wilkinson cae8c14ac7 Make Micrometer context-propagation available to test compilation
See gh-34201
2023-02-21 19:08:55 +00:00
Andy Wilkinson e67efe2674 Make Micrometer context-propagation available to test compilation
See gh-34235
2023-02-20 20:29:50 +00:00
Andy Wilkinson c40e9f437f Upgrade to Undertow 2.3.4.Final
Closes gh-34304
2023-02-20 20:29:49 +00:00
Andy Wilkinson a73973f5f5 Upgrade to Kafka 3.4.0
Closes gh-34284
2023-02-20 20:07:33 +00:00
Andy Wilkinson 6983850a2c Upgrade to Undertow 2.3.4.Final
Closes gh-34273
2023-02-20 16:21:43 +00:00
Brian Clozel ea6ed4b486 Merge branch '3.0.x'
Closes gh-34235
2023-02-20 10:26:11 +01:00
Brian Clozel 4da42c09a6 Configure automatic context propagation for Reactor
This commit adds a new configuration property,
`spring.reactor.context-propagation` that configures the context
propagation mode for Reactor operators. By default the value is set to
"AUTO" for reinstating automatically context values as ThreadLocals
within Reactor operators. The "LIMITED" mode restricts this feature ot
the "tap" and "handle" operators but has a slightly lower footprint.

Closes gh-34201
2023-02-20 10:22:57 +01:00
Andy Wilkinson 537e5e920f Merge branch '3.0.x'
Closes gh-34185
2023-02-14 20:02:18 +00:00
Andy Wilkinson 68f97f5361 Merge branch '2.7.x' into 3.0.x
Closes gh-34184
2023-02-14 20:02:01 +00:00
Johnny Lim 70d561a929 Polish "Set Reactor Netty's shutdownQuietPeriod to 0 when using devtools"
See gh-34140
2023-02-14 20:01:22 +00:00
Johnny Lim f9da3696ff Add metadata for default for spring.jmx.registration-policy
See gh-34122
2023-02-14 19:46:18 +00:00
Andy Wilkinson eda59f71b0 Start building against Spring Kafka 3.0.3 snapshots
See gh-34153
2023-02-09 17:36:28 +00:00
Andy Wilkinson 205018ec8f Fix HazelcastAutoConfigurationServerTests on Windows
See gh-33687
2023-02-07 16:24:08 +00:00
Andy Wilkinson 9cba05da90 Upgrade to Neo4j Java Driver 5.4.0
Closes gh-34099
2023-02-06 14:46:09 +00:00
Andy Wilkinson 238b85fabc Upgrade to Flyway 9.14.1
Closes gh-34080
2023-02-06 14:46:03 +00:00
Guirong Hu b514ea776e Auto-configure Spring Kafka ContainerCustomizer
See gh-34033
2023-02-06 12:04:31 +01:00
Moritz Halbritter a92ed5e2c2 Merge branch '3.0.x'
Closes gh-34068
2023-02-06 09:41:16 +01:00
Moritz Halbritter 3af30b0a11 Don't use global ObjectMapper when creating JacksonJsonpMapper
See gh-33438
Closes gh-33426
2023-02-06 09:41:10 +01:00
Andy Wilkinson 636b70a77d Merge branch '3.0.x'
Closes gh-34040
2023-02-01 15:19:56 +00:00
Andy Wilkinson 56a1551c2d Polish "Configure jOOQ with TransactionProvider bean when available"
See gh-33979
2023-02-01 15:19:16 +00:00
ath0s b2a8c8be1c Configure jOOQ with TransactionProvider bean when available
See gh-33979
2023-02-01 14:53:55 +00:00
Moritz Halbritter 0440e23233 Merge branch '3.0.x'
Closes gh-34038
2023-02-01 10:34:29 +01:00
Moritz Halbritter b28369d511 Merge branch '2.7.x' into 3.0.x
Closes gh-34036
2023-02-01 09:44:30 +01:00
Moritz Halbritter 2a843d1853 Set Reactor Netty's shutdownQuietPeriod to 0 when using devtools
See gh-33855
2023-02-01 09:31:41 +01:00
Marten Deinum f2950f2d09 Allow JMX Registration Policy to be set
See gh-32573
2023-01-31 14:30:36 +01:00
Thomas Kåsene d1a089ba71 Auto-configure BatchInterceptor on ConcurrentKafkaListenerContainerFactory
See gh-32951
2023-01-31 13:59:02 +01:00
Francois Rosiere eaa7cdf910 Add configuration property to control auto-startup of listener container
See gh-33082
2023-01-31 13:45:33 +01:00
Guirong Hu 6e064ed5e0 Support setting more properties of KafkaAdmin
See gh-33288
2023-01-31 13:30:30 +01:00
Moritz Halbritter de699b4d11 Fix HazelcastAutoConfigurationServerTests
See gh-33687
2023-01-31 12:05:04 +01:00
Moritz Halbritter 64c2320ce1 Polish "Merge pull request #33553 from michaelweidmann"
See gh-33553
2023-01-31 11:43:33 +01:00
Michael Weidmann 93d46d11e9 Add max http response header size configuration for tomcat and jetty
See gh-33553
2023-01-31 11:43:33 +01:00
Moritz Halbritter e955fb5cb6 Polish "Merge pull request #33687 from luben93"
See gh-33687
2023-01-31 11:05:47 +01:00
lucas persson 275f15b8d3 Use hazelcast's Config.loadFromStream()
To allow the private function Config.applyEnvAndSystemVariableOverrides()
to override with environment variables

See gh-33687
2023-01-31 11:03:09 +01:00
Phillip Webb 390892f11b Merge branch '3.0.x'
Closes gh-33998
2023-01-26 21:45:57 -08:00
Krzysztof Krason 0e68cae57f Use instanceof patterns
See gh-33987
2023-01-26 20:36:25 -08:00
Krzysztof Krason 6e46423983 Use diamond operators
See gh-33987
2023-01-26 20:35:08 -08:00
Moritz Halbritter a4e7a8bae0 Use bean name for servlet and filter registrations if name is not set
If the name is set, it is used. If not, the bean name is used. If that's
not set, the convention based name is taken.

Registration failures now throw an IllegalStateException instead of
being logged. DynamicRegistrationBean.setIgnoreRegistrationFailure
can be used to restore the old behavior.

See gh-33911
2023-01-24 09:14:06 +01:00
Phillip Webb e05b7e49c6 Polish 'Order SessionRepositoryCustomizer before other customizers'
See gh-33514
2023-01-19 12:48:49 -08:00
Michael Weidmann 19ce32dc34 Order SessionRepositoryCustomizer before other customizers
Update `JdbcSessionConfiguration` so the `SessionRepositoryCustomizer`
used to map properties is always applied before other customizers.

See gh-33514
2023-01-19 12:44:03 -08:00
Moritz Halbritter 61ad227178 Update copyright 2023-01-19 11:51:20 +01:00
Moritz Halbritter fe7aeffc0d Update copyright 2023-01-19 11:51:06 +01:00
Moritz Halbritter 3b58aa6fbd Add runtime hints for GroovyTemplateAvailabilityProperties
Closes gh-33847
2023-01-19 11:47:42 +01:00
Moritz Halbritter ae79c60619 Remove instance suppliers in bean definitions
Remove instance suppliers in bean definitions and depend instead
on reflection. This allows the AOT engine to correctly process
the definitions.

Fixes gh-33763
2023-01-18 19:55:56 -08:00
Phillip Webb 71efc55bf9 Merge branch '2.7.x' 2023-01-18 16:31:53 -08:00
Phillip Webb 7c508fa324 Update copyright year of changed files 2023-01-18 15:37:58 -08:00
Moritz Halbritter 94f4a4396c Merge branch '2.7.x'
Closes gh-33880
2023-01-18 17:35:52 +01:00
Moritz Halbritter e8d809fe65 Replace 'via' with 'over' or 'through' in the documentation
Closes gh-33878
2023-01-18 16:56:42 +01:00
Phillip Webb a889c539ab Merge branch '2.7.x' 2023-01-17 10:12:25 -08:00
Phillip Webb a0fe8241a7 Update copyright year of changed files 2023-01-17 10:07:03 -08:00
Moritz Halbritter 2f542f6c91 Merge branch '2.7.x'
Closes gh-33776
2023-01-12 11:38:16 +01:00
Moritz Halbritter 1606f5b88c Back off Jooq's TransactionProvider on custom TransactionProvider
Closes gh-32899
2023-01-12 11:24:49 +01:00
Moritz Halbritter ff3b0de02f Merge branch '2.7.x'
Closes gh-33755
2023-01-11 13:28:44 +01:00
Sébastien Deleuze 4466bffe52 Fix typo in class name MultipleConnectionPoolConfigurationsFailureAnalzyer
See gh-33751
2023-01-11 13:24:01 +01:00
Moritz Halbritter 46f09be1c0 Merge branch '2.7.x'
Closes gh-33753
2023-01-11 11:30:37 +01:00
Moritz Halbritter 7a148747a0 Fix NPE in RabbitProperties if user is given but password is not
Closes gh-33752
2023-01-11 11:13:51 +01:00
Moritz Halbritter 90a6d514a3 Fix assertions in ValidationAutoConfigurationTests 2023-01-11 10:51:29 +01:00
Phillip Webb 29b7c121fb Merge branch '2.7.x'
Closes gh-33739
2023-01-09 19:01:57 -08:00
Phillip Webb a369f936c9 Replace references to Pivotal
Closes gh-33737
2023-01-09 18:09:20 -08:00
Phillip Webb a2ac38e203 Update copyright year of changed files 2023-01-09 15:46:07 -08:00
Krzysztof Krason cf6493f65c Simplify AssertJ assertions and also make them more readable
See gh-33653
2023-01-09 11:10:20 +01:00
Phillip Webb f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Scott Frederick fead976952 Adapt to changes in Couchbase client
See gh-33588
2022-12-21 11:48:39 -06:00
Brian Clozel 41dce327a2 Fix Spring Integration failing test
Instead of asserting that an observation registry is null, we should
ensure that it's a NOOP instance.
2022-12-21 16:38:32 +01:00
Moritz Halbritter 08659baeba Polish away public modifier on tests 2022-12-16 16:08:44 +01:00
Moritz Halbritter f36e2ecb7b Use AutoClosables with try-with-resources
Closes gh-33538
2022-12-16 15:43:15 +01:00
Moritz Halbritter 725337f976 Make fields final
Closes gh-33537
2022-12-16 14:28:44 +01:00
Moritz Halbritter 216d15997a Merge branch '2.7.x'
Closes gh-33512
2022-12-12 11:41:09 +01:00
Aakarshit Uppal 2bb8dadeb3 Fix typo in tomcat accesslog checkExists doc
See gh-33460
2022-12-12 11:38:57 +01:00
Brian Clozel ce33ec19cd Start building against Spring GraphQL 1.1.1-SNAPSHOT
See gh-33477
2022-12-07 14:43:04 +01:00
Johnny Lim 78b43279a7 Polish
See gh-33455
2022-12-05 11:14:38 +01:00
Johnny Lim 90589fd6d4 Polish
See gh-33384
2022-12-01 11:32:39 +01:00
Moritz Halbritter d430779f00 Merge branch '2.6.x' into 2.7.x
Closes gh-33328
2022-11-23 16:32:19 +01:00
Moritz Halbritter 2f6edecedb Improve JavaDoc on ConditionalOnClass
Closes gh-27846
2022-11-23 16:26:43 +01:00
Brian Clozel e8c3157db5 Start building against Spring Framework 6.0.1 SNAPSHOTs
See gh-33286
2022-11-21 20:53:37 +01:00
Stephane Nicoll d89861e056 Merge branch '2.7.x'
Closes gh-33284
2022-11-21 16:23:11 +01:00
Stephane Nicoll 78d8bfdc52 Merge branch '2.6.x' into 2.7.x
Closes gh-33283
2022-11-21 16:22:54 +01:00
Henning Poettker 330848d339 Make `ScheduledBeanLazyInitializationExcludeFilter` conditional
See gh-33276
2022-11-21 16:11:07 +01:00
Vedran Pavic ca72f322d6 Fix Spring Security filter dispatcher types related docs
See gh-33252
2022-11-18 12:52:07 +00:00
Andy Wilkinson 98171921da Polish "Polish SecurityProperties"
See gh-33251
2022-11-18 12:50:15 +00:00
Vedran Pavic c1691f525a Polish SecurityProperties
See gh-33251
2022-11-18 12:50:15 +00:00
Sébastien Deleuze e7f91bab78 Refine BackgroundPreinitializer code reachability
GraalVM code reachability algorithm is not able to evaluate at build
time that ENABLED static field is always false in a native image,
shipping unreachable code.

Before this commit, building a native image with -H:+PrintAnalysisCallTree
shows that the following methods are included:
- BackgroundPreinitializer$1.<init>(BackgroundPreinitializer):void
- BackgroundPreinitializer$1.run():void
- BackgroundPreinitializer$1.runSafely(Runnable):void
- BackgroundPreinitializer$CharsetInitializer.run():void
- BackgroundPreinitializer$ConversionServiceInitializer.run():void
- BackgroundPreinitializer$JacksonInitializer.run():void
- BackgroundPreinitializer$MessageConverterInitializer.run():void
- BackgroundPreinitializer$ValidationInitializer.run():void
- BackgroundPreinitializer.<clinit>():void
- BackgroundPreinitializer.getOrder():int
- BackgroundPreinitializer.onApplicationEvent(ApplicationEvent):void
- BackgroundPreinitializer.onApplicationEvent(SpringApplicationEvent):void
- BackgroundPreinitializer.performPreinitialization():void

After this commit, only those are included:
- BackgroundPreinitializer.<clinit>():void
- BackgroundPreinitializer.getOrder():int
- BackgroundPreinitializer.onApplicationEvent(ApplicationEvent):void
- BackgroundPreinitializer.onApplicationEvent(SpringApplicationEvent):void

See gh-33240
2022-11-18 10:52:42 +00:00
Stephane Nicoll cb1ee205ea Exclude SharedMetadataReaderFactoryContextInitializer from AOT contexts
SharedMetadataReaderFactoryContextInitializer exposes an additional
bean post processor that is only relevant when parsing the bean
factory, auto-configurations in particular. Given that this does not
happen in an AOT-optimized context, this commit excludes the bean
and makes sure the initializer does not do anything at runtime.

Closes gh-33216
2022-11-17 11:30:22 +01:00
Phillip Webb e2dc35954e Merge branch '2.7.x'
Closes gh-33230
2022-11-16 12:06:20 -08:00
Phillip Webb e255bba018 Merge branch '2.6.x' into 2.7.x
Closes gh-33229
2022-11-16 12:06:10 -08:00
Phillip Webb 6cc6a15edf Polish 'Refine BackgroundPreinitializer Jackson initialization'
See gh-33220
2022-11-16 12:01:05 -08:00
Sébastien Deleuze bdac416a62 Refine BackgroundPreinitializer Jackson initialization
AllEncompassingFormHttpMessageConverter already initializes
Jackson ObjectMapper. This commit updates BackgroundPreinitializer
in order to not run JacksonInitializer when
MessageConverterInitializer already takes care of initializing
ObjectMapper.

See gh-33220
2022-11-16 12:00:47 -08:00
Andy Wilkinson f39b297677 Merge branch '2.7.x'
Closes gh-33227
2022-11-16 18:09:35 +00:00
Andy Wilkinson 04353e4961 Merge branch '2.6.x' into 2.7.x
Closes gh-33226
2022-11-16 16:41:02 +00:00
Andy Wilkinson 4bb13bcdfd Fix package tangles in spring-boot-autoconfigure
See gh-17299
2022-11-16 16:12:00 +00:00
Brian Clozel c1c818d43c Polish
See gh-33208
2022-11-16 16:34:49 +01:00
Brian Clozel 200458136c Contribute GraphQL resources during AOT phase
This commit ensures that the default locations for GraphQL schema files
and the GraphiQL UI HTML page are included in the native image by
registering resource hints during the AOT phase.

Fixes gh-33208
2022-11-16 15:56:15 +01:00
Johnny Lim 6027508cf7 Polish
See gh-33108
2022-11-16 10:00:36 +01:00
Andy Wilkinson 31f5e768a8 Polish "Add config property for Spring Integration component observation"
See gh-33099
2022-11-14 20:16:16 +00:00
artembilan b87d5c728d Add config property for Spring Integration component observation
Spring Integration has introduced a new observationPatterns attribute
on EnableIntegrationManagement. Spring Boot auto-configures
EnableIntegrationManagement so this commit adds a property that
allows users to configure the patterns without declaring the
annotation themselves.

See gh-33099
2022-11-14 20:16:16 +00:00
Madhura Bhave 8cb615e9b6 Remove workarounds for SecurityContextRepository 2022-11-10 14:23:17 -08:00
Madhura Bhave f4cf722c27 Align default security filter dispatcher types with Spring Security
Fixes gh-33090
2022-11-10 13:53:47 -08:00
Phillip Webb 1adc7c7dd4 Merge branch '2.7.x' 2022-11-09 11:32:24 -08:00
Phillip Webb 0ef03d725f Merge branch '2.6.x' into 2.7.x 2022-11-09 11:31:55 -08:00
Phillip Webb a431ae04e6 Polish 2022-11-09 11:30:11 -08:00
Andy Wilkinson 70f7258341 Simplify JacksonAutoConfiguration as we now require Jackson 2.14
See gh-33086
2022-11-09 17:31:04 +00:00
Andy Wilkinson 60917bd114 Remove tests for Jackson 2.11
Closes gh-33086
2022-11-09 11:33:55 +00:00
Phillip Webb 32b9945632 Polish 2022-11-08 23:15:30 -08:00
Phillip Webb 0d5c13cb28 Polish 'Add reflection hints for PropertyNamingStrategies'
See gh-33080
2022-11-08 23:09:27 -08:00
Ralf Ueberfuhr e9bca3e6de Add reflection hints for PropertyNamingStrategies
See gh-33080
2022-11-08 23:03:54 -08:00
Andy Wilkinson c314d62030 Merge branch '2.7.x'
Closes gh-33067
2022-11-08 13:11:01 +00:00
Andy Wilkinson 0e70c33725 Merge branch '2.6.x' into 2.7.x
Closes gh-33066
2022-11-08 13:10:40 +00:00
dreis2211 34902f5a02 Fix possible type pollution in ConditionEvaluationReport
See gh-32916
2022-11-08 13:01:27 +00:00
Andy Wilkinson a19f1a733e Correct crash handling in condition report logging listener
Closes gh-33027
2022-11-08 12:54:46 +00:00
Andy Wilkinson 3a2703e8f6 Upgrade to Jakarta Mail 2.1 and switch to Eclipse Angus RI
Closes gh-33059
Closes gh-33050
2022-11-08 11:01:15 +00:00
Phillip Webb 95557ddbc6 Start building against Spring Integration 6.0.0-RC2 snapshots
See gh-33009
2022-11-07 14:31:01 -08:00
Andy Wilkinson b67c427259 Upgrade to Servlet 6.0 and related EE 10 specs
Co-authored-by: Phillip Webb <pwebb@vmware.com>

Closes gh-33036
Closes gh-33037
Closes gh-33038
Closes gh-33039
Closes gh-33040
Closes gh-33041
Closes gh-33042
Closes gh-33043
2022-11-07 17:33:38 +00:00
Andy Wilkinson bf468ab808 Polish tests to make use of @ParamterizedTest
Update tests to use @ParamterizedTest to reduce duplication.
2022-11-05 18:46:13 -07:00
Andy Wilkinson 42f4fd7e41 Revert to Spring Integration 6.0.0-RC1
Latest snapshots contain breaking changes that we do not yet know how
to address.
2022-11-05 13:39:45 +00:00
Andy Wilkinson 7e6bc3fdca Adapt to breaking API change in Spring Integration
See gh-33009
2022-11-04 19:40:52 +00:00
Andy Wilkinson 61c9a1540f Start building against Spring Batch 5.0.0-RC2 snapshots
See gh-32935
2022-11-01 12:09:39 +00:00
Moritz Halbritter 4fef5291bf Fix build
Commit 29f085bd1a690ff7281e00b3a925e1160850ffbb in Spring Framework
automatically registers hints for enclosing directories. This fixes the
tests to use a contains instead of exact match.
2022-10-31 16:59:15 +01:00
Moritz Halbritter dd2bec267c Revert "Fix build"
This reverts commit 50599c5046.
2022-10-31 16:54:05 +01:00
Moritz Halbritter 50599c5046 Fix build
Commit 29f085bd1a690ff7281e00b3a925e1160850ffbb in Spring Framework
automatically registers hints for enclosing directories. This fixes the
tests to expect hints for those directories as well.
2022-10-31 16:03:49 +01:00
Moritz Halbritter 5bf088d88b Add runtime hints for Liquibase migration file
Closes gh-32926
2022-10-31 11:29:53 +01:00
Johnny Lim 5067aab552 Polish
See gh-32840
2022-10-27 16:33:14 +02:00
Andy Wilkinson b9e176ce1a Inject Jackson modules rather than retrieving them manually
Fixes gh-32863
2022-10-27 13:35:37 +01:00
Moritz Halbritter 65c68ba64e Reinstate old flyway bean method
Closes gh-32849
2022-10-27 10:15:58 +02:00
Moritz Halbritter cd5d2ad3e8 Revert "Extract Flyway configuration mapping in separate class"
This reverts commit cf4117856b.
2022-10-27 10:08:27 +02:00
Moritz Halbritter cf4117856b Extract Flyway configuration mapping in separate class
Closes gh-32849
2022-10-27 09:53:29 +02:00
Scott Frederick eeac08e50e Remove references to WebSecurityConfigurerAdapter from javadoc
Closes gh-32879
2022-10-26 16:55:10 -05:00
Phillip Webb a59b6cb1f3 Polish 2022-10-25 21:56:53 -07:00
Phillip Webb 0f405c06bf Merge branch '2.7.x' 2022-10-25 16:40:56 -07:00
Phillip Webb f44531a7a2 Merge branch '2.6.x' into 2.7.x 2022-10-25 16:02:04 -07:00
Phillip Webb 92b513dc8d Polish 2022-10-25 16:01:58 -07:00
Phillip Webb 4be3218cb6 Merge branch '2.7.x' 2022-10-25 15:48:26 -07:00
Andy Wilkinson 99edda735e Polish 2022-10-25 12:57:58 +01:00
Andy Wilkinson bed313746b Correct property names to align with changes in 3.0
See gh-32837
2022-10-21 12:23:07 +01:00
Andy Wilkinson a606b26920 Merge branch '2.7.x'
Closes gh-32837
2022-10-21 11:04:52 +01:00
Andy Wilkinson 032487117b Merge branch '2.6.x' into 2.7.x
Closes gh-32836
2022-10-21 11:04:09 +01:00
Andy Wilkinson fe51e03019 Support IPv6 addresses in spring.redis.sentinel.nodes
Fixes gh-32762
2022-10-21 10:53:54 +01:00
Phillip Webb ea094ddba6 Fix package tangles caused by ConfigurationProperties hints
Relocate `ConfigurationPropertiesReflectionHintsProcessor` and refactor
it to be a general purpose `BindableRuntimeHintsRegistrar`.

Prior to this commit, `ConfigurationPropertiesReflectionHintsProcessor`
was used to declare binding hints for classes that were bound, but
might be `@ConfigurationProperties`. By moving and renaming the class,
it's now better aligned to the way it's used.

Support for `@NestedConfigurationProperties` has been implemented by
adding a `@Nestable` meta-annotation. This allow us to create the
appropriate hints, without the `Binder` needing to be directly aware of
the `@NestedConfigurationProperties` annotation.

Closes gh-32815
2022-10-20 17:05:54 -07:00
Madhura Bhave ce3c933f77 Adapt to Spring Security changes
Closes gh-32604
2022-10-19 11:46:27 -07:00
Phillip Webb 2e74878ba4 Downgrade to OpenSAML 4.0.1
See gh-32604
2022-10-19 11:46:27 -07:00
Madhura Bhave cedd553b83 Remove error page security filter
Spring Security now re-applies the authorization rules
to the error page by default. Additionally, it configures
RequestAttributeSecurityContextRepository as the default for
stateless applications allowing those applications to have access
to the original authentication during an error dispatch.

Closes gh-31703
2022-10-19 11:46:27 -07:00
Andy Wilkinson a87aca2744 Merge branch '2.7.x'
Closes gh-32782
2022-10-19 10:02:56 +01:00
Andy Wilkinson a19e394ebb Merge branch '2.6.x' into 2.7.x
Closes gh-32781
2022-10-19 10:00:48 +01:00
Henning Poettker 4ed072a06b Upgrade MySQL Connector/J and use new Maven identifiers
See gh-32747
2022-10-19 09:58:32 +01:00
Phillip Webb 02cd910f5a Merge branch '2.7.x'
Closes gh-32774
2022-10-18 15:37:42 -07:00
Phillip Webb fbd416adc6 Merge branch '2.6.x' into 2.7.x
Closes gh-32773
2022-10-18 15:37:20 -07:00
Phillip Webb b02c702ad1 Polish 'Use more specific bean method return types in KafkaAutoConfiguration'
See gh-32770
2022-10-18 15:35:37 -07:00
yuanhao18 c498ad0320 Use more specific bean method return types in KafkaAutoConfiguration
Update `KafkaAutoConfiguration` so that more specific bean types are
returned.

See gh-32770
2022-10-18 15:33:58 -07:00
Moritz Halbritter b986a9b12e Add Flyway native-image support
The ResourceProviderCustomizer, which is used by FlywayAutoConfiguration
gets replaced with NativeImageResourceProviderCustomizer when running
in AOT mode. The NativeImageResourceProvider does the heavy lifting when
running in a native image: it uses PathMatchingResourcePatternResolver
to find the migration files.

Closes gh-31999
2022-10-18 12:07:04 +02:00
Bertolt Meier 647a2905c8 Add checkstyle rule for List.of() / Set.of() / Map.of()
This commits adds a checkstyle rule to not use List.of(), Set.of()
and Map.of(), preferring Collections.emptyList(), emptySet(), and
emptyMap() respectively.

It replaces usages of these methods across the codebase.

See gh-32655
2022-10-12 18:15:48 +01:00
Andy Wilkinson 3ab4606584 Make runScripts method of DB initializer more extensible
Closes gh-29137
2022-10-12 11:52:38 +01:00
Brian Clozel d870474fcd Remove spring.webflux.multipart.streaming property
As of spring-projects/spring-framework#29293, the streaming mode on the
`DefaultPartHttpMessageReader` is deprecated as hard limitations have
been found with the design and won't be fixed. Instead, developers
should use the `PartEvent` API and the `PartEventHttpMessageReader`
(which is configured by default with the codecs).

This commit removes the `spring.webflux.multipart.streaming` property
and applies all `spring.webflux.multipart.*` properties that are
applicable to `PartEventHttpMessageReader`.

Closes gh-32658
2022-10-10 14:59:34 +02:00
Madhura Bhave 263433cd81 Populate base for embedded LDAPContextSource
Fixes gh-23030
2022-10-07 13:20:45 -07:00
Andy Wilkinson 3eb3d79104 Log condition evaluation report during AOT processing
Closes gh-32109
2022-10-07 18:08:18 +01:00
Andy Wilkinson 8e35f2ae92 Separate report logging from context initialization and events
See gh-32109
2022-10-07 18:08:18 +01:00
Brian Clozel 23a9818e0d Auto-configure ProblemDetails support
This commit auto-configures ProblemDetails support for both Spring MVC
and Spring WebFlux, contributing a `@ControllerAdvice` annotated
`ResponseEntityExceptionHandler` bean if the
`spring.mvc.problemdetails.enabled` or
`spring.webflux.problemdetails.enabled` properties are set to `true`.

Closes gh-32634
2022-10-07 17:23:12 +02:00
Vedran Pavic e0a7bd8143 Fix deprecation warnings in Spring Session auto-configuration
This commit updates Spring Session auto-configuration to avoid usage of
deprecated methods, and moves to newly introduced Duration based
defaultMaxInactiveInterval setters across all session repository
implementations.

Additionally, this fixes several tests that are broken due to session
repository implementations now using Duration type for their
defaultMaxInactiveInterval fields.

See gh-32633
2022-10-07 15:38:46 +01:00
Brian Clozel da7128ce7e Upgrade to Thymeleaf 3.1.0-M3
See gh-32628
2022-10-07 11:42:01 +02:00
Brian Clozel 0f3b94592b Temporarily suppress warnings on R2DBC deprecation
See gh-32601
See spring-projects/spring-data-relational#1350
2022-10-07 11:41:16 +02:00
Andy Wilkinson 7e47d3bbd6 Polish "Rework Spring Session auto-configuration to use customizers"
See gh-32554
2022-10-06 20:59:59 +01:00
Vedran Pavic ad8753923a Rework Spring Session auto-configuration to use customizers
This commit reworks Spring Session auto-configuration to avoid
extending Spring Session's configuration classes. Instead, those
configuration classes are now imported and customizations are
applied using dedicated (Reactive)SessionRepositoryCustomizer beans.

See gh-32554
2022-10-06 20:59:13 +01:00
Brian Clozel c8c73b195d Switch to Spring Batch 5.0.0-SNAPSHOT
See gh-32618
2022-10-06 16:11:26 +02:00
Stephane Nicoll 4ffc421b3c Adapt to Spring Framework API change 2022-10-06 09:58:05 +02:00
Stephane Nicoll e94a1f7988 Replace outcome of JsonMixins scanning in AOT optimized contexts
This commit adds an AOT contribution that replaces the scanning of
@JsonMixin by a mapping in generated code. This makes sure that such
components are found in a native image.

Closes gh-32567
2022-10-05 15:55:33 +02:00
Andy Wilkinson 5199ffe6a9 Allow auto-configured Rabbit Stream Environment to be customized
Closes gh-32580
2022-10-05 11:56:32 +01:00
Andy Wilkinson 0ae7e935c3 Allow user to replace auto-configured Data JDBC beans
Closes gh-32571
2022-10-04 18:07:56 +01:00
Andy Wilkinson e6568596b9 Make max header size config consistent across web servers
Closes gh-29382
2022-10-04 15:16:54 +01:00
Andy Wilkinson 4f86f685c5 Reinstate support for Infinispan
Closes gh-32556
2022-10-04 11:32:56 +01:00
Phillip Webb e0b67889a8 Use Stream.toList instead of Stream.collect when possible
Update code to make use of `Stream.toList()` whenever possible.

Closes gh-28177
2022-10-04 00:29:22 -07:00
Andy Wilkinson 803d353d49 Fix formatting of R2dbcDataAutoConfiguration
See c2b8d3d.
2022-10-03 14:29:46 +01:00
Stephane Nicoll c2b8d3de21 Declare beans that can be instantiated at build-time static
This commit updates the bean factory methods for beans that can be
instantiated at build-time to be static. Doing so makes sure that
the enclosing configuration class does not have to be resolved in
order to create the instance.

Closes gh-32570
2022-10-03 14:36:04 +02:00
Andy Wilkinson 51df7813a5 Remove code deprecated in 2.x and add since and forRemoval attributes
Closes gh-32548
Closes gh-32549
2022-09-30 14:39:05 +01:00
Andy Wilkinson 0bfa9cd704 Upgrade to Logback 1.4 and SLF4J 2.0
Closes gh-12649
2022-09-28 21:14:08 +01:00
Andy Wilkinson 7d583939ff Auto-configure stream template and env irrespective of listener type
Closes gh-32477
2022-09-23 17:28:17 +01:00
Vedran Pavic 230f2cda84 Migrate to AuthorizationFilter in Spring Security auto-config
This commit updates Servlet based Spring Security auto-configuration
to use AuthorizationFilter, which is intended to supersede
FilterSecurityInterceptor.

See gh-31255
2022-09-22 13:53:54 +01:00
Scott Frederick 08022ba86e Remove support for locating imports using spring.factories
With this commit, loading `@AutoConfiguration`,
`@ImportAutoConfiguration`, and `@ManagementContextConfiguration`
classes is supported with `.imports` files only. Support for loading
these classes with `spring.factories` is removed.

Closes gh-29699
2022-09-21 17:34:51 -05:00
Scott Frederick f9c341c75a Revert "Generate the AutoConfiguration.imports file from annotations"
This reverts commit da4de7d67d.
2022-09-21 14:50:15 -05:00
Andy Wilkinson 2977373505 Polish "Add property to configure Spring Session Redis repository type"
See gh-32205
2022-09-21 17:16:29 +01:00
Vedran Pavic 3093380e35 Add property to configure Spring Session Redis repository type
With Spring Session moving to RedisSessionRepository as the preferred
session repository, Spring Boot auto-configuration should make it
possible to easily switch back to the previous default
(RedisIndexedSessionRepository).

This commit introduces spring.session.redis.repository configuration
property that allows selecting the desired Redis-backed session
repository implementation.

See gh-32205
2022-09-21 17:13:58 +01:00
Andy Wilkinson 64f4da80cb Align with breaking changes in latest Batch snapshots
Batch is now auto-configured to use the context's
PlatformTransactionManager and DataSource or `@BatchDataSource`.
When this does not meet the user's needs, they can use
`@EnableBatchProcessing` or sub-class `DefaultBatchConfiguration` to
take complete control with the auto-configuration backing off.

Closes gh-32330
2022-09-20 15:42:52 +01:00
dreis2211 bac7d62476 Fix Spring Batch deprecations
See gh-32419
2022-09-19 14:31:54 +02:00
Andy Wilkinson 2b3ef96156 Merge branch '2.7.x'
Closes gh-32407
2022-09-16 17:03:34 +01:00
Andy Wilkinson a800f7d77c Merge branch '2.6.x' into 2.7.x
Closes gh-32406
2022-09-16 17:03:13 +01:00
Andy Wilkinson 61e11cd361 Ensure that TCCL is clean when DataSource is accessed
Previously, when using Tomcat, its web app class loader was the thread
context class loader when H2ConsoleAutoConfiguration triggered
initialization of Hikari's pool. This was the case because it's done
in the bean method of a ServletRegistrationBean. Such Servlet-related
beans are intentionally created with Tomcat's web app classloader as
the TCCL. This arrangement results in the pool's threads using
Tomcat's web app class loader as their TCCL which is not desirable.
One consequence of this was that Tomcat could log a warning at
shutdown about the thread being left running when it will, in fact,
be stopped as part of the context being closed.

This commit updates H2ConsoleAutoConfiguration to set the TCCL to its
own ClassLoader while the DataSource information is being logged.

Closes gh-32382
2022-09-16 16:24:57 +01:00
Phillip Webb db89ee6904 Deprecate spring.mvc.ignore-default-model-on-redirect property
Closes gh-32381
2022-09-14 13:49:03 -07:00
Stephane Nicoll bcb5f048d2 Upgrade to Liquibase 4.16.0
Closes gh-32354
2022-09-14 15:56:59 +02:00
Andy Wilkinson 6d2a1d3f3b Adapt to breaking changes in Batch's transaction management
See gh-32237
2022-09-14 10:15:30 +01:00
Stephane Nicoll d4a88041dc Upgrade to R2DBC Bom Borca-SR2
Closes gh-32328
2022-09-14 11:01:19 +02:00
Andy Wilkinson c6990a34f9 Merge branch '2.7.x' 2022-09-14 09:20:37 +01:00
Andy Wilkinson a533f4fa32 Polish 2022-09-14 09:20:13 +01:00
Andy Wilkinson 4e8e5f623b Adapt to recent deprecations in Spring Batch
See gh-32237
2022-09-13 17:44:50 +01:00
Phillip Webb aa62e3d1bd Fix deprecation issues in WebMvcAutoConfigurationTests 2022-09-09 12:52:27 -07:00
Phillip Webb fc279b7083 Deprecate ThemeResolver auto-configuration
Update `WebMvcAutoConfiguration` to deprecate the `ThemeResolver` bean
to align with recent Spring Framework changes.
2022-09-09 12:45:24 -07:00
Andy Wilkinson aafceb3868 Merge branch '2.7.x'
Closes gh-32285
2022-09-09 16:47:06 +01:00
Andy Wilkinson f17df7bf30 Merge branch '2.6.x' into 2.7.x
Closes gh-32284
2022-09-09 16:46:43 +01:00
Andy Wilkinson 23c2f73b3f Update tests to allow them to run on Java 19
Closes gh-32280
2022-09-09 16:46:14 +01:00
Phillip Webb 46be4a3f30 Merge branch '2.7.x' 2022-09-08 19:38:18 -07:00
Phillip Webb e88a682220 Merge branch '2.6.x' into 2.7.x 2022-09-08 19:37:52 -07:00
Phillip Webb 85697ac482 Update copyright year of changed files 2022-09-08 19:36:59 -07:00
Phillip Webb 6e239d551a Update Spring Batch to upstream API changes
Fix Spring Batch tests following upstream changes related to Spring
Batch issue 4130.

Closes gh-32237
2022-09-08 19:35:27 -07:00
Phillip Webb d4ed2bd47a Support import into Eclipse 2022-06
Fix a few issues preventing clean project import into Eclipse 2022-06:

  - `buildSrc` need to limit module imports to prevent clashes
    with those in the gradle API jar.

  - The CLI app needs some classpath changes in order to allow
    compileOnly project dependencies to resolve.

  - `AbstractJpaAutoConfigurationTests` needs some minor refactoring
    in order for generic captures to work with the Eclipse compiler.
2022-09-07 15:56:57 -07:00
Andy Wilkinson 5470a6b349 Call FlywayConfigurationCustomizers after applying all other config
Closes gh-32070
2022-09-07 17:36:37 +01:00
Vedran Pavic 94f42d11e5 Add support for customizing WebJars resource handler path pattern
At present, both Spring MVC and Spring WebFlux auto-configurations
hardcode the path pattern for WebJars resource handlers to
"/webjars/**", which means users are unable to change the path.

This commit introduces "spring.mvc.webjars-path-pattern" and
"spring.webflux.webjars-path-pattern" configuration properties that
allow customization of WebJars resource handler path pattern.

See gh-31769
2022-09-07 11:46:19 +02:00
Stephane Nicoll ec63a981d0 Merge branch '2.7.x'
Closes gh-32248
2022-09-07 09:33:29 +02:00
Stephane Nicoll 2fb257ad22 Merge branch '2.6.x' into 2.7.x
Closes gh-32247
2022-09-07 09:33:17 +02:00
Stephane Nicoll 19c69ff743 Polish "Add support for detecting .yml Hazelcast config files"
See gh-32142
2022-09-07 09:32:53 +02:00
Neil Stevenson 5eaafdee9a Add support for detecting .yml Hazelcast config files
See gh-32142
2022-09-07 09:20:32 +02:00
Stephane Nicoll 9fb0ecdae9 Merge branch '2.7.x'
Closes gh-32246
2022-09-07 09:11:45 +02:00