Commit Graph

23798 Commits

Author SHA1 Message Date
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
Phillip Webb 67c4a989fb Upgrade to Infinispan 14.0.21.Final
Closes gh-38411
2023-11-20 17:48:06 -08:00
Phillip Webb 4f285b40bf Upgrade to Hazelcast 5.3.6
Closes gh-38410
2023-11-20 17:48:01 -08:00
Phillip Webb 593b9f7c2b Upgrade to Dropwizard Metrics 4.2.22
Closes gh-38409
2023-11-20 17:47:56 -08:00
Phillip Webb 5141ad568c Upgrade to DB2 JDBC 11.5.9.0
Closes gh-38408
2023-11-20 17:47:52 -08:00
Phillip Webb cd0894edee Upgrade to Byte Buddy 1.14.10
Closes gh-38407
2023-11-20 17:47:48 -08:00
Phillip Webb 3a32e4e913 Merge branch '3.1.x'
Closes gh-38405
2023-11-20 16:27:46 -08:00
Phillip Webb f68df82b30 Support lenient ContainerConnectionDetailsFactory hint registration
Update `ContainerConnectionDetailsFactory` hint registration logic
so that types are optional on the classpath.

See gh-36606
Fixes gh-38392
2023-11-20 16:26:22 -08:00
Andy Wilkinson 6065f219b3 Provide dependency management for org.crac:crac
Closes gh-38378
2023-11-16 20:09:07 +00:00
Andy Wilkinson 3b3bfd8a1b Upgrade to Spring LDAP 3.2.0
Closes gh-38317
2023-11-16 19:38:29 +00:00
Andy Wilkinson 31e8af4709 Upgrade to Spring HATEOAS 2.2.0
Closes gh-38314
2023-11-16 16:00:10 +00:00
Andy Wilkinson a9f49e1085 Upgrade to Spring HATEOAS 2.1.3
Closes gh-38375
2023-11-16 15:59:26 +00:00
Andy Wilkinson 473b801c52 Upgrade to Spring HATEOAS 2.0.7
Closes gh-38374
2023-11-16 15:58:41 +00:00
Andy Wilkinson 19f8e042a6 Upgrade to Spring HATEOAS 1.5.6
Closes gh-38373
2023-11-16 15:57:56 +00:00
Andy Wilkinson a68eae66e1 Start building against Spring HATEOAS 2.1.3 snapshots
See gh-38375
2023-11-16 12:12:21 +00:00
Andy Wilkinson 15e9ae91ea Start building against Spring HATEOAS 2.0.7 snapshots
See gh-38374
2023-11-16 12:10:58 +00:00
Andy Wilkinson 239e8a640e Start building against Spring HATEOAS 1.5.6 snapshots
See gh-38373
2023-11-16 12:09:55 +00:00
Andy Wilkinson 4d63983493 Start building against Spring Kafka 3.0.13 snapshots
See gh-38370
2023-11-16 09:41:42 +00:00
Moritz Halbritter d8ce901011 Close meter registries early in the shutdown process
Closes gh-38240
2023-11-16 09:26:02 +01:00
Eddú Meléndez 51f13404a5 Use KafkaContainer in smoke test for Kafka with SSL
See gh-38359
2023-11-15 15:25:58 -06:00
Andy Wilkinson 8b72e5612b Start building against Spring Kafka 3.0.13 snapshots
See gh-38369
2023-11-15 19:21:09 +00:00
Andy Wilkinson 517026ab9f Merge branch '3.1.x'
Closes gh-38366
2023-11-15 16:00:20 +00:00
Andy Wilkinson 37b2567aeb Merge branch '3.0.x' into 3.1.x
Closes gh-38365
2023-11-15 16:00:05 +00:00
Andy Wilkinson ff555c5ceb Merge branch '2.7.x' into 3.0.x
Closes gh-38364
2023-11-15 15:57:39 +00:00
Andy Wilkinson c2156d6803 Remove static state from CF web endpoint integration tests
The mocks being static meant that their state was shared across each
test in the class. This resulted in the tests being order dependent.
This commit uses instance variables to hold the mocks, thereby
ensuring that they're recreated for each test as part of the standard
JUnit lifecycle.

Closes gh-38363
2023-11-15 15:16:24 +00:00
Moritz Halbritter 7a8a393154 Revert "Close meter registries early in the shutdown process"
This reverts commit f62c1188a1.
2023-11-15 14:17:07 +01:00
Moritz Halbritter f62c1188a1 Close meter registries early in the shutdown process
Closes gh-38240

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2023-11-15 10:24:54 +01:00
Moritz Halbritter d6f67b02f7 Clarify which tracing components are disabled when using tracing in tests
See gh-33975
2023-11-15 09:13:15 +01:00
Moritz Halbritter 328261337e Merge branch '3.1.x'
Closes gh-38362
2023-11-15 09:07:09 +01:00
Moritz Halbritter 9c1c18c2b9 Document that tracing is disabled in tests in the "Tracing" section
Closes gh-33975
2023-11-15 09:06:39 +01:00
Andy Wilkinson 178756ccd6 Upgrade to Reactor Bom 2023.0.0
Closes gh-38307
2023-11-14 20:47:00 +00:00
Andy Wilkinson b7c7b47c97 Upgrade to Reactor Bom 2022.0.13
Closes gh-38299
2023-11-14 20:46:00 +00:00
Andy Wilkinson 7f6014f411 Upgrade to Reactor Bom 2022.0.13
Closes gh-38292
2023-11-14 20:45:03 +00:00
Andy Wilkinson 9b8bcec33e Upgrade to Reactor Bom 2020.0.38
Closes gh-38280
2023-11-14 20:44:18 +00:00
Andy Wilkinson 4c98cf88e6 Merge branch '3.1.x'
Closes gh-38358
2023-11-14 20:01:46 +00:00
Andy Wilkinson 38b5f80ba6 Merge branch '3.0.x' into 3.1.x
Closes gh-38357
2023-11-14 20:01:29 +00:00
Andy Wilkinson 88393da438 Upgrade to AspectJ 1.9.20.1
Closes gh-38355
2023-11-14 20:00:47 +00:00
Moritz Halbritter 82f0684cd8 Merge branch '3.1.x'
Closes gh-38354
2023-11-14 17:04:41 +01:00
Moritz Halbritter 22a991b334 Document tags format used in Gradle and Maven plugins
Closes gh-33088
2023-11-14 17:03:50 +01:00
Moritz Halbritter ed7cf1043e Merge branch '3.1.x'
Closes gh-38353
2023-11-14 16:29:59 +01:00
Moritz Halbritter 83da5a5bd8 Document how to remove base path from Cloud Foundry actuator endpoints
Closes gh-24991
2023-11-14 16:29:28 +01:00
Andy Wilkinson 8d01944666 Start building against Spring WS 3.1.8 snapshots
See gh-38284
2023-11-14 13:40:27 +00:00
Sébastien Deleuze e88bab69f6 Document Liberica JDK with CRaC
See gh-38350
2023-11-14 13:25:30 +01:00
Phillip Webb 0ef87f5102 Merge branch '3.1.x' 2023-11-13 10:42:56 -08:00
Phillip Webb b902bf6aca Merge branch '3.0.x' into 3.1.x 2023-11-13 10:42:32 -08:00
Phillip Webb 09e5a2f24a Update copyright year of changed files 2023-11-13 10:42:26 -08:00