Commit Graph

15617 Commits

Author SHA1 Message Date
Stephane Nicoll dad1e0b18d Upgrade to Embedded Mongo 3.2.8
Closes gh-29469
2022-01-19 08:37:11 +01:00
Stephane Nicoll c2f8823e4e Upgrade to Spring Integration 5.5.8
Closes gh-29286
2022-01-19 08:13:28 +01:00
Phillip Webb a77411ebd8 Merge branch '2.6.x' into 2.7.x
Closes gh-29460
2022-01-18 16:16:18 -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 654d142c95 Merge branch '2.6.x' into 2.7.x
Closes gh-29455
2022-01-18 20:35:06 +00: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
Stephane Nicoll 5c9e59493d Upgrade to Spring Data 2021.2.0-M2
Closes gh-29223
2022-01-18 09:57:10 +01:00
rstoyanchev 68f4938367 Update GraphQL QBE auto-config
This change is the same as 68806bfef8
for Querydsl, but applied also to the Query By Example auto config.

Closes gh-29445
2022-01-18 09:50:31 +01:00
Andy Wilkinson e23aaba32b Merge branch '2.6.x' into 2.7.x
Closes gh-29323
2022-01-17 13:21:19 +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 3bbdbd9e5f Upgrade to Spring Security 5.7.0-M1
Closes gh-29225
2022-01-17 08:47:25 +01:00
Stephane Nicoll ce6cc77ea7 Upgrade to Spring Kafka 2.8.2
Closes gh-29224
2022-01-17 08:46:43 +01:00
Stephane Nicoll 77e9047d31 Upgrade to Spring AMQP 2.4.2
Closes gh-29284
2022-01-17 08:46:16 +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
Stephane Nicoll 2f7d62eae9 Upgrade to SLF4J 1.7.33
Closes gh-29427
2022-01-15 17:50:04 +01:00
Stephane Nicoll 781ad288b0 Upgrade to SendGrid 4.8.2
Closes gh-29426
2022-01-15 17:50:04 +01:00
Stephane Nicoll a15ff0692c Upgrade to Rabbit AMQP Client 5.14.1
Closes gh-29425
2022-01-15 17:50:04 +01:00
Stephane Nicoll 6be4146907 Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29424
2022-01-15 17:50:04 +01:00
Stephane Nicoll 0cb553c0da Upgrade to Netty tcNative 2.0.47.Final
Closes gh-29423
2022-01-15 17:50:04 +01:00
Stephane Nicoll 998c7996aa Upgrade to Netty 4.1.73.Final
Closes gh-29422
2022-01-15 17:50:03 +01:00
Stephane Nicoll 3830e7a3bb Upgrade to Neo4j Java Driver 4.4.2
Closes gh-29421
2022-01-15 17:50:03 +01:00
Stephane Nicoll 5676e796d0 Upgrade to MongoDB 4.4.1
Closes gh-29420
2022-01-15 17:50:03 +01:00
Stephane Nicoll db389d7cac Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29419
2022-01-15 17:50:03 +01:00
Stephane Nicoll da3de9684a Upgrade to Maven Compiler Plugin 3.9.0
Closes gh-29418
2022-01-15 17:50:03 +01:00
Stephane Nicoll 28ecf53762 Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29417
2022-01-15 17:50:03 +01:00
Stephane Nicoll b2c92457ab Upgrade to Jedis 3.8.0
Closes gh-29416
2022-01-15 17:50:02 +01:00
Stephane Nicoll 2c403cb0e8 Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29415
2022-01-15 17:50:02 +01:00
Stephane Nicoll cf3935073f Upgrade to Byte Buddy 1.12.7
Closes gh-29414
2022-01-15 17:50:02 +01:00
Stephane Nicoll 998a74bf97 Upgrade to Build Helper Maven Plugin 3.3.0
Closes gh-29413
2022-01-15 17:50:02 +01:00
Stephane Nicoll 388b12a048 Upgrade to Spring LDAP 2.4.0-M1
Closes gh-29222
2022-01-15 17:50:02 +01:00
Stephane Nicoll 7c85d2bc07 Upgrade to Spring HATEOAS 1.5.0-M1
Closes gh-29353
2022-01-15 15:07:27 +01:00
Phillip Webb a2e473ec31 Merge branch '2.6.x' into 2.7.x 2022-01-14 22:56:43 -08: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 e4e16f81ec Merge branch '2.6.x' into 2.7.x
Closes gh-29411
2022-01-14 20:33:19 -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 9c481952d8 Remove deprecated convertEnvironment method 2022-01-14 17:38:23 -08:00
Phillip Webb 9764b3eba0 Change getEnvironment() to return null by default
Update the `SpringBootContextLoader.getEnvironment()` method so that it
returns `null` rather than a new `StandardEnvironment`.

Closes gh-29405
2022-01-14 17:35:58 -08:00
Phillip Webb c84d3c14fb Allow test property sources to override command line args
Refine `SpringBootContextLoader` logic so that inline test properties
are always added above command line arguments.

Closes gh-29404
2022-01-14 16:30:28 -08:00
Phillip Webb 9278a502c7 Merge branch '2.6.x' into 2.7.x 2022-01-14 13:57:25 -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
Brian Clozel cdee953252 Polish 2022-01-14 21:07:29 +01:00
Brian Clozel 68806bfef8 Fix build after Spring for GraphQL changes
See spring-projects/spring-graphql#244
2022-01-14 21:05:15 +01:00