Commit Graph

24343 Commits

Author SHA1 Message Date
Sébastien Deleuze cfc9b5109a Update CRaC support status link
See gh-39170
2024-01-17 13:52:56 +00:00
Andy Wilkinson f781c02a6b Merge branch '3.2.x'
Closes gh-39172
2024-01-17 13:51:40 +00:00
Andy Wilkinson 2ba2ecedec Merge branch '3.1.x' into 3.2.x
Closes gh-39171
2024-01-17 13:51:23 +00:00
Wzy19930507 37a0e24f24 Update link to docs for Log4j 2's JDK logging adapter
See gh-39163
2024-01-17 13:50:29 +00:00
Brian Clozel 8f6bfd981a Merge branch '3.2.x'
Closes gh-39169
2024-01-17 14:15:20 +01:00
Brian Clozel 6845f42f70 Document virtual threads limitations
This commit adds a new section in the Spring Boot reference
documentation to mention potential throughput limitations with Java
virtual threads support.

This section links to the official Java documentation which expands much
more on this matter.

Closes gh-38883
2024-01-17 14:12:34 +01:00
Andy Wilkinson d5d78e5b85 Merge branch '3.2.x'
Closes gh-39168
2024-01-17 13:03:39 +00:00
Andy Wilkinson aec4550b02 Merge branch '3.1.x' into 3.2.x
Closes gh-39167
2024-01-17 13:00:22 +00:00
Andy Wilkinson a7d52226d5 Polish "Improve toString of SslBundle implementations"
See gh-39137
2024-01-17 11:50:34 +00:00
amparab b49ccbb0c2 Improve toString of SslBundle implementations
See gh-39137
2024-01-17 11:37:18 +00:00
Andy Wilkinson 045bc74aa0 Merge branch '3.1.x' into 3.2.x
Closes gh-39165
2024-01-17 10:42:57 +00:00
Andy Wilkinson f66fd0e9e2 Remove OCI entry as it is no longer maintained
Closes gh-39164
2024-01-17 10:42:27 +00:00
Scott Frederick a7463c02cf Merge branch '3.2.x'
Closes gh-39159
2024-01-16 17:30:41 -06:00
Scott Frederick 90564d722d Merge branch '3.1.x' into 3.2.x
Fixes gh-39158
2024-01-16 17:06:17 -06:00
Scott Frederick 47b1c41dac Allow server.ssl properties to mix PEM and JKS certificate types
Prior to the introduction of SSL bundles, the `server.ssl` properties
allowed PEM and JKS certificate files types to be mixed when
configuring keystores and truststores. This was lost when adapting to
SSL bundles using `WebServerSslBundle`. This commit restores the
previous behavior for back compatibility.

Fixes gh-39105
2024-01-16 16:26:28 -06:00
Olga MaciaszekSharma 072d6dadcb Remove OCI starter info from README
The project has been archived and is no longer maintained.

See gh-39145
2024-01-16 12:48:54 -08:00
Phillip Webb 1c9043e435 Merge branch '3.2.x'
Closes gh-39157
2024-01-16 12:46:13 -08:00
Phillip Webb ac00a0c28b Polish 'Improve reference documentation'
See gh-38942
2024-01-16 12:45:03 -08:00
Won Joon Thomas Choi 6ed8dc2970 Improve reference documentation
Address a series of minor typos and phrasing inconsistencies
identified in few sections of documentation to enhance overall
clarity and readability.

See gh-38942
2024-01-16 12:43:38 -08:00
Phillip Webb f586d2d6bb Merge branch '3.2.x'
Closes gh-39155
2024-01-16 11:56:48 -08:00
Phillip Webb 837047ab79 Merge branch '3.1.x' into 3.2.x
Closes gh-39154
2024-01-16 11:56:37 -08:00
Phillip Webb e23e431f10 Polish 'Remove unreachable throw code'
See gh-39107
2024-01-16 11:36:18 -08:00
BenchmarkingBuffalo a4ae6600ef Remove unreachable throw code
Improve `SpringApplication` by removing the unreachable throw statement
in favor of returning an exception from `handleRunFailure`. This commit
also removes the if statements in favor of dedicated catch blocks.

See gh-39107
2024-01-16 11:35:49 -08:00
Phillip Webb 8b47d8c657 Merge branch '3.2.x' 2024-01-16 11:20:09 -08:00
Phillip Webb 267b7ab248 Polish formatting 2024-01-16 11:20:05 -08:00
Phillip Webb 02b63a3b19 Merge branch '3.2.x'
Closes gh-39152
2024-01-16 11:18:55 -08:00
Phillip Webb 5a38662f5f Polish 'Use the term "tags" in documentation consistently'
See gh-39125
2024-01-16 11:16:02 -08:00
Wzy19930507 3274205709 Use the term "tags" in documentation consistently
See gh-39125
2024-01-16 11:15:42 -08:00
Phillip Webb 3c6dff7c36 Merge branch '3.2.x' 2024-01-16 10:49:30 -08:00
Phillip Webb 88a8550609 Make OTEL tstcontainers integration test more resilient
Tweak awaitility assertions to fix timing error that often occurs on
local builds.
2024-01-16 10:49:25 -08:00
Phillip Webb 90ce0f01bd Merge branch '3.2.x'
Closes gh-39151
2024-01-16 10:49:18 -08:00
Phillip Webb 89874d351a Ensure containers are started before binding datasource properties
Update `TestcontainersLifecycleBeanPostProcessor` so that containers
are now initialized either on the first `postProcessAfterInitialization`
call with a frozen configuration or just before a test container
property is supplied.

Prior to this commit, it was assumed that the first post-process call
after the configuration was frozen was suitably early to initialize
the containers. This turns out to not be no always the case.

Specifically, in the `finishBeanFactoryInitialization` method of
`AbstractApplicationContext` we see that `LoadTimeWeaverAware` beans
are obtained before the configuration is frozen. One such bean is
`DefaultPersistenceUnitManager` which is likely to need datasource
properties that will require a started container.

To fix the problem, the `TestcontainersPropertySource` now publishes
a `BeforeTestcontainersPropertySuppliedEvent` to the ApplicationContext
just before any value is supplied. By listening for this event, we can
ensure that containers are initialized and started before any dynamic
property is read.

Fixes gh-38913
2024-01-16 10:36:54 -08:00
Andy Wilkinson 22b7525ccd Merge branch '3.2.x'
Closes gh-39150
2024-01-16 16:07:53 +00:00
Andy Wilkinson f59fa2e3f7 Merge branch '3.1.x' into 3.2.x
Closes gh-39149
2024-01-16 16:07:37 +00:00
Andy Wilkinson ea727f056a Polish "Update links to Micrometer reference docs"
See gh-39114
2024-01-16 16:05:09 +00:00
Brian Clozel 50c89ff803 Upgrade to MySQL 8.3.0
Closes gh-39147
2024-01-16 16:55:17 +01:00
Tobias Lippert 6c5fea7341 Update links to Micrometer reference docs
See gh-39114
2024-01-16 15:51:08 +00:00
Andy Wilkinson b54567f5f3 Upgrade to Spring Authorization Server 1.3.0-M1
Closes gh-38987
2024-01-16 15:40:41 +00:00
Brian Clozel 00f69c4ee8 Upgrade to MySQL 8.3.0
Closes gh-39081
2024-01-16 16:33:29 +01:00
Brian Clozel de2aee9816 Upgrade to MariaDB 3.3.2
Closes gh-38901
2024-01-16 16:31:19 +01:00
Andy Wilkinson 18c083d619 Upgrade to Spring Session 3.3.0-M1
Closes gh-38991
2024-01-16 13:44:15 +00:00
Andy Wilkinson c48ff13cee Upgrade to Spring Pulsar 1.0.2
Closes gh-38995
2024-01-16 13:03:25 +00:00
Andy Wilkinson a575807078 Upgrade to Spring Pulsar 1.0.2
Closes gh-38994
2024-01-16 13:02:46 +00:00
Brian Clozel e58f65366c Auto-configure TypeDefinitionConfigurer beans
Prior to this commit, the GraphQL auto-configuration would consider many
bean types like `DataFetcherExceptionResolver` and
`SubscriptionExceptionResolver` to configure the `GraphQlSource`.
It would also configure a default `ConnectionTypeDefinitionConfigurer`.

This commit will detect all `TypeDefinitionConfigurer` beans defined in
the application and configure them in addition to the
`ConnectionTypeDefinitionConfigurer`.

Closes gh-39118
2024-01-15 18:22:37 +01:00
Andy Wilkinson 12d390d564 Upgrade to Spring Security 6.3.0-M1
Closes gh-38990
2024-01-15 17:04:13 +00:00
Andy Wilkinson 0f23feffaf Upgrade to Neo4j Java Driver 5.15.0
Closes gh-39136
2024-01-15 15:26:16 +00:00
Andy Wilkinson d06c1db259 Upgrade to Neo4j Java Driver 5.15.0
Closes gh-39135
2024-01-15 15:24:55 +00:00
Andy Wilkinson b0f06338b9 Merge branch '3.2.x'
Closes gh-39134
2024-01-15 15:24:06 +00:00
Andy Wilkinson c0fedc8f74 Merge branch '3.1.x' into 3.2.x
Closes gh-39133
2024-01-15 15:21:31 +00:00
Andy Wilkinson c8e9a2a32c Add support to Bomr for aligning dependency versions
Closes gh-34114
2024-01-15 15:20:29 +00:00
Brian Clozel bc37a94b76 Merge branch '3.2.x'
Closes gh-39132
2024-01-15 14:15:15 +01:00
Brian Clozel 46b7bd2f23 Add configuration property to enable micrometer annotations
Prior to this commit, the Micrometer annotations support (`@Timed`,
`@Counted`...) was guarded by the presence of both Micrometer and
AspectJ on the classpath.

This signal is too weak, considering the startup performance impact and
the fact that the AspectJ dependency can be brought transitively in many
cases.

This commit adds a new `micrometer.observations.annotations.enabled`
property that is set to `false` by default to only process the
annotations support when this property is enabled.

Fixes gh-39128
2024-01-15 13:51:15 +01:00
Andy Wilkinson fdd34a5639 Upgrade to Spring WS 4.0.10
Closes gh-39131
2024-01-15 10:20:23 +00:00
Andy Wilkinson bd14cf6a85 Upgrade to Spring Data Bom 2023.1.2
Closes gh-38988
2024-01-15 10:20:19 +00:00
Andy Wilkinson 8bdaae37b0 Upgrade to Spring WS 4.0.10
Closes gh-39130
2024-01-15 10:14:54 +00:00
Andy Wilkinson 84bb060312 Upgrade to Spring Data Bom 2023.1.2
Closes gh-38981
2024-01-15 10:14:50 +00:00
Andy Wilkinson 5f4d347ea6 Upgrade to Spring WS 4.0.10
Closes gh-39129
2024-01-15 10:11:25 +00:00
Andy Wilkinson abba215498 Upgrade to Spring Data Bom 2023.0.8
Closes gh-38977
2024-01-15 10:11:20 +00:00
Scott Frederick 7851c2362e Remove APIs that were deprecated for removal in 3.3.0
See gh-39039
2024-01-12 16:09:36 -06:00
Andy Wilkinson 7e382e7bf6 Merge branch '3.2.x'
Closes gh-39123
2024-01-12 17:08:36 +00:00
Andy Wilkinson 145fe15daf Merge branch '3.1.x' into 3.2.x
Closes gh-39122
2024-01-12 17:08:23 +00:00
Andy Wilkinson 3df77c67ec Fix request mapping of endpoint path-mapped to /
Closes gh-35426
2024-01-12 17:07:48 +00:00
Andy Wilkinson ac63fc0701 Merge branch '3.2.x'
Closes gh-39121
2024-01-12 16:25:13 +00:00
Andy Wilkinson 6bfac1f860 Fix handling of nested: UNC paths on Windows
Closes gh-38956
2024-01-12 15:53:19 +00:00
Andy Wilkinson 907e4d97f7 Merge branch '3.2.x'
Closes gh-39117
2024-01-12 13:02:56 +00:00
Andy Wilkinson 6ec56da919 Ensure that reactive actuator security has an auth manager
This is a follow-on from afad358 and ensures that the auto-configured
security for Actuator in a WebFlux app has an authentication manager
to back its use of HTTP basic and form login.

Fixes gh-39069
2024-01-12 13:02:31 +00:00
Andy Wilkinson d032b9d234 Merge branch '3.2.x'
Closes gh-39115
2024-01-12 11:11:50 +00:00
Andy Wilkinson a48e2d3539 Fix configuration property conversion for CharSequence inputs
Closes gh-39051
2024-01-12 11:09:29 +00:00
Moritz Halbritter cff1b33f8e Configure virtual threads on Undertow if enabled
Closes gh-38819
2024-01-12 09:05:30 +01:00
Phillip Webb 653474fc46 Polish 2024-01-11 21:40:18 -08:00
Moritz Halbritter a424ba2055 Restore configuration property for http requests names when using WebFlux
Closes gh-39083
2024-01-11 16:28:23 +01:00
Moritz Halbritter cb3745ff92 Restore configuration property for http requests names when using WebFlux
Closes gh-39083
2024-01-11 16:26:57 +01:00
Andy Wilkinson 6f4a8cc0c3 Polish "Change log messages to use singular or plural instead of "noun(s)""
See gh-37017
2024-01-11 14:44:07 +00:00
teacmity c6c7fbc15f Change log messages to use singular or plural instead of "noun(s)"
See gh-37017
2024-01-11 14:35:49 +00:00
Andy Wilkinson 9b8c45c35d Polish "Remove deprecated support for FailureAnalyzer setter injection"
See gh-38322
2024-01-11 14:08:32 +00:00
Zhiyang.Wang1 697b252957 Remove deprecated support for FailureAnalyzer setter injection
See gh-38322
2024-01-11 13:59:02 +00:00
Andy Wilkinson 5675d79243 Merge branch '3.2.x'
Closes gh-39104
2024-01-11 13:56:12 +00:00
Andy Wilkinson a5d3fb588b Merge branch '3.1.x' into 3.2.x
Closes gh-39103
2024-01-11 13:55:34 +00:00
Andy Wilkinson 31936f036b Remove FlywayMigrationScriptMissingFailureAnalyzer from spring.factories
Closes gh-39102
2024-01-11 13:55:05 +00:00
BenchmarkingBuffalo 3928fac5ba Add clientId and subscriptionDurable to JmsProperties
See gh-38817
2024-01-11 14:46:24 +01:00
Andy Wilkinson 06b41bdd2d Merge branch '3.2.x'
Closes gh-39101
2024-01-11 13:45:59 +00:00
Andy Wilkinson fe54801cbe Merge branch '3.1.x' into 3.2.x
Closes gh-39100
2024-01-11 13:45:47 +00:00
Andy Wilkinson f4ff2e63ff Document that failure analyzers should use constructor injection
Closes gh-39099
2024-01-11 13:45:20 +00:00
Andy Wilkinson 339422434f Upgrade to Reactor Bom 2023.0.2
Closes gh-38986
2024-01-11 13:38:08 +00:00
Andy Wilkinson f5be3529b4 Upgrade to Micrometer Tracing 1.2.2
Closes gh-39098
2024-01-11 13:38:08 +00:00
Andy Wilkinson 3acaba15fc Upgrade to Micrometer 1.12.2
Closes gh-39097
2024-01-11 13:38:08 +00:00
Andy Wilkinson 5047048c10 Upgrade to Reactor Bom 2023.0.2
Closes gh-38980
2024-01-11 13:23:04 +00:00
Andy Wilkinson f103586a13 Upgrade to Reactor Bom 2022.0.15
Closes gh-38976
2024-01-11 13:17:15 +00:00
Kai Zander ed039fcf7d Fix context runner assertions not being executed
See gh-39087
2024-01-11 14:17:00 +01:00
Moritz Halbritter baf52214a2 Polish "Auto-configure a JwtAuthenticationConverter"
The JwtConverter bean is only supplied, if one of the following
properties is there:

* spring.security.oauth2.resourceserver.jwt.authority-prefix
* spring.security.oauth2.resourceserver.jwt.principal-claim-name
* spring.security.oauth2.resourceserver.jwt.authorities-claim-name

See gh-38105
2024-01-11 13:58:10 +01:00
Yan Kardziyaka e9bce315ae Auto-configure a JwtAuthenticationConverter
See gh-38105
2024-01-11 13:58:10 +01:00
Andy Wilkinson 17e9f0cb8e Merge branch '3.2.x'
Closes gh-39093
2024-01-11 11:36:38 +00:00
Andy Wilkinson 7087897507 Merge branch '3.1.x' into 3.2.x
Closes gh-39091
2024-01-11 10:33:57 +00:00
Andy Wilkinson 45c32854a5 Fix Checkstyle upgrade
Closes gh-38746
2024-01-10 15:37:38 +00:00
Moritz Halbritter f696190d83 Polish "Add support for Pulsar cluster-level failover"
See gh-38559
2024-01-10 13:28:33 +01:00
Swamy Mavuri c3e3372336 Add support for Pulsar cluster-level failover
See gh-38559
2024-01-10 13:28:33 +01:00
Andy Wilkinson 4b157ceaf2 Make web servers' started log messages more consistent
Closes gh-36149
2024-01-10 12:11:57 +00:00
Moritz Halbritter 3e705e8d56 Polish "Use unknown_service as default application name for OpenTelemetry"
See gh-38219
2024-01-10 11:42:22 +01:00
Lenin Jaganathan 470029aff1 Use unknown_service as default application name for OpenTelemetry
See gh-38219
2024-01-10 11:42:12 +01:00
Moritz Halbritter e5b2ad9b8a Add possibility to configure a custom ExecutionContextSerializer in BatchAutoConfiguration
See gh-38328
2024-01-10 11:08:43 +01:00
John Niang 49c6bacd44 Support configuring maximum number of sessions for reactive server
Signed-off-by: John Niang <johnniang@foxmail.com>

See gh-38703
2024-01-10 11:03:55 +01:00
Andy Wilkinson d2a3c8703a Add missing since javadoc to acceptTasksAfterContextClose
See gh-38968
2024-01-10 09:58:23 +00:00
Moritz Halbritter 1c411c2fc3 Polish "Add configuration property "spring.task.execution.pool.shutdown.accept-tasks-after-context-close""
See gh-38968
2024-01-10 10:38:28 +01:00
Yanming Zhou 0e53c0098f Add configuration property "spring.task.execution.pool.shutdown.accept-tasks-after-context-close"
ExecutorConfigurationSupport::setAcceptTasksAfterContextClose is
introduced since Spring Framework 6.1

See gh-38968
2024-01-10 10:37:15 +01:00
Moritz Halbritter 5650a547cf Merge branch '3.2.x'
Closes gh-39080
2024-01-10 10:31:33 +01:00
Moritz Halbritter 66dc72da46 Polish "Fix Jetty ConnectionLimit configuration"
See gh-39052
2024-01-10 10:17:38 +01:00
Onur Kagan Ozcan 7113c10b08 Fix Jetty ConnectionLimit configuration
See gh-39052
2024-01-10 10:12:27 +01:00
Moritz Halbritter d610955b9d Merge branch '3.2.x'
Closes gh-39079
2024-01-10 09:58:24 +01:00
Moritz Halbritter 793801b9cb Merge branch '3.1.x' into 3.2.x
Closes gh-39078
2024-01-10 09:53:45 +01:00
BenchmarkingBuffalo 56f00c4c21 Move autoStartup property
Move the property 'autoStartup' from BaseContainer to AmqpContainer.

See gh-39072
2024-01-10 09:52:28 +01:00
Moritz Halbritter ffe31cfe55 Merge branch '3.2.x'
Closes gh-39077
2024-01-10 09:49:54 +01:00
skcskitano dc8b55c0ef Fix connection leak in SqlDialectLookup
See gh-38924
2024-01-10 09:46:39 +01:00
Moritz Halbritter 70eb941416 Merge branch '3.2.x'
Closes gh-39076
2024-01-10 09:41:48 +01:00
Moritz Halbritter 748a80c448 Merge branch '3.1.x' into 3.2.x
Closes gh-39075
2024-01-10 09:41:41 +01:00
Moritz Halbritter 47e8f6168f Polish "Fix error mark position for PatternParseException"
See gh-38944
2024-01-10 09:21:03 +01:00
Fabrice Bibonne fccce54d52 Fix error mark position for PatternParseException
PatternParseException.toDetailedString() return a String
with a mark to specify the error position in the pattern.
The mark takes place in the second line in the String
returned. Because PatternParseFailureAnalyzer.analyze
appended "Invalid mapping pattern detected:" at the
beginning of the returned String, the mark was not well
positioned.

Now, a "\n" is inserted after "Invalid mapping pattern detected:"
and the mark is well positioned

See gh-38944
2024-01-10 09:14:04 +01:00
Moritz Halbritter eda2261665 Merge branch '3.2.x'
Closes gh-39074
2024-01-10 09:12:04 +01:00
Moritz Halbritter 8504b6e0a7 Merge branch '3.1.x' into 3.2.x
Closes gh-39073
2024-01-10 09:11:53 +01:00
Christoph Dreis 68b9f0c643 Update copyright year to 2024
See gh-38946
2024-01-10 09:11:29 +01:00
Christoph Dreis b7c9c82180 Fix typos
See gh-38983
2024-01-10 09:06:45 +01:00
Jonatan Ivanov 820396fdff Add ProcessInfoContributor
This InfoContributor exposes information about
the process of the application.

See gh-38371
2024-01-10 08:45:49 +01:00
Phillip Webb 2d12fa073d Merge branch '3.2.x'
Closes gh-39071
2024-01-09 12:38:24 -08:00
Phillip Webb e5f489f338 Restore manifest support for nested directory jars
Update `NestedJarFile` so that the `getManifest()` method returns the
manifest from the parent jar file for nested jars based on directory
entries.

This restores the previous behavior supported by Spring Boot 3.1 and
allows class methods such as `getPackage().getImplementationVersion()`
to return non `null` results.

Fixes gh-38996
2024-01-09 12:33:10 -08:00
Moritz Halbritter 25614710d5 Fail if superfluous properties are used in property metadata
Closes gh-37597
2024-01-09 13:59:51 +01:00
Moritz Halbritter 970c226847 Polish 2024-01-09 13:59:14 +01:00
Andy Wilkinson bef0ce244e Upgrade to Micrometer Tracing 1.2.2
Closes gh-38979
2024-01-09 12:54:51 +00:00
Andy Wilkinson 1f636adb34 Upgrade to Micrometer 1.12.2
Closes gh-38978
2024-01-09 12:54:50 +00:00
Andy Wilkinson 284dc2070c Upgrade to Micrometer Tracing 1.1.9
Closes gh-38975
2024-01-09 12:52:58 +00:00
Andy Wilkinson c1a147474c Upgrade to Micrometer 1.11.8
Closes gh-38974
2024-01-09 12:52:58 +00:00
Andy Wilkinson c805f6ad0f Revert "Start building against Micrometer Tracing 1.3.0 snapshots"
This reverts commit f31bbbbeaa.

See gh-38985
2024-01-09 12:47:37 +00:00
Andy Wilkinson bfa84f2355 Revert "Start building against Micrometer 1.13.0 snapshots"
This reverts commit 2e7e8cf61a.

See gh-38984
2024-01-09 12:46:34 +00:00
Moritz Halbritter 7120dc07ae Adapt to changes in Brave tagged fields handling
See gh-38724

See gh-37435
2024-01-09 11:37:15 +01:00
adispezo 0ca55bf0a6 Add local and tagged correlation fields
Local fields only work in Brave and not with OpenTelemetry.

Tagged fields work both with Brave and with OpenTelemetry.

See gh-37435
2024-01-09 11:35:40 +01:00
Moritz Halbritter 91d187ca38 Add property for max queue size for Tomcat
Co-authored-by: Ahmed A. Hussein <ahmedhussein411@gmail.com>

Closes gh-36087
2024-01-09 10:38:46 +01:00
Moritz Halbritter 98609e875d Include context path in reactive DefaultErrorAttributes
Closes gh-37269
2024-01-09 09:54:59 +01:00
Moritz Halbritter 2cce123bb5 Add property to control 'path' field inclusion in error responses
By default it is included.

Closes gh-38619
2024-01-09 09:33:00 +01:00
Moritz Halbritter c4be302fdb Auto-configure SpanTagAnnotationHandler
Closes gh-38662
2024-01-09 09:03:51 +01:00
Moritz Halbritter a7d88b69d4 Add RabbitMQ properties to enable observations
Observations can be enabled for the simple, direct and stream listener
and on the RabbitTemplate.

Closes gh-36451
2024-01-08 15:58:13 +01:00
Andy Wilkinson 93a2b1cda0 Remove dependency management for Dropwizard Metrics
Closes gh-39034
2024-01-08 09:43:37 +00:00
Andy Wilkinson c3a5e7695a Polish "Treat null as CloudPlatform.NONE"
See gh-38510
2024-01-05 16:29:10 +00:00
Yanming Zhou 01bb806672 Treat null as CloudPlatform.NONE
See gh-38510
2024-01-05 16:23:39 +00:00
Andrei Navrotski 49e9fe66a7 Align Health.down with Health.Builder.down
See gh-38550
2024-01-05 15:41:50 +00:00
Andy Wilkinson ec889b2be0 Merge branch '3.2.x'
Closes gh-39042
2024-01-05 15:39:38 +00:00
Chris Bono af89c2bb5f Use Spring Pulsar BOM
See gh-38966
2024-01-05 14:55:52 +00:00
Andy Wilkinson c87c710f79 Prohibit upgrades to HttpClient5 5.3
Closes gh-39007
2024-01-05 11:41:47 +00:00
Andy Wilkinson 28490738ae Revert "Upgrade to HttpClient5 5.3"
This reverts commit 31f3f31ac1.

See gh-39007
2024-01-05 11:40:41 +00:00
Andy Wilkinson 4b89723861 Remove APIs that were deprecated for removal in 3.3.0
Closes gh-39039
2024-01-05 11:20:35 +00:00
Andy Wilkinson 5c88f500fe Merge branch '3.2.x'
Closes gh-39038
2024-01-05 10:34:12 +00:00
Andy Wilkinson 2acb90cbb5 Prohibit upgrades to Jetty Reactive HTTPClient 4.0.2
Closes gh-39010
2024-01-05 10:33:23 +00:00
Andy Wilkinson b2aa7e5e8c Prohibit upgrades to Derby 10.17
Closes gh-39004
2024-01-05 10:30:23 +00:00
Andy Wilkinson 88f4c72ef4 Upgrade to SQLite JDBC 3.44.1.0
Closes gh-39033
2024-01-05 10:30:22 +00:00
Andy Wilkinson 383750a309 Upgrade to SLF4J 2.0.10
Closes gh-39032
2024-01-05 10:30:22 +00:00
Andy Wilkinson 1e6627d458 Upgrade to SendGrid 4.10.1
Closes gh-39031
2024-01-05 10:30:22 +00:00
Andy Wilkinson de3cae50cd Upgrade to Selenium 4.16.1
Closes gh-39030
2024-01-05 10:30:21 +00:00
Andy Wilkinson e733ebcc5a Upgrade to REST Assured 5.4.0
Closes gh-39029
2024-01-05 10:30:21 +00:00
Andy Wilkinson c392a102f2 Upgrade to Rabbit Stream Client 0.15.0
Closes gh-39028
2024-01-05 10:30:21 +00:00
Andy Wilkinson 7cc385f57c Upgrade to Rabbit AMQP Client 5.20.0
Closes gh-39027
2024-01-05 10:30:20 +00:00
Andy Wilkinson 4543a55790 Upgrade to Pulsar 3.1.2
Closes gh-39026
2024-01-05 10:30:20 +00:00
Andy Wilkinson f355830b09 Upgrade to Postgresql 42.7.1
Closes gh-39025
2024-01-05 10:30:20 +00:00
Andy Wilkinson cd2c415e6d Upgrade to Oracle R2DBC 1.2.0
Closes gh-39024
2024-01-05 10:30:19 +00:00
Andy Wilkinson 2e9ef73cc5 Upgrade to OpenTelemetry 1.33.0
Closes gh-39023
2024-01-05 10:30:19 +00:00
Andy Wilkinson 6fa8094b79 Upgrade to Neo4j Java Driver 5.15.0
Closes gh-39022
2024-01-05 10:30:19 +00:00
Andy Wilkinson 52723d4629 Upgrade to MySQL 8.2.0
Closes gh-39021
2024-01-05 10:30:18 +00:00
Andy Wilkinson 80ad4930d8 Upgrade to Mockito 5.8.0
Closes gh-39020
2024-01-05 10:30:18 +00:00
Andy Wilkinson 1517d865e2 Upgrade to Maven Surefire Plugin 3.2.3
Closes gh-39019
2024-01-05 10:30:18 +00:00
Andy Wilkinson fa5cfa8ec7 Upgrade to Maven Failsafe Plugin 3.2.3
Closes gh-39018
2024-01-05 10:30:18 +00:00
Andy Wilkinson eb18365f90 Upgrade to Maven Compiler Plugin 3.12.1
Closes gh-39017
2024-01-05 10:30:17 +00:00
Andy Wilkinson 3bc6b92636 Upgrade to MariaDB 3.3.2
Closes gh-39016
2024-01-05 10:30:17 +00:00
Andy Wilkinson ce08985bd4 Upgrade to Log4j2 2.22.1
Closes gh-39015
2024-01-05 10:30:17 +00:00
Andy Wilkinson b2c98a028e Upgrade to Liquibase 4.25.1
Closes gh-39014
2024-01-05 10:30:16 +00:00
Andy Wilkinson a01977b888 Upgrade to jOOQ 3.19.1
Closes gh-39012
2024-01-05 10:30:16 +00:00
Andy Wilkinson fc478d5c25 Upgrade to JMustache 1.16
Closes gh-39011
2024-01-05 10:30:15 +00:00
Andy Wilkinson dca46c75c9 Upgrade to InfluxDB Java 2.24
Closes gh-39008
2024-01-04 17:32:10 +00:00
Andy Wilkinson 31f3f31ac1 Upgrade to HttpClient5 5.3
Closes gh-39007
2024-01-04 17:32:10 +00:00
Andy Wilkinson 65bbfdcfe8 Upgrade to HikariCP 5.1.0
Closes gh-39006
2024-01-04 17:26:37 +00:00
Andy Wilkinson a11ecfffad Upgrade to Groovy 4.0.17
Closes gh-39005
2024-01-04 17:26:37 +00:00
Andy Wilkinson 1306edcc28 Upgrade to Commons Lang3 3.14.0
Closes gh-39003
2024-01-04 17:26:37 +00:00
Andy Wilkinson 6bd042e83b Upgrade to Commons DBCP2 2.11.0
Closes gh-39002
2024-01-04 17:26:37 +00:00
Andy Wilkinson 93025a0fba Upgrade to Classmate 1.7.0
Closes gh-39001
2024-01-04 17:26:36 +00:00
Andy Wilkinson a220c5536e Upgrade to Byte Buddy 1.14.11
Closes gh-39000
2024-01-04 17:26:36 +00:00
Andy Wilkinson 6ef8dc87d7 Upgrade to Build Helper Maven Plugin 3.5.0
Closes gh-38999
2024-01-04 17:26:36 +00:00
Andy Wilkinson 3414f9c02e Upgrade to Brave 5.17.0
Closes gh-38998
2024-01-04 17:26:35 +00:00
Andy Wilkinson a1c7c0bccc Upgrade to AssertJ 3.25.1
Closes gh-38997
2024-01-04 17:26:35 +00:00
Andy Wilkinson c19c18f998 Start building against Spring Session 3.3.0 snapshots
See gh-38991
2024-01-04 14:32:56 +00:00
Andy Wilkinson f98f4e20c8 Start building against Spring Security 6.3.0 snapshots
See gh-38990
2024-01-04 14:32:55 +00:00
Andy Wilkinson ec8920ccfd Start building against Spring Pulsar 1.0.2 snapshots
See gh-38995
2024-01-04 14:32:54 +00:00
Andy Wilkinson e0cceed2e6 Start building against Spring Data Bom 2023.1.2 snapshots
See gh-38988
2024-01-04 14:32:49 +00:00
Andy Wilkinson 84b2b37932 Start building against Spring Authorization Server 1.3.0 snapshots
See gh-38987
2024-01-04 14:32:49 +00:00
Andy Wilkinson edbee44ab3 Start building against Reactor Bom 2023.0.2 snapshots
See gh-38986
2024-01-04 14:32:48 +00:00
Andy Wilkinson f31bbbbeaa Start building against Micrometer Tracing 1.3.0 snapshots
See gh-38985
2024-01-04 14:32:47 +00:00
Andy Wilkinson 2e7e8cf61a Start building against Micrometer 1.13.0 snapshots
See gh-38984
2024-01-04 14:32:47 +00:00
Andy Wilkinson d94661f91b Start building against Spring Pulsar 1.0.2 snapshots
See gh-38994
2024-01-04 14:16:53 +00:00
Andy Wilkinson aec6d93617 Merge branch '3.2.x'
Closes gh-38993
2024-01-04 14:15:52 +00:00
Andy Wilkinson 2fb6a2eef4 Consider snapshots when upgrading Spring Pulsar
Closes gh-38992
2024-01-04 14:15:35 +00:00
Andy Wilkinson d7fc9a66b4 Start building against Spring Data Bom 2023.1.2 snapshots
See gh-38981
2024-01-04 13:25:40 +00:00
Andy Wilkinson 6b59c01003 Start building against Reactor Bom 2023.0.2 snapshots
See gh-38980
2024-01-04 13:25:36 +00:00
Andy Wilkinson 44f5a8bfe9 Start building against Micrometer Tracing 1.2.2 snapshots
See gh-38979
2024-01-04 13:25:31 +00:00
Andy Wilkinson e589606112 Start building against Micrometer 1.12.2 snapshots
See gh-38978
2024-01-04 13:25:26 +00:00
Andy Wilkinson d5d4ec99da Start building against Spring Data Bom 2023.0.8 snapshots
See gh-38977
2024-01-04 12:34:13 +00:00
Andy Wilkinson 905e2a623e Start building against Reactor Bom 2022.0.15 snapshots
See gh-38976
2024-01-04 12:34:09 +00:00
Andy Wilkinson 694b418f59 Start building against Micrometer Tracing 1.1.9 snapshots
See gh-38975
2024-01-04 12:34:04 +00:00
Andy Wilkinson e9f086ff86 Start building against Micrometer 1.11.8 snapshots
See gh-38974
2024-01-04 12:33:59 +00:00
Andy Wilkinson 5ef7db9a28 Start working on Spring Boot 3.3 2024-01-04 10:56:56 +00:00
Andy Wilkinson 735df3597f Merge branch '3.1.x'
Closes gh-38963
2024-01-03 15:13:27 +00:00
Andy Wilkinson c10f78ec5a Improve handling of Throwable from logging system init
Closes gh-38885
2024-01-03 15:13:05 +00:00
Andy Wilkinson 00cf1a6d13 Remove unnecessary configuration of idle timeout
Fixes gh-38960
2024-01-03 11:37:01 +00:00
Phillip Webb 7216d2b031 Merge branch '3.1.x'
Closes gh-38916
2023-12-22 10:43:46 -08:00
Phillip Webb 95a8fa561c Correctly order @AutoConfigureAfter values when sorting
Update `AutoConfigurationSorter` so that `getClassesRequestedAfter()`
results are sorted to match the earlier name/order sorting. Prior to
this commit the order of items added via `@AutoConfigureAfter` was in
an undetermined order which could cause very subtle `@ConditionalOnBean`
bugs.

Thanks very much to Alexandre Baron for their help in diagnosing and
reproducing this issue.

Fixes gh-38904
2023-12-22 08:20:25 -08:00
Phillip Webb f31ffbf927 Don't duplicate META-INF entries in nested directory jars
Update `ZipContent` so that `META-INF` entries are no longer duplicated
in nested jars created from directory entries. This aligns with the
behavior of the classic loader and prevents the same META-INF file from
being discovered twice.

Fixes gh-38862
2023-12-20 17:36:06 -08:00
Phillip Webb 20529ea90c Drop Netty restriction 2023-12-20 09:54:59 -08:00
Phillip Webb e754c91f50 Upgrade to Spring WS 4.0.9
Closes gh-38892
2023-12-20 09:17:52 -08:00
Phillip Webb 1abc0827f8 Upgrade to Netty 4.1.104.Final
Closes gh-38891
2023-12-20 09:17:48 -08:00
Phillip Webb 7dfddce1ac Upgrade to jOOQ 3.18.8
Closes gh-38890
2023-12-20 09:17:42 -08:00
Phillip Webb c1e8c18124 Upgrade to Jetty 11.0.19
Closes gh-38889
2023-12-20 09:17:38 -08:00
Phillip Webb ff3a2f7e42 Upgrade to Jetty Reactive HTTPClient 3.0.11
Closes gh-38888
2023-12-20 09:17:34 -08:00
Phillip Webb 4df87f6224 Upgrade to Hibernate 6.2.17.Final
Closes gh-38887
2023-12-20 09:17:29 -08:00
Phillip Webb 15dd37095f Merge branch '3.1.x'
Closes gh-38880
2023-12-19 23:45:42 -08:00
Phillip Webb b00d5fabe8 Auto-configure Hibernate JPA before DataSource TransactionManager
Fixes gh-38861
2023-12-19 23:44:48 -08:00
Phillip Webb dd27429195 Merge pull request #38776 from SandraAhlgrimm
* pr/38776:
  Add the LangChain4J to the list of community starters

Closes gh-38776
2023-12-19 23:14:32 -08:00
Sandra Ahlgrimm b0bc872831 Add the LangChain4J to the list of community starters
See gh-38776
2023-12-19 23:14:01 -08:00
Phillip Webb be1639fe68 Merge branch '3.1.x'
Closes gh-38879
2023-12-19 23:12:48 -08:00
meiyese 4370c6e850 Fix typo in endpoint documentation
See gh-38823
2023-12-19 23:12:06 -08:00
Phillip Webb 246a0e6f21 Merge branch '3.1.x'
Closes gh-38878
2023-12-19 23:10:49 -08:00
Yanming Zhou 8cb8999772 Ban call of URLEncoder.encode/URLDecoder.decode(String,String)
Add ArchUnit rules to ban the use of `URLEncoder` calls with String
charsets and use `Charset` calls instead.

See gh-38740
2023-12-19 23:10:18 -08:00
Phillip Webb 5354ad15b3 Merge branch '3.1.x'
Closes gh-38877
2023-12-19 22:51:48 -08:00
Yanming Zhou 8599e5a986 Remove unnecessary `toString()` calls
See gh-38739
2023-12-19 22:38:34 -08:00
Yanming Zhou b6e87cee35 Remove unnecessary `extends Object` from generic
See gh-38739
2023-12-19 22:38:19 -08:00
Yanming Zhou 84f7c2dba9 Remove unnecessary `final` modifiers
See gh-38739
2023-12-19 22:38:14 -08:00
Yanming Zhou d3a51e56b7 Remove unnecessary `static` modifiers
See gh-38739
2023-12-19 22:38:08 -08:00
Yanming Zhou ac18e3015c Use `.isEmpty()` where feasible
See gh-38739
2023-12-19 22:38:05 -08:00
Iliès BELDJILALI e39d1d14ea Hide application name placeholder when include property is false
Update log4j configuration so that an empty value is used when
`LOGGED_APPLICATION_NAME` is missing. Prior to this commit when
`logging.include-application-name` was `false` the logged output
would include the raw `${sys:LOGGED_APPLICATION_NAME}` value.

See gh-38847
2023-12-19 22:08:13 -08:00
Phillip Webb 1b498dea43 Drop Netty restriction 2023-12-19 20:45:10 -08:00
Phillip Webb 67b43baa16 Upgrade to Spring WS 4.0.9
Closes gh-38876
2023-12-19 20:38:20 -08:00
Phillip Webb b6d855fa0b Upgrade to Spring Pulsar 1.0.1
Closes gh-38875
2023-12-19 20:38:15 -08:00
Phillip Webb 32d6949733 Upgrade to Spring Kafka 3.1.1
Closes gh-38874
2023-12-19 20:38:11 -08:00
Phillip Webb 21116297f6 Upgrade to Pulsar Reactive 0.5.1
Closes gh-38873
2023-12-19 20:38:07 -08:00
Phillip Webb a04a16a783 Upgrade to Netty 4.1.104.Final
Closes gh-38872
2023-12-19 20:38:03 -08:00
Phillip Webb 31bc458a13 Upgrade to Jetty 12.0.5
Closes gh-38871
2023-12-19 20:37:58 -08:00
Phillip Webb cf5dc186f8 Upgrade to Hibernate 6.4.1.Final
Closes gh-38870
2023-12-19 20:37:53 -08:00
Brian Clozel bf21fa8e76 Upgrade to Spring Integration 6.2.1
Closes gh-38698
2023-12-19 21:22:27 +01:00
Brian Clozel 76c7fe3f8a Upgrade to Spring Session 3.2.1
Closes gh-38866
2023-12-19 19:11:15 +01:00
Brian Clozel 97f08da638 Upgrade to Spring Authorization Server 1.2.1
Closes gh-38696
2023-12-19 19:10:41 +01:00
Brian Clozel d3af5cce73 Upgrade to Spring Session 3.1.4
Closes gh-38683
2023-12-19 18:49:02 +01:00
Brian Clozel cb019e2957 Upgrade to Spring Authorization Server 1.1.4
Closes gh-38678
2023-12-19 18:48:19 +01:00
Brian Clozel 450a0ce8c7 Upgrade to Spring Security 6.1.6
Closes gh-38682
2023-12-19 12:30:36 +01:00
Brian Clozel 0fa8a27e4a Upgrade to Spring LDAP 3.1.3
Closes gh-38681
2023-12-19 12:30:04 +01:00
Brian Clozel bdb2cb131a Upgrade to Spring Security 6.2.1
Closes gh-38700
2023-12-19 11:35:57 +01:00
Brian Clozel 67458b8662 Upgrade to Spring LDAP 3.2.1
Closes gh-38699
2023-12-19 11:35:23 +01:00
Brian Clozel 1c210f5c1a Upgrade to Spring AMQP 3.1.1
Closes gh-38860
2023-12-19 11:34:54 +01:00
Phillip Webb 561c7f749b Don't start containers imported via @ImportTestcontainers
Remove early start of containers imported via `@ImportTestcontainers`
so that parallel startup can happen.

Fixes gh-38831
2023-12-17 15:22:28 -08:00
Phillip Webb 88429b6a66 Use file urls for unpacked jars
Update `JarFileArchive` so that unpacked jars use `file:` URLs rather
than `jar:file:`. This aligns with the behavior of Spring Boot 3.1 and
allows calls to `class.getSigners()` to work again.

Fixes gh-38833
2023-12-17 10:55:31 -08:00
Phillip Webb 2158f4cc43 Polish 'Use authParamString to configure Pulsar authentication'
See gh-38839
2023-12-16 22:23:37 -08:00
Chris Bono 4c0a19e8c0 Use authParamString to configure Pulsar authentication
Update `PulsarPropertiesMapper` to use JSON encoded parameters rather
than a `Map` since the `Map` method is deprecated in Pulsar. This
commit simply takes the auth params map and converts them to the
expected encoded JSON string of auth parameters.

See gh-38839
2023-12-16 22:19:45 -08:00
Phillip Webb 6ae113c18a Fix parallel startup of testcontainers
Update `TestcontainersLifecycleBeanPostProcessor` so that containers
can actually be started in parallel.

Prior to this commit, `initializeStartables` would collect beans
and in the process trigger the `postProcessAfterInitialization` method
on each bean. This would see that  `startablesInitialized` was `true`
and call `startableBean.start` directly. The result of this was that
beans were actually started sequentially and when the `start` method
was finally called it had nothing to do.

The updated code uses an enum rather than a boolean so that the
`postProcessAfterInitialization` method no longer attempts to start
beans unless `initializeStartables` has finished.

Fixes gh-38831
2023-12-16 21:57:16 -08:00
Phillip Webb 92a4a1194d Polish 2023-12-15 12:08:11 -08:00
Phillip Webb b08d441021 Merge branch '3.1.x'
Closes gh-38837
2023-12-15 11:43:47 -08:00
Phillip Webb 13fb450563 Don't call runners in parent ApplicationContext
Update `SpringApplication` so that `ApplicationRunner` and
`CommandLineRunner` beans are not considered from the parent
`ApplicationContext`.

The restores the behavior that applied before commit 7d6532cac4
whilst still retaining the correct run order.

Fixes gh-38647
2023-12-15 11:42:26 -08:00
Brian Clozel f2a74c9107 Upgrade to Spring Retry 2.0.5
Closes gh-38836
2023-12-15 18:26:21 +01:00
Brian Clozel 42830dc621 Upgrade to Spring Data Bom 2023.1.1
Closes gh-38697
2023-12-15 18:25:18 +01:00
Brian Clozel e63be1bf73 Upgrade to Spring Retry 2.0.5
Closes gh-38834
2023-12-15 17:33:42 +01:00
Brian Clozel e8546545a7 Upgrade to Spring Data Bom 2023.0.7
Closes gh-38679
2023-12-15 17:32:56 +01:00
Phillip Webb 26dc14031e Update `LoadedPemSslStore` to use lazy loading
Update `LoadedPemSslStore` so that it loads content lazily. This
restores the behavior of Spring Boot 3.1 and allows bundles to be
defined with files that don't exist as long as they are never accessed.

Fixes gh-38659
2023-12-14 22:03:07 -08:00
Phillip Webb 1d10e51755 Adapt to upstream Spring Security changes 2023-12-14 20:33:09 -08:00
Andy Wilkinson 5915db09e6 Merge branch '3.1.x' 2023-12-14 20:17:29 +00:00
Andy Wilkinson 85cfa4798c Close jar to allow it to be cleaned up after test execution
See gh-38766
2023-12-14 20:16:23 +00:00
Andy Wilkinson d7f4a8ca6a Upgrade to UnboundID LDAPSDK 6.0.11
Closes gh-38816
2023-12-14 17:08:52 +00:00
Andy Wilkinson 25b109167c Upgrade to R2DBC Proxy 1.1.3.RELEASE
Closes gh-38813
2023-12-14 17:08:38 +00:00
Andy Wilkinson 7f064bc456 Upgrade to R2DBC Postgresql 1.0.3.RELEASE
Closes gh-38812
2023-12-14 17:08:33 +00:00
Andy Wilkinson 5d3aaf98b8 Upgrade to Netty 4.1.102.Final
Closes gh-38811
2023-12-14 17:08:28 +00:00
Andy Wilkinson 79455a79f2 Upgrade to Maven Javadoc Plugin 3.6.3
Closes gh-38810
2023-12-14 17:08:24 +00:00
Andy Wilkinson 4892024b7d Upgrade to Logback 1.4.14
Closes gh-38809
2023-12-14 17:08:19 +00:00
Andy Wilkinson d95e7a5af0 Upgrade to Kotlin Serialization 1.6.2
Closes gh-38808
2023-12-14 17:08:14 +00:00
Andy Wilkinson 3b51bcc912 Upgrade to Kafka 3.6.1
Closes gh-38806
2023-12-14 17:08:05 +00:00
Andy Wilkinson 86599a5062 Upgrade to Jetty 12.0.4
Closes gh-38805
2023-12-14 17:08:00 +00:00
Andy Wilkinson 853aaeb818 Upgrade to Jersey 3.1.5
Closes gh-38804
2023-12-14 17:07:55 +00:00
Andy Wilkinson d2d303d5aa Upgrade to Jaybird 5.0.3.java11
Closes gh-38803
2023-12-14 17:07:50 +00:00
Andy Wilkinson da7cb2ad1b Upgrade to Janino 3.1.11
Closes gh-38802
2023-12-14 17:07:46 +00:00
Andy Wilkinson 8deae8275e Upgrade to HttpCore5 5.2.4
Closes gh-38801
2023-12-14 17:07:41 +00:00
Andy Wilkinson f320188023 Upgrade to HttpClient5 5.2.3
Closes gh-38800
2023-12-14 17:07:36 +00:00
Andy Wilkinson b20ed7c577 Upgrade to Groovy 4.0.16
Closes gh-38799
2023-12-14 17:07:31 +00:00
Andy Wilkinson 06068894a4 Upgrade to Dropwizard Metrics 4.2.23
Closes gh-38798
2023-12-14 17:07:27 +00:00
Andy Wilkinson 2e43819e8d Upgrade to AspectJ 1.9.21
Closes gh-38797
2023-12-14 17:07:22 +00:00
Andy Wilkinson 1d64976876 Upgrade to Netty 4.1.102.Final
Closes gh-38795
2023-12-14 14:50:58 +00:00
Andy Wilkinson aa1de9cee2 Upgrade to UnboundID LDAPSDK 6.0.11
Closes gh-38793
2023-12-14 14:47:56 +00:00
Andy Wilkinson cf9538cbcc Upgrade to R2DBC Proxy 1.1.3.RELEASE
Closes gh-38791
2023-12-14 14:47:55 +00:00
Andy Wilkinson b30bec1156 Upgrade to R2DBC Postgresql 1.0.3.RELEASE
Closes gh-38790
2023-12-14 14:47:54 +00:00
Andy Wilkinson bef2dabc27 Upgrade to Logback 1.4.14
Closes gh-38788
2023-12-14 14:47:15 +00:00
Andy Wilkinson 5199977e03 Upgrade to Jersey 3.1.5
Closes gh-38787
2023-12-14 14:47:14 +00:00
Andy Wilkinson 7129b61856 Upgrade to Jaybird 5.0.3.java11
Closes gh-38786
2023-12-14 14:47:14 +00:00
Andy Wilkinson 16cca99d1f Upgrade to Janino 3.1.11
Closes gh-38785
2023-12-14 14:47:14 +00:00
Andy Wilkinson ec81c6650c Upgrade to HttpCore5 5.2.4
Closes gh-38784
2023-12-14 14:47:13 +00:00
Andy Wilkinson 0622f6f80e Upgrade to HttpClient5 5.2.3
Closes gh-38783
2023-12-14 14:47:13 +00:00
Andy Wilkinson 6bd8c295e0 Upgrade to Hibernate 6.2.15.Final
Closes gh-38782
2023-12-14 14:47:13 +00:00
Andy Wilkinson 75643866d8 Upgrade to Groovy 4.0.16
Closes gh-38781
2023-12-14 14:47:12 +00:00
Andy Wilkinson 3b9a05713d Upgrade to Dropwizard Metrics 4.2.23
Closes gh-38780
2023-12-14 14:47:12 +00:00
Andy Wilkinson 7319d55b23 Upgrade to AspectJ 1.9.21
Closes gh-38779
2023-12-14 14:47:12 +00:00
Andy Wilkinson b62b6d56c1 Merge branch '3.1.x'
Closes gh-38794
2023-12-14 14:46:44 +00:00
Andy Wilkinson 54fb25d931 Prohibit upgrade to Netty 4.1.103.Final
Closes gh-38789
2023-12-14 14:46:28 +00:00
Moritz Halbritter 2fd89803a2 Merge branch '3.1.x' 2023-12-14 11:53:08 +01:00
Moritz Halbritter 5a385a40e9 Fix typo 2023-12-14 11:52:55 +01:00
Brian Clozel e44e0c8f1e Remove ErrorAttributes.ERROR_ATTRIBUTE
This commit removes the now defunkt `ErrorAttributes.ERROR_ATTRIBUTE`
that was introduce to register handled errors as metrics. This has been
replaced since 3.0 by a direct support in Spring Framework and had no
effect whatsoever since that release.

This also updates the documentation to point to the Framework mechanism
that replaced it.

Fixes gh-33731
2023-12-14 11:26:45 +01:00
Andy Wilkinson 8c5b7a87ae Adapt to latest changes in the locking model for context close
See gh-38666
2023-12-14 10:21:48 +00:00
Andy Wilkinson 60ebb32e8a Upgrade to Reactor Bom 2023.0.1
Closes gh-38695
2023-12-14 09:41:57 +00:00
Andy Wilkinson 96f1a46fef Upgrade to Micrometer Tracing 1.2.1
Closes gh-38694
2023-12-14 09:41:55 +00:00
Andy Wilkinson 0dedccc1a1 Upgrade to Micrometer 1.12.1
Closes gh-38693
2023-12-14 09:41:52 +00:00
Andy Wilkinson 8d5175b68d Upgrade to Reactor Bom 2022.0.14
Closes gh-38677
2023-12-14 09:25:50 +00:00
Andy Wilkinson c3e3245bb3 Upgrade to Micrometer Tracing 1.1.8
Closes gh-38676
2023-12-14 09:25:49 +00:00
Andy Wilkinson 5f51083005 Upgrade to Micrometer 1.11.7
Closes gh-38675
2023-12-14 09:25:48 +00:00
Phillip Webb a9efa96d8a Merge branch '3.1.x'
Closes gh-38770
2023-12-13 16:53:20 -08:00
Phillip Webb da31137596 Ensure that StaticResourceJars does not close cached jars
Update `StaticResourceJars` so that jars obtained via a
`JarURLConnection` are only closed when caches are not being used.

Fixes gh-38766
2023-12-13 16:51:02 -08:00
Phillip Webb b4a4e91238 Update ZipString to deal with reads that do not return all data
Refine the logic in `ZipString.hash` and `ZipString.compare` to deal
with the fact a read operation may not return all available bytes.

Fixes gh-38751
2023-12-13 13:29:37 -08:00
Andy Wilkinson afad358047 Align reactive web security more closely with servlet web security
There are some notable differences in the behavior of Spring
Security's reactive and servlet-based web security. Notably,
Servlet-based web security (`@EnableWebSecurity`) works without
any authentication manager, rejecting requests as not authorized.
By contrast reactive-based web security (`@EnableWebFluxSecurity`)
fails to start up when there's no authentication manager, either
provided directly as a bean or derived from a
ReactiveUserDetailsService. There are also further differences at
runtime where empty Monos from all ReactiveAuthenticationManagers
results in an internal error and a 500 response whereas a similar
situation in the servlet implementation results in a 401.

Previously, to accommodate these differences in behavior, Spring
Boot's auto-configuration would behave differently. In the Servlet
case, web security would be enabled whenever the necessary
dependencies were on the classpath. In the reactive case, web
security would back off in the absence of an authentication manager
to prevent a start up failure. While this difference is rooted in
Spring Security, it is undesirable and something that we want to
avoid Spring Boot users being exposed to where possible.
Unfortunately, the situation is more likely to occur than before
as ReactiveUserDetailsServiceAutoConfiguration now backs off more
readily (gh-35338). This makes it more likely that the context will
contain neither a reactive authetication manager not a reactive
user details service.

This commit reworks the auto-configurations related to reactive
security. ReactiveSecurityAutoConfiguration will now auto-configure
an "empty" reactive authentication manager that denies access through
Mono.error in the absence of a ReactiveAuthenticationManager,
ReactiveUserDetailsService, or SecurityWebFilterChain. The last of
these is to allow for the situation where a filter chain has been
defined with an authentication manager configured directly on it.
This configuration of an authentication manager allows
`@EnableWebFluxSecurity` to be auto-configured more readily,
removing one of the differences between reactive- and Servlet-based
security.

Corresponding updates to the auto-configurations for reactive OAuth2
support have also been made. They no longer try to auto-configure
`@EnableWebFluxSecurity`, relying instead upon
ReactiveSecurityAutoConfiguration, which they are ordered before, to
do that instead.

Closes gh-38713
2023-12-13 12:44:04 +00:00
Andy Wilkinson 964ccbb000 Revert "Do not enable WebFlux security unless other configuration is active"
This reverts commit beba1f176a.

See gh-38713
2023-12-13 11:17:08 +00:00
Moritz Halbritter 3ac9c44942 Merge branch '3.1.x' 2023-12-13 11:19:44 +01:00
Moritz Halbritter 82bc9a6280 Polish 2023-12-13 11:19:40 +01:00
Moritz Halbritter 2197e36d91 Merge branch '3.1.x'
Closes gh-38764
2023-12-13 11:18:19 +01:00
Moritz Halbritter d1badfe63a Document minimum supported Docker Compose version
Closes gh-38760
2023-12-13 11:18:09 +01:00
Moritz Halbritter c50172d5c7 Undeprecate 'management.metrics.tags'
Closes gh-38583
2023-12-13 08:26:11 +01:00
Moritz Halbritter e81d1226fe Prevent integer overflow when checking disk space 2023-12-12 16:26:58 +01:00
Moritz Halbritter 01f59608ac Merge branch '3.1.x'
Closes gh-38752
2023-12-12 16:23:33 +01:00
Moritz Halbritter b8021dbc65 Exclude Rabbit Stream when testing RabbitAutoConfiguration
The stream auto-configuration is tested in RabbitStreamConfigurationTests,
and excluding it prevents the creation of the "rabbitStreamEnvironment"
Environment bean, which delays the application context close by 1 second
because it has to wait for some Netty resources to gracefully shut down.

Closes gh-38750
2023-12-12 16:12:22 +01:00
Andy Wilkinson 612bf95b05 Adapt to changes in the locking model for closing an app context
See gh-38666
2023-12-12 14:51:06 +00:00
Moritz Halbritter a242bd81e2 Merge branch '3.1.x'
Closes gh-38747
2023-12-12 13:55:44 +01:00
Yanming Zhou 3c65fdfa12 Use idiomatic AssertJ assertions
See gh-38702
2023-12-12 13:53:20 +01:00
Moritz Halbritter 198dbb4a45 Auto-configure observatibility beans in sliced tests
If @AutoConfigureObservability is applied to a sliced test, it
auto-configures:

- An in-memory MeterRegistry
- A no-op Tracer
- An ObservationRegistry

Closes gh-38568
2023-12-12 11:29:43 +01:00
Moritz Halbritter ff82b8d1c1 Add auto-configuration for a no-op tracer
This auto-configuration ensures, if Micrometer Tracing is on the
classpath, that there is always a tracer. It backs off if there is
already a tracer, for example contributed by the Brave or the Otel
auto-configurations, which are run before.

See gh-38568
2023-12-12 11:29:43 +01:00
Phillip Webb ea87787279 Merge branch '3.1.x'
Closes gh-38741
2023-12-11 20:37:45 -08:00
Phillip Webb 39bc7c8582 Support getPermissions() call on Gradle 8.6-milestone-1
The `getPermissions` method is now part of the private
`ParentDirectoryStub` class so we now need to call
`setAccessible(true)`.

Fixes gh-38718
2023-12-11 20:35:06 -08:00
Phillip Webb 0fe7d78732 Restore support for custom bind converters in collections
Update the `beansConverterService` introduced in commit f4e05c91c7
so that it can also handle collection based conversions.

Fixes gh-38734
2023-12-11 17:05:27 -08:00
Andy Wilkinson beba1f176a Do not enable WebFlux security unless other configuration is active
Following the changes in gh-37504, the reactive resource server
auto-configuration could enable WebFlux security in situations where
it was otherwise in active. This could then result in an application
failing to start as no authentication manager is available.

This commit updates the configurations that enable WebFlux security
so that they fully back off unless their related configurations are
active. Previously, only the configuration of the
SecurityWebFilterChain would back off. This has been expanded to
cover `@EnableWebFluxSecurity` as well. This has required splitting
the configuration classes up so that the condition evaluation order
can be controlled more precisely. We need to ensure that the JWT
decoder bean or the opaque token introspector bean has been defined
before evaluation of the conditions for `@EnableWebFluxSecurity`.
Without this control, the import through `@EnableWebFluxSecurity` in
one location where the conditions do not matchcan prevent a
successful import in another where they do.

Fixes gh-38713
2023-12-11 12:46:29 +00:00
Moritz Halbritter 6330190913 Merge branch '3.1.x'
Closes gh-38728
2023-12-11 09:44:19 +01:00
Yanming Zhou ebfbc0ef05 Cleanup kotlin sources
1. remove unused imports
2. remove redundant semicolon
3. remove empty class body
4. remove redundant 'constructor' keyword
5. remove redundant 'Unit' return type
6. use non-null type if possible

See gh-38708
2023-12-11 09:23:42 +01:00
Moritz Halbritter cc665dd529 Merge branch '3.1.x'
Closes gh-38727
2023-12-11 09:18:25 +01:00
Donghun Shin f922b3de03 Rename local variable in BatchAutoConfiguration
See gh-38674
2023-12-11 08:25:39 +01:00
Moritz Halbritter ad586078a7 Merge branch '3.1.x'
Closes gh-38725
2023-12-11 08:18:43 +01:00
Georg Pirklbauer a8d706f485 Update Dynatrace documentation links
See gh-38706
2023-12-11 08:13:56 +01:00
Andy Wilkinson e6970243ee Retry read on ClosedByInterruptException
In gh-38154, we started handling ClosedByInterruptException. The
FileChannel was repaired by recreating it and then the exception was
rethrown. This allowed other threads to use the channel that had been
read by an interrupted thread while allowing that interruption to
continue.

This approach has proven to be insufficient as there are scenarios
where the read needs to succeed on the interrupted thread. This
commit updates the handling of ClosedByInterruptException so that
this is the case. The FileChannel is recreated as before but the
thread's interrupted flag is now cleared before retrying the read.
The flag is then reinstated so that any subsequent actions that
should fail due to the interruption will do so.

We could clear and reinstate the interrupted flag before the first
read, rather than catching ClosedByInterruptException. This approach
was rejected as it will have an impact on the performance of the
happy path where the thread hasn't been interrupted.

Fixes gh-38611
2023-12-07 10:49:40 -08:00
Phillip Webb 359a6cb5bb Use encoded version of path for jar URLs
Update `JarUrl` so that the encoded version of the path is used.
This allows jars to placed in directories with `#` or `!` in the
name.

Fixes gh-38660
2023-12-06 16:20:27 -08:00
Phillip Webb 847daf484c Fix JarUrlTests
Fix `JarUrlTests` to use the jarFile rather than temp.
2023-12-06 16:19:57 -08:00
Andy Wilkinson fc1a5033e8 Start building against Spring Security 6.2.1 snapshots
See gh-38700
2023-12-06 20:21:33 +00:00
Andy Wilkinson 91efe9396b Start building against Spring LDAP 3.2.1 snapshots
See gh-38699
2023-12-06 20:21:29 +00:00
Andy Wilkinson da4f2a4679 Start building against Spring Integration 6.2.1 snapshots
See gh-38698
2023-12-06 20:21:24 +00:00
Andy Wilkinson 174813c341 Start building against Spring Data Bom 2023.1.1 snapshots
See gh-38697
2023-12-06 20:21:19 +00:00
Andy Wilkinson 5e40739997 Start building against Spring Authorization Server 1.2.1 snapshots
See gh-38696
2023-12-06 20:21:14 +00:00
Andy Wilkinson 4fc2082972 Start building against Reactor Bom 2023.0.1 snapshots
See gh-38695
2023-12-06 20:21:09 +00:00
Andy Wilkinson 2a839788cc Start building against Micrometer Tracing 1.2.1 snapshots
See gh-38694
2023-12-06 20:21:04 +00:00
Andy Wilkinson 7fb0f52d7f Start building against Micrometer 1.12.1 snapshots
See gh-38693
2023-12-06 20:20:59 +00:00
Andy Wilkinson fb8043a31f Start building against Spring Session 3.1.4 snapshots
See gh-38683
2023-12-06 15:18:55 +00:00
Andy Wilkinson af469abb88 Start building against Spring Security 6.1.6 snapshots
See gh-38682
2023-12-06 15:18:50 +00:00
Andy Wilkinson 7f53a21328 Start building against Spring LDAP 3.1.3 snapshots
See gh-38681
2023-12-06 15:18:45 +00:00
Andy Wilkinson 4ff5be4619 Start building against Spring Data Bom 2023.0.7 snapshots
See gh-38679
2023-12-06 15:18:36 +00:00
Andy Wilkinson fb9b6833fc Start building against Spring Authorization Server 1.1.4 snapshots
See gh-38678
2023-12-06 15:18:31 +00:00
Andy Wilkinson 7de7aaa375 Start building against Reactor Bom 2022.0.14 snapshots
See gh-38677
2023-12-06 15:18:26 +00:00
Andy Wilkinson 7aed70b0bd Start building against Micrometer Tracing 1.1.8 snapshots
See gh-38676
2023-12-06 15:18:21 +00:00
Andy Wilkinson 57a7f210cd Start building against Micrometer 1.11.7 snapshots
See gh-38675
2023-12-06 15:18:16 +00:00
Andy Wilkinson 6dff3c5978 Adapt to change in Framework's disconnected client detection
See gh-38666
2023-12-06 14:18:40 +00:00
Moritz Halbritter ad5b844e1f Fix checkstyle issues
MissingParametersFailureAnalyzer looks like it has been commited by
accident.
2023-12-06 11:22:54 +01:00
Phillip Webb b5de38787c Restore `Session.Cookie` class for binary back-compatibility
Fixes gh-38589
2023-12-05 15:00:26 -08:00
Phillip Webb ffdd405fb1 Update NoUniqueBeanDefinitionFailureAnalyzer with parameter hints
Add addition description and action text to help point to the
fact that the `NoUniqueBeanDefinitionException` can be thrown
due to a missing `-parameters` compiler setting.

Closes gh-38652
2023-12-05 15:00:26 -08:00
Phillip Webb ce7d384d2c Add MissingParametersFailureAnalyzer
Add a new failure analyzer that provides hints whenever parameter
names cannot be discovered.

Closes gh-38603
2023-12-05 15:00:26 -08:00
Phillip Webb f609022731 Add suppressed missing parameters exception from ValueObjectBinder
Update `DataObjectBinder` interface and `ValueObjectBinder`
implementation so that suppressed exceptions are added whenever
parameter names cannot be discovered.

See gh-38603
2023-12-05 14:58:49 -08:00
Phillip Webb 6b58051aad Polish Binder code 2023-12-05 14:58:49 -08:00
Andy Wilkinson 49990afd78 Polish
See gh-38592
2023-12-05 20:49:34 +00:00
Andy Wilkinson 16c2ddb02c Merge branch '3.1.x'
Closes gh-38665
2023-12-05 20:31:17 +00:00
Andy Wilkinson b424254587 Test Gradle plugin against Gradle 8.5
Closes gh-38664
2023-12-05 20:30:54 +00:00
Moritz Halbritter de70b4fb4c Merge branch '3.1.x'
Closes gh-38661
2023-12-05 14:02:52 +01:00
Moritz Halbritter 3f29c7f84f Add log message if Docker Compose services are already running
Closes gh-38398
2023-12-05 14:02:16 +01:00
Andy Wilkinson 8e3f9cbc1a Upgrade to Hibernate 6.4.0.Final
Closes gh-38523
2023-12-05 12:13:43 +00:00
Moritz Halbritter f9a1eb000e Merge branch '3.1.x'
Closes gh-38658
2023-12-05 11:51:03 +01:00
Lars Uffmann 5981a3fd33 Build against UCP and JDBC driver for Oracle Database variant ucp11
See gh-38654
2023-12-05 11:40:35 +01:00
Moritz Halbritter 02347abefb Disable propagation of traces if tracing is disabled
Closes gh-38641
2023-12-05 11:19:43 +01:00
Moritz Halbritter a0fc2d48cd Merge branch '3.1.x' 2023-12-05 11:19:32 +01:00
Moritz Halbritter 350bc26bbe Reinstate 'management.tracing.enabled' property
See gh-38626
2023-12-05 11:18:18 +01:00
Arthur Gavlyukovskiy 829bec7602 Update documentation about jetty http2 dependency
See gh-38632
2023-12-04 13:34:29 +01:00
Moritz Halbritter 89a0ac3018 Reword documentation 2023-12-01 14:47:24 +01:00
Moritz Halbritter 4d01d95fbc Merge branch '3.1.x'
Closes gh-38627
2023-12-01 14:45:53 +01:00
Moritz Halbritter 3d4d1e80ca Remove management.tracing.enabled from documentation
Closes gh-38626
2023-12-01 14:43:13 +01:00
Brian Clozel 0321a8a05b Configure ObservationRegistry on JmsListener
Prior to this commit, we set in gh-37388 the ObservationRegistry on the
auto-configured JmsTemplate bean. This enables observations and context
propagation when sending JMS messages.

This commit applies the same to the `DefaultJmsListenerContainerFactory`
and the `DefaultJmsListenerContainerFactoryConfigurer`, in order to
enable observations on `@JmsListener` annotated methods.

This commit also refactors the support implemented in gh-37388 to avoid
relying on a bean post processor and instead set the observation
registry directly in the main auto-configuration: while Micrometer core
is an actuator-only dependency, Micrometer Observation API is a compile
dependnecy for spring-jms itself and there is no need to separate
concerns there.

Fixes gh-38613
2023-12-01 09:36:00 +01:00
Moritz Halbritter d172b22064 Escape pipe symbol in properties changelog table cells
Closes gh-38515
2023-11-30 11:37:25 +01:00
Moritz Halbritter fdbd65a2f5 Only apply awaitTerminationPeriod if awaitTermination is set
See gh-38528
2023-11-30 10:29:12 +01:00
Moritz Halbritter 6744cc2887 Apply awaitTerminationPeriod to SimpleAsyncTaskScheduler
Closes gh-38530
2023-11-30 10:25:33 +01:00
Moritz Halbritter e454470bf9 Apply awaitTerminationPeriod to SimpleAsyncTaskExecutor
Closes gh-38528
2023-11-30 09:25:49 +01:00
Moritz Halbritter 6cb9af11e8 Merge branch '3.1.x'
Closes gh-38610
2023-11-30 09:03:27 +01:00
Moritz Halbritter 203cd542c0 Clear MeterRegistry before each test case
Closes gh-38604
2023-11-30 09:02:22 +01:00
Andy Wilkinson 8de81cb06e Disable bind on init for all Tomcat connectors
If a connector is bound on init, it won't be unbound when stop()
is called. This leaves the connector running when it should have
been stopped. We currently disable bind on init for the main
connector but not for any additional connectors. This commit
disables bind on it for all connectors unless it is been
explicitly enabled through the bindOnInit property.

Closes gh-38564

Co-authored-by: Moritz Halbritter <moritz.halbritter@broadcom.com>
2023-11-29 14:28:09 +00:00
Moritz Halbritter 62a6d384f6 Merge branch '3.1.x'
Closes gh-38600
2023-11-29 14:00:01 +01:00
Tom Frenken 43bc104c4e Use system properties when constructing Apache HttpClient
See gh-38591
2023-11-29 13:49:20 +01:00
Phillip Webb 6fd691af58 Allow FileSystems to be create by splitting URLs
Relax the constraint that a `NestedLocation` must have a nested entry
name specified so that URLs can be split and rebuilt.

Prior to this commit, given a URL of the following form:

	jar:nested:/myjar.jar!/nested.jar!/my/file

It was possible to create a FileSystem from
"jar:nested:/myjar.jar!/nested.jar" and from that create a path to
"my/file".

However, it wasn't possible to create a FileSystem from
"jar:nested:/myjar.jar", then create another file system from the path
"nested.jar" and then finally create a path to "/nested.jar".

This was because `nested:/myjar.jar` was not considered a value URL
because it didn't include a nested entry name.

Projects such as `JobRunr` were relying on the ability to compose file
systems, so it makes sense to remove our somewhat artificial
restriction.

Fixes gh-38592
2023-11-28 22:14:29 -08:00
Phillip Webb 9a0f95420a Update NestedByteChannel.read to read all possible data when
Update `NestedByteChannel.read` so that it loops until all
remaining data has been read into the buffer. Prior to this
commit, it was possible for to read only some bytes into the
buffer. Although it looks like this should be OK according to
the API documentation, the `ZipFileSystem` relies on all
remaining bytes being returned.

Fixes gh-38595
2023-11-28 22:14:29 -08:00
Andy Wilkinson 75a8955659 Only start management context when parent has a web server
Fixes gh-38554
2023-11-28 17:45:12 +00:00
Andy Wilkinson 3e4e59a8f0 Restore compatibility with Liquibase 4.23
Closes gh-38522
2023-11-28 17:41:47 +00:00
Moritz Halbritter 903f85cd50 Merge branch '3.1.x'
Closes gh-38586
2023-11-28 13:17:42 +01:00
Alex Serbin 23816d6015 Fix Observation Filter docs
`WebMvcMetricsFilter` no longer exists since 3.0 and should be
replaced with `ServerHttpObservationFilter`

See gh-38570
2023-11-28 13:16:25 +01:00
Moritz Halbritter 34018b1982 Reinstate testAndDevelopmentOnly in Testcontainers documentation
Closes gh-38571
2023-11-28 11:13:59 +01:00
Phillip Webb 8c7e8778a6 Fix NegativeArraySizeException caused by missing unsigned conversion
Update `ZipContent` so that `eocd.totalNumberOfCentralDirectoryEntries`
is converted from a short to an unsigned int to prevent a negative
number from being used.

This commit also updates the code to consistently use `X.toUnsigned...`
helper methods rather than using bitwise operators.

Fixed gh-38572
2023-11-27 23:33:15 -08:00
Moritz Halbritter 86c2f28cb4 Prevent keep alive thread from blocking the AOT processing
Instead of creating the thread directly in the constructor, the thread
is now created when the context is refreshed and stopped when the
context is closed.

As AOT processing never refreshes the context, the thread is never
started and can't block the AOT processing task.

Closes gh-38531
2023-11-27 13:41:02 +01:00
Phillip Webb 0856e10443 Fix IndexOutOfBoundsException exception from parseUrl with empty spec
Update jar `Handler` code so that the `parseUrl` method can accept an
empty `spec`. Prior to this commit, a `classLoader.getResource("")`
call would result in a `null` result. This breaks a number of things
including `ClassPathResource` and `PathMatchingResourcePatternResolver`.

Fixes gh-38524
2023-11-23 14:35:04 -08:00
Johnny Lim f9f73aa146 Polish
See gh-38508
2023-11-23 09:39:01 +01:00
Moritz Halbritter f613ab89b9 Auto-configure observations for RestClients
Closes gh-38500
2023-11-23 09:28:09 +01:00
Andy Wilkinson 9c68a2ab87 Integrate child management context with parent context's lifecycle
Previously, the child management context was created when the
parent context's web server was initialized and it wasn't stopped
or closed until the parent context was closed. This resulted in
the child context being left running when the parent context was
stopped. This would then cause a failure when the parent context
was started again as another web server initialized event would be
received and a second child management context would be started.

This commit updates the initialization of the child management
context to integrate it with the lifecycle of the parent context.
The management context is now created the first time the parent
context is started. It is stopped when the parent context is
stopped and restarted if the parent context is started again.
This lifecycle management is done using a phase that ensures
that the child context is not started until the parent context's
web server has been started.

Fixes gh-38502
2023-11-22 19:50:22 +00:00
Andy Wilkinson 1707904f70 Upgrade to Spring Batch 5.0.4
Closes gh-38493
2023-11-22 19:49:53 +00:00
Phillip Webb 9f031b04e5 Merge branch '3.1.x'
Closes gh-38507
2023-11-22 11:13:12 -08:00
Phillip Webb bc504a8a03 Fix @ConditionalOnBean with annotation early FactoryBean initialization
Update `OnBeanCondition` with a variant of `getBeanNamesForAnnotation`
that does not cause early `FactoryBean` initialization.

Fixes gh-38473
2023-11-22 11:10:59 -08:00
Andy Wilkinson e7aeeb87cf Upgrade to Spring Integration 6.1.5
Closes gh-38303
2023-11-22 18:23:57 +00:00
Andy Wilkinson fc00c4006a Upgrade to Spring Integration 6.2.0
Closes gh-38315
2023-11-22 18:19:47 +00:00
Andy Wilkinson 4d33676c04 Upgrade to Spring Batch 5.1.0
Closes gh-38310
2023-11-22 18:19:46 +00:00
Andy Wilkinson a40f3da028 Merge branch '3.1.x'
Closes gh-38499
2023-11-22 12:35:58 +00:00
Andy Wilkinson ae5bae393b Remove unnecessary toLowerCase call from remainderIsDashes
Closes gh-38498
2023-11-22 12:35:36 +00:00
Andy Wilkinson a7571cf667 Use different default database names for Oracle XE and Oracle Free
Closes gh-38476
2023-11-22 10:48:35 +00:00
Moritz Halbritter 2323c7a838 Merge branch '3.1.x'
Closes gh-38496
2023-11-22 11:15:33 +01:00
Moritz Halbritter 74239ad689 Merge branch '3.0.x' into 3.1.x
Closes gh-38495
2023-11-22 11:15:20 +01:00
Moritz Halbritter 48e06af7ec Merge branch '2.7.x' into 3.0.x
Closes gh-38494
2023-11-22 11:15:07 +01:00
Moritz Halbritter 0171ed205c Polish "Document comments in SQL for database initialization"
See gh-38385
2023-11-22 11:14:13 +01:00
penekhun 578d0436e0 Document comments in SQL for database initialization
See gh-38385
2023-11-22 11:10:14 +01:00
Andy Wilkinson 2d7c8a144c Start building against Spring Batch 5.0.4 snapshots
See gh-38493
2023-11-22 09:39:31 +00:00
Andy Wilkinson 7d6a64bb56 Start building against Spring Batch 5.0.4 snapshots
See gh-38492
2023-11-22 09:38:09 +00:00
Moritz Halbritter b1da6f941f Merge branch '3.1.x' 2023-11-22 10:29:28 +01:00
Moritz Halbritter eddb17473b Fix deprecation clause on MongoPropertiesClientSettingsBuilderCustomizer 2023-11-22 10:29:12 +01:00
Johnny Lim 175b6473c7 Polish
See gh-38389
2023-11-22 10:16:19 +01:00
Georg Pirklbauer 969e142c34 Update Dynatrace docs with info about the meter metadata toggle
See gh-38368
2023-11-22 10:14:25 +01:00
Andy Wilkinson b473ffdea2 Upgrade to Spring Integration 5.5.20
Closes gh-38491
2023-11-22 08:28:52 +00:00
Scott Frederick d433deb737 Merge branch '3.0.x' into 3.1.x
Closes gh-38485
2023-11-21 17:30:54 -06:00
Scott Frederick dabcebf8a3 Merge branch '2.7.x' into 3.0.x
Closes gh-38484
2023-11-21 17:30:07 -06:00
Scott Frederick d1cce0f8ef Upgrade default CNB builders to Paketo Jammy
Closes gh-38477
2023-11-21 17:22:32 -06:00
Phillip Webb f37d6c9294 Upgrade to WebJars Locator Core 0.55
Closes gh-38481
2023-11-21 12:20:06 -08:00
Phillip Webb 3195560385 Upgrade to Rabbit Stream Client 0.14.0
Closes gh-38480
2023-11-21 12:20:06 -08:00
Phillip Webb 30208588a0 Upgrade to Mockito 5.7.0
Closes gh-38479
2023-11-21 12:20:06 -08:00
Phillip Webb ece763c44f Upgrade to GraphQL Java 21.3
Closes gh-38478
2023-11-21 12:20:06 -08:00
Phillip Webb 6c3dec42e0 Add container support for Oracle Free which replaces Oracle XE
Update Docker Compose and Testcontainers support to work with
`gvenzl/oracle-free` which replaces `gvenzl/oracle-xe`.

Closes gh-38476
2023-11-21 11:51:59 -08:00
Andy Wilkinson 0897d752bc Upgrade to Testcontainers 1.19.3
Closes gh-38471
2023-11-21 16:51:50 +00:00
Andy Wilkinson 84f0614bdf Upgrade to Spring Session 3.2.0
Closes gh-38319
2023-11-21 16:51:44 +00:00
Andy Wilkinson d4a1d10fa1 Upgrade to Spring GraphQL 1.2.4
Closes gh-38313
2023-11-21 16:51:43 +00:00
Andy Wilkinson 4659d14170 Upgrade to Spring Authorization Server 1.2.0
Closes gh-38309
2023-11-21 16:51:42 +00:00
Andy Wilkinson 09a15cbf1b Upgrade to Spring WS 4.0.8
Closes gh-38304
2023-11-21 15:34:37 +00:00
Andy Wilkinson 71a65019d6 Upgrade to Spring RESTDocs 3.0.1
Closes gh-38468
2023-11-21 15:34:37 +00:00
Andy Wilkinson ac873ea796 Upgrade to Spring Kafka 3.0.13
Closes gh-38370
2023-11-21 15:34:32 +00:00
Andy Wilkinson 6d0500b277 Upgrade to Spring GraphQL 1.2.4
Closes gh-38302
2023-11-21 15:34:31 +00:00
Andy Wilkinson 5dd402af5c Upgrade to Spring Data Bom 2023.0.6
Closes gh-38300
2023-11-21 15:34:31 +00:00
Andy Wilkinson 71e85f54e0 Upgrade to SAAJ Impl 3.0.3
Closes gh-38467
2023-11-21 15:34:30 +00:00
Andy Wilkinson 3f5ff16946 Upgrade to Pooled JMS 3.1.5
Closes gh-38466
2023-11-21 15:34:25 +00:00
Andy Wilkinson d26b76c647 Upgrade to Netty 4.1.101.Final
Closes gh-38465
2023-11-21 15:34:20 +00:00
Andy Wilkinson 104819ffb0 Upgrade to Lettuce 6.2.7.RELEASE
Closes gh-38463
2023-11-21 15:34:11 +00:00
Andy Wilkinson 132fc74410 Upgrade to Jetty 11.0.18
Closes gh-38462
2023-11-21 15:34:06 +00:00
Andy Wilkinson b9e4f62003 Upgrade to Jetty Reactive HTTPClient 3.0.10
Closes gh-38461
2023-11-21 15:34:01 +00:00
Andy Wilkinson 3b4bfef2dc Upgrade to Jakarta XML WS 4.0.1
Closes gh-38460
2023-11-21 15:33:56 +00:00
Andy Wilkinson 21f17488b7 Upgrade to Jakarta XML SOAP 3.0.1
Closes gh-38459
2023-11-21 15:33:51 +00:00
Andy Wilkinson fe7b2954ec Upgrade to Jakarta Json 2.1.3
Closes gh-38458
2023-11-21 15:33:46 +00:00
Andy Wilkinson d23abf6e1c Upgrade to Infinispan 14.0.21.Final
Closes gh-38457
2023-11-21 15:33:41 +00:00
Andy Wilkinson 3000cfd67e Upgrade to Glassfish JAXB 4.0.4
Closes gh-38456
2023-11-21 15:33:36 +00:00
Andy Wilkinson 646a369c6f Upgrade to Dropwizard Metrics 4.2.22
Closes gh-38455
2023-11-21 15:33:32 +00:00
Andy Wilkinson 360b9a98c7 Upgrade to DB2 JDBC 11.5.9.0
Closes gh-38454
2023-11-21 15:33:27 +00:00
Andy Wilkinson d64f76c657 Upgrade to Byte Buddy 1.14.10
Closes gh-38453
2023-11-21 15:33:22 +00:00
Andy Wilkinson a440a4f024 Upgrade to ActiveMQ 5.18.3
Closes gh-38452
2023-11-21 15:33:17 +00:00
Andy Wilkinson cec5c22fb1 Upgrade to Spring WS 4.0.8
Closes gh-38296
2023-11-21 13:23:47 +00:00
Andy Wilkinson 741905e294 Upgrade to Spring RESTDocs 3.0.1
Closes gh-38449
2023-11-21 13:23:47 +00:00
Andy Wilkinson e559159f04 Upgrade to Spring Kafka 3.0.13
Closes gh-38369
2023-11-21 13:23:42 +00:00
Andy Wilkinson a37566fd86 Upgrade to Spring Integration 6.0.9
Closes gh-38295
2023-11-21 13:23:41 +00:00
Andy Wilkinson 420091b9c8 Upgrade to Spring Data Bom 2022.0.12
Closes gh-38293
2023-11-21 13:23:41 +00:00
Andy Wilkinson a0b1b4641a Upgrade to SAAJ Impl 3.0.3
Closes gh-38448
2023-11-21 13:23:40 +00:00
Andy Wilkinson 76c72f6621 Upgrade to Netty 4.1.101.Final
Closes gh-38447
2023-11-21 13:23:35 +00:00
Andy Wilkinson c8a53a640d Upgrade to Lettuce 6.2.7.RELEASE
Closes gh-38445
2023-11-21 13:23:26 +00:00
Andy Wilkinson 9c20596650 Upgrade to Jetty 11.0.18
Closes gh-38444
2023-11-21 13:23:21 +00:00
Andy Wilkinson d2e08c84ed Upgrade to Jetty Reactive HTTPClient 3.0.10
Closes gh-38443
2023-11-21 13:23:16 +00:00
Andy Wilkinson ef5fe58a42 Upgrade to Jakarta XML WS 4.0.1
Closes gh-38442
2023-11-21 13:23:11 +00:00
Andy Wilkinson 77ced55843 Upgrade to Jakarta XML SOAP 3.0.1
Closes gh-38441
2023-11-21 13:23:06 +00:00
Andy Wilkinson 1dc908e8bc Upgrade to Jakarta Json 2.1.3
Closes gh-38440
2023-11-21 13:23:02 +00:00
Andy Wilkinson 88683496df Upgrade to Infinispan 14.0.21.Final
Closes gh-38439
2023-11-21 13:22:57 +00:00
Andy Wilkinson fb3f97a4fa Upgrade to Glassfish JAXB 4.0.4
Closes gh-38438
2023-11-21 13:22:52 +00:00
Andy Wilkinson 85e55fee9c Upgrade to Dropwizard Metrics 4.2.22
Closes gh-38437
2023-11-21 13:22:48 +00:00
Andy Wilkinson 70c3bceb64 Upgrade to DB2 JDBC 11.5.9.0
Closes gh-38436
2023-11-21 13:22:43 +00:00
Andy Wilkinson ebb7a547af Upgrade to Spring WS 3.1.8
Closes gh-38284
2023-11-21 12:52:40 +00:00
Andy Wilkinson 3b169a4d53 Upgrade to Spring RESTDocs 2.0.8.RELEASE
Closes gh-38434
2023-11-21 12:52:40 +00:00
Andy Wilkinson 3c820b8613 Upgrade to Spring Data Bom 2021.2.18
Closes gh-38282
2023-11-21 12:52:35 +00:00
Andy Wilkinson 79c467c8b6 Upgrade to Pooled JMS 1.2.6
Closes gh-38433
2023-11-21 12:52:34 +00:00
Andy Wilkinson 52fc4c019b Upgrade to Netty 4.1.101.Final
Closes gh-38432
2023-11-21 12:52:30 +00:00
Andy Wilkinson 95149822a5 Upgrade to Glassfish JAXB 2.3.9
Closes gh-38431
2023-11-21 12:52:25 +00:00
Andy Wilkinson 296af5f461 Upgrade to Elasticsearch 7.17.15
Closes gh-38430
2023-11-21 12:52:20 +00:00
Andy Wilkinson 7c504394f4 Upgrade to Dropwizard Metrics 4.2.22
Closes gh-38429
2023-11-21 12:52:15 +00:00
Andy Wilkinson c7c4ed3a12 Upgrade to DB2 JDBC 11.5.9.0
Closes gh-38428
2023-11-21 12:52:11 +00:00
Andy Wilkinson d437270e87 Upgrade to ActiveMQ 5.16.7
Closes gh-38427
2023-11-21 12:52:05 +00:00
Phillip Webb 59493e8306 Fix failing tests following version upgrades 2023-11-20 21:03:17 -08:00
Phillip Webb 84ddeea1a4 Merge branch '3.1.x'
Closes gh-38425
2023-11-20 20:35:40 -08:00
Phillip Webb 092428e752 Merge branch '3.0.x' into 3.1.x
Closes gh-38424
2023-11-20 20:35:31 -08:00
Jonatan Ivanov d5c22b9f5a Update access log pattern to align with Tomcat 10
As of Tomcat 10 "%D" changed to mean microseconds instead of
milliseconds.

See gh-38403
2023-11-20 20:34:48 -08:00
abdullah-jaffer 6f3b3fa6f6 Replace Function<String, String> with UnaryOperator<String>
See gh-38390
2023-11-20 20:05:03 -08:00
Phillip Webb b296ff890e Upgrade to Pulsar Reactive 0.5.0
Closes gh-38406
2023-11-20 18:52:45 -08:00
Phillip Webb 261ea6ce44 Upgrade to Versions Maven Plugin 2.16.2
Closes gh-38422
2023-11-20 18:52:44 -08:00
Phillip Webb b92dac5207 Upgrade to Spring WS 4.0.8
Closes gh-38320
2023-11-20 18:52:44 -08:00
Phillip Webb c3949dd1c9 Upgrade to Spring Security 6.2.0
Closes gh-38318
2023-11-20 18:52:44 -08:00
Phillip Webb 5bb05e6c7a Upgrade to Spring RESTDocs 3.0.1
Closes gh-38420
2023-11-20 18:52:44 -08:00
Phillip Webb cd56affdf3 Upgrade to Spring Pulsar 1.0.0
Closes gh-38419
2023-11-20 18:52:44 -08:00
Phillip Webb 5a89ddb1fd Upgrade to Spring Kafka 3.1.0
Closes gh-38316
2023-11-20 18:52:44 -08:00
Phillip Webb d00ca7dd4d Upgrade to Spring Data Bom 2023.1.0
Closes gh-38311
2023-11-20 18:52:44 -08:00
Phillip Webb e5ff5f56ea Upgrade to Spring AMQP 3.1.0
Closes gh-38308
2023-11-20 18:52:44 -08:00
Phillip Webb d6157d1fe3 Upgrade to Pooled JMS 3.1.5
Closes gh-38418
2023-11-20 18:52:44 -08:00
Phillip Webb eff1e5b5e2 Upgrade to Netty 4.1.101.Final
Closes gh-38417
2023-11-20 18:52:44 -08:00
Phillip Webb 498b54b4f0 Upgrade to MongoDB 4.11.1
Closes gh-38416
2023-11-20 18:52:43 -08:00
Phillip Webb 4e76563b9f Upgrade to Maven Javadoc Plugin 3.6.2
Closes gh-38415
2023-11-20 18:52:43 -08:00
Phillip Webb b2338f23c8 Upgrade to Lettuce 6.3.0.RELEASE
Closes gh-38414
2023-11-20 18:52:35 -08:00
Phillip Webb c84880e0e1 Upgrade to Kotlin Serialization 1.6.1
Closes gh-38413
2023-11-20 17:48:14 -08:00