Commit Graph

35272 Commits (fb44e1c7c2dc05d9fbc823ad03f3dfc445fe3d46)
 

Author SHA1 Message Date
Andy Wilkinson fb44e1c7c2 Merge branch '2.5.x' into 2.6.x 3 years ago
Spring Builds 5521a5d160 Next development version (v2.5.10-SNAPSHOT) 3 years ago
Stephane Nicoll 94c7a60845 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll c488be5adc Upgrade to MariaDB 2.7.5
Closes gh-29498
3 years ago
Stephane Nicoll 5dbde1b294 Upgrade to Hibernate 5.6.4.Final
Closes gh-29497
3 years ago
Stephane Nicoll 6ae5bfb728 Upgrade to MariaDB 2.7.5
Closes gh-29496
3 years ago
Phillip Webb 5b1486cc26 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb d211b0f3b3 Disable test is Docker is not available
See gh-28843
3 years ago
Phillip Webb 1f61c36f7a Merge branch '2.5.x' into 2.6.x
Closes gh-29491
3 years ago
Andy Wilkinson 66428527e0 Minimize tasks run in ConventionsPluginTests
Update `ConventionsPluginTests` so that dependency resolution is
not required. This provides a work-around for our currently failing
Windows build.

Closes gh-29490
3 years ago
Andy Wilkinson 6bea2172cb Switch tests to properties that are not deprecated
Closes gh-29488
3 years ago
Andy Wilkinson ee9c399eba Merge branch '2.5.x' into 2.6.x
Closes gh-29485
3 years ago
Andy Wilkinson 1b3d088056 Move JdbcSessionDataSourceInitializerTests into src/test/java
Closes gh-29484
3 years ago
Andy Wilkinson 4c422b9f3c Merge branch '2.5.x' into 2.6.x 3 years ago
Andy Wilkinson b60612dabb Disable LoaderIntegrationTests when Docker's unavailable
Closes gh-29385
3 years ago
Andy Wilkinson 52f612b3eb Merge branch '2.5.x' into 2.6.x
Closes gh-29480
3 years ago
Andy Wilkinson 9cb66d55d1 Refer to Maven Resolver rather than Aether
Closes gh-29255
3 years ago
Stephane Nicoll d92939e773 Merge branch '2.5.x' into 2.6.x
Closes gh-29478
3 years ago
Stephane Nicoll 4eb458f7d8 Prevent early resolution of factory beans
This commit updates DatabaseInitializationDependencyConfigurer so that
it does not inject the Environment anymore. Doing so in such a low-level
callback can lead to early resolution of factory beans. Rather, this
commit uses the EnvironmentAware callback that short-circuit dependency
resolution.

Closes gh-29475
3 years ago
Stephane Nicoll 76555f31ff Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll 124a3219e8 Upgrade to Pooled JMS 1.2.3
Closes gh-29468
3 years ago
Stephane Nicoll 60971c6fdb Upgrade to MySQL 8.0.28
Closes gh-29467
3 years ago
Stephane Nicoll aba3b1dc5f Upgrade to Spring Integration 5.5.8
Closes gh-29320
3 years ago
Stephane Nicoll cdd479556f Upgrade to Pooled JMS 1.2.3
Closes gh-29466
3 years ago
Stephane Nicoll 849fb8e435 Upgrade to Netty tcNative 2.0.47.Final
Closes gh-29465
3 years ago
Stephane Nicoll 3a043603e8 Upgrade to MySQL 8.0.28
Closes gh-29464
3 years ago
Stephane Nicoll 2782c3b077 Upgrade to Spring Integration 5.5.8
Closes gh-29314
3 years ago
Phillip Webb f6cdc27b2a Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb eca05c42fb Further refine LoaderIntegrationTests for CI
Update `LoaderIntegrationTests` to filter compatible JDKs early.

See gh-29385
3 years ago
Phillip Webb 392de30390 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb de8f8c3e64 Refine LoaderIntegrationTests for CI
Refine `LoaderIntegrationTests` to fix failures when CI builds are
running with later JDK versions.

See gh-29385
3 years ago
Phillip Webb 44537d4494 Merge branch '2.5.x' into 2.6.x
Closes gh-29462
3 years ago
Phillip Webb 3d908079ef Run LoaderIntegrationTests against multiple JDKs
Update `LoaderIntegrationTests` to run against OpenJDK 8, 11 and 17 as
well as Oracle JDK 17.

Closes gh-29385
3 years ago
Phillip Webb 3b4409305a Merge branch '2.5.x' into 2.6.x
Closes gh-29459
3 years ago
Phillip Webb 3d46b06e8d Fix config data placeholder resolution active document logic
Update `ConfigDataEnvironmentContributor.isActive` so that unbound
imports are no longer considered active. Prior to this commit, any
`ConfigDataEnvironmentContributor` that had `null` properties was
considered active. This is incorrect for `Kind.UNBOUND_IMPORT`
contributors since we haven't yet bound the `spring.config.*`
properties.

The `ConfigDataEnvironmentContributorPlaceholdersResolver` has been
updated to handle the refined logic. A placeholder can now be resolved
from the current contributor, or from an unbound contributor by binding
it on the fly.

Fixes gh-29386
3 years ago
Andy Wilkinson 4ee260aa8c Merge branch '2.5.x' into 2.6.x
Closes gh-29454
3 years ago
Andy Wilkinson 1c6471ef60 Register AprLifecycleListener with Server not Context
Fixes gh-28814
3 years ago
Andy Wilkinson d28942ea53 Merge branch '2.5.x' into 2.6.x
Closes gh-29449
3 years ago
Andy Wilkinson 2394cbf650 Merge pull request #29444 from jprinet
* gh-29444:
  Upgrade to Gradle Enterprise Plugin 3.8.1

Closes gh-29444
3 years ago
Jerome Prinet 744d977480 Upgrade to Gradle Enterprise Plugin 3.8.1
See gh-29444
3 years ago
Andy Wilkinson 27cd1c06a6 Merge branch '2.5.x' into 2.6.x
Closes gh-29322
3 years ago
Andy Wilkinson 75187349e8 Upgrade to Spring REST Docs 2.0.6.RELEASE
Closes gh-29321
3 years ago
Stephane Nicoll 413fafebff Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll a9feb923d7 Update to Spring Kafka 2.8.2
Closes gh-29319
3 years ago
Stephane Nicoll 200c05ff98 Upgrade to Spring AMQP 2.4.2
Closes gh-29318
3 years ago
Stephane Nicoll e545441f01 Upgrade to Spring Kafka 2.7.10
Closes gh-29313
3 years ago
Phillip Webb 6afd9b665d Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb bccc9c1861 Refine ConfigurationPropertySources attach logic
Refine `ConfigurationPropertySources.attach` logic to endure that
the attached or reattached source is always first.

See gh-29409
3 years ago
Phillip Webb 28cf6f5c59 Merge branch '2.5.x' into 2.6.x
Closes gh-29410
3 years ago
Phillip Webb 79d9549805 Fix ConfigurationPropertySources attach logic
Fix `ConfigurationPropertySources.attach` so that repeated calls to the
same source no longer create a new instance.

Fixes gh-29409
3 years ago