Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,255 Commits 23 Branches 0 Tags
d92939e7732fcbd4c97184fe3aa416ef13f36812
Commit Graph

35255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
d92939e773 Merge branch '2.5.x' into 2.6.x 
Closes gh-29478
 2022-01-19 12:24:15 +01:00
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
 2022-01-19 11:49:56 +01:00
Stephane Nicoll
76555f31ff Merge branch '2.5.x' into 2.6.x 2022-01-19 08:17:46 +01:00
Stephane Nicoll
124a3219e8 Upgrade to Pooled JMS 1.2.3 
Closes gh-29468
 2022-01-19 08:17:20 +01:00
Stephane Nicoll
60971c6fdb Upgrade to MySQL 8.0.28 
Closes gh-29467
 2022-01-19 08:17:19 +01:00
Stephane Nicoll
aba3b1dc5f Upgrade to Spring Integration 5.5.8 
Closes gh-29320
 2022-01-19 08:12:33 +01:00
Stephane Nicoll
cdd479556f Upgrade to Pooled JMS 1.2.3 
Closes gh-29466
 2022-01-19 08:12:08 +01:00
Stephane Nicoll
849fb8e435 Upgrade to Netty tcNative 2.0.47.Final 
Closes gh-29465
 2022-01-19 08:12:07 +01:00
Stephane Nicoll
3a043603e8 Upgrade to MySQL 8.0.28 
Closes gh-29464
 2022-01-19 08:12:06 +01:00
Stephane Nicoll
2782c3b077 Upgrade to Spring Integration 5.5.8 
Closes gh-29314
 2022-01-19 08:09:50 +01:00
Phillip Webb
f6cdc27b2a Merge branch '2.5.x' into 2.6.x 2022-01-18 18:48:40 -08:00
Phillip Webb
eca05c42fb Further refine LoaderIntegrationTests for CI 
Update `LoaderIntegrationTests` to filter compatible JDKs early.

See gh-29385
 2022-01-18 18:47:41 -08:00
Phillip Webb
392de30390 Merge branch '2.5.x' into 2.6.x 2022-01-18 18:18:56 -08:00
Phillip Webb
de8f8c3e64 Refine LoaderIntegrationTests for CI 
Refine `LoaderIntegrationTests` to fix failures when CI builds are
running with later JDK versions.

See gh-29385
 2022-01-18 18:16:47 -08:00
Phillip Webb
44537d4494 Merge branch '2.5.x' into 2.6.x 
Closes gh-29462
 2022-01-18 17:36:59 -08:00
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
 2022-01-18 17:36:48 -08:00
Phillip Webb
3b4409305a Merge branch '2.5.x' into 2.6.x 
Closes gh-29459
 2022-01-18 16:15:20 -08:00
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
 2022-01-18 16:14:52 -08:00
Andy Wilkinson
4ee260aa8c Merge branch '2.5.x' into 2.6.x 
Closes gh-29454
 2022-01-18 20:34:51 +00:00
Andy Wilkinson
1c6471ef60 Register AprLifecycleListener with Server not Context 
Fixes gh-28814
 2022-01-18 20:34:08 +00:00
Andy Wilkinson
d28942ea53 Merge branch '2.5.x' into 2.6.x 
Closes gh-29449
 2022-01-18 12:00:20 +00:00
Andy Wilkinson
2394cbf650 Merge pull request #29444 from jprinet 
* gh-29444:
  Upgrade to Gradle Enterprise Plugin 3.8.1

Closes gh-29444
 2022-01-18 11:59:54 +00:00
Jerome Prinet
744d977480 Upgrade to Gradle Enterprise Plugin 3.8.1 
See gh-29444
 2022-01-18 11:59:36 +00:00
Andy Wilkinson
27cd1c06a6 Merge branch '2.5.x' into 2.6.x 
Closes gh-29322
 2022-01-17 13:20:29 +00:00
Andy Wilkinson
75187349e8 Upgrade to Spring REST Docs 2.0.6.RELEASE 
Closes gh-29321
 2022-01-17 13:05:15 +00:00
Stephane Nicoll
413fafebff Merge branch '2.5.x' into 2.6.x 2022-01-17 08:53:21 +01:00
Stephane Nicoll
a9feb923d7 Update to Spring Kafka 2.8.2 
Closes gh-29319
 2022-01-17 08:44:50 +01:00
Stephane Nicoll
200c05ff98 Upgrade to Spring AMQP 2.4.2 
Closes gh-29318
 2022-01-17 08:44:15 +01:00
Stephane Nicoll
e545441f01 Upgrade to Spring Kafka 2.7.10 
Closes gh-29313
 2022-01-17 08:41:47 +01:00
Phillip Webb
6afd9b665d Merge branch '2.5.x' into 2.6.x 2022-01-14 22:56:30 -08:00
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
 2022-01-14 22:55:26 -08:00
Phillip Webb
28cf6f5c59 Merge branch '2.5.x' into 2.6.x 
Closes gh-29410
 2022-01-14 20:33:05 -08:00
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
 2022-01-14 20:32:34 -08:00
Phillip Webb
14fe9347b5 Merge branch '2.5.x' into 2.6.x 2022-01-14 13:56:47 -08:00
Phillip Webb
3f7bf7d34f Modify SpringApplication Environment rather than setting it 
Update `SpringBootContextLoader` so that when possible the
`SpringApplication` remains in control of creating the `Environment`
instance.

Prior to this commit, we would always create the `Environment` in the
`SpringBootContextLoader` and then call `setEnvironment` on the
`SpringApplication`. This meant that the `ApplicationEnvironment`
classes were not used and that `isCustomEnvironment` was set to `true`
so no conversion was applied.

With the updated code, an `ApplicationListener` is used to mutate the
`Environment` instance and add the required test property sources.

Fixes gh-29169
 2022-01-14 13:47:22 -08:00
Andy Wilkinson
d29a5a2f43 Merge branch '2.5.x' into 2.6.x 
Closes gh-29401
 2022-01-14 15:55:41 +00:00
Andy Wilkinson
e8cbec0836 Clarify documentation of RestTemplate customization 
Closes gh-29394
 2022-01-14 15:51:08 +00:00
Andy Wilkinson
8868d34c24 Merge branch '2.5.x' into 2.6.x 
Closes gh-29399
 2022-01-14 15:48:57 +00:00
Andy Wilkinson
d051146eb4 Use Testcontainers instead on Embedded Mongo 
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.

Closes gh-28843
 2022-01-14 15:48:31 +00:00
Stephane Nicoll
1b2fa3cec1 Merge branch '2.5.x' into 2.6.x 2022-01-14 16:22:10 +01:00
Stephane Nicoll
1666b1c284 Upgrade to Neo4j Java Driver 4.4.2 
Closes gh-29398
 2022-01-14 15:54:48 +01:00
Stephane Nicoll
c2fa4ffd7e Upgrade to SLF4J 1.7.33 
Closes gh-29397
 2022-01-14 15:49:56 +01:00
Stephane Nicoll
afcba76c3c Upgrade to R2DBC Bom Arabba-SR12 
Closes gh-29396
 2022-01-14 15:49:55 +01:00
Stephane Nicoll
dac4888137 Upgrade to Netty tcNative 2.0.47.Final 
Closes gh-29395
 2022-01-14 15:49:54 +01:00
Stephane Nicoll
af79829cab Upgrade to Spring Data 2021.1.1 
Closes gh-29317
 2022-01-14 15:44:45 +01:00
Stephane Nicoll
1e44e4e52e Upgrade to Spring HATEOAS 1.4.1 
Closes gh-29283
 2022-01-14 15:44:16 +01:00
Stephane Nicoll
5883b22e01 Upgrade to SLF4J 1.7.33 
Closes gh-29392
 2022-01-14 12:21:04 +01:00
Stephane Nicoll
1e22504d21 Upgrade to R2DBC Bom Arabba-SR12 
Closes gh-29391
 2022-01-14 12:21:02 +01:00
Stephane Nicoll
251f4e8a3f Upgrade to Spring AMQP 2.3.14 
Closes gh-29312
 2022-01-14 12:12:00 +01:00
Stephane Nicoll
777361421c Upgrade to Spring Data 2021.0.8 
Closes gh-29311
 2022-01-14 12:11:30 +01:00