Commit Graph

27895 Commits

Author SHA1 Message Date
Phillip Webb
039fbdfa7c Add DeferredLogFactory support
Add a new `DeferredLogFactory` interface and `DeferredLogs`
implementation that can be used when a `DeferredLog` instance is needed
but the `switchOver` method should be handled elsewhere.

This interface has primarily been added so `EnvironmentPostProcessor`
classes will no longer need to implement `ApplicationEventListener`
just to switch over their logs.

Closes gh-22496
2020-07-22 20:58:31 -07:00
Madhura Bhave
9e9eb90d09 Add multi-document properties file support
Update `OriginTrackedPropertiesLoader` so that it can support
multi-document properties files. These are similar to multi-document
YAML files but use `#---` as the separator.

Closes gh-22495

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2020-07-22 20:58:24 -07:00
Phillip Webb
945e5b9222 Add ConfigurationPropertySource.from method
Add a factory method to `ConfigurationPropertySource` that allows a
single Spring `PropertySource` instance to be adapted.

Closes gh-22494
2020-07-22 20:57:43 -07:00
Phillip Webb
078e146983 Filter empty YAML documents
Update `OriginTrackedYamlLoader` so that empty documents are filtered
from the result. Prior to this commit, our origin wrapper would confuse
the YAML processor and cause empty documents to be included in the Map
with a key of "document" and no value.

Closes gh-22493
2020-07-22 20:57:43 -07:00
Phillip Webb
fdc6e80163 Add trailing escape character test
Update `OriginTrackedPropertiesLoaderTests` to also test that an escape
character can be the last character on a line.
2020-07-22 20:57:36 -07:00
Phillip Webb
2eeffe7931 Add @Name support for value object binding
Update value object binder support so that parameters can be annotated
with `@Name` if a specific property name should be used. Prior to this
commit is was not possible to use Java reserved words as property names.

Closes gh-22492
2020-07-22 18:50:23 -07:00
Phillip Webb
2d3ac4bb2e Polish 2020-07-22 18:50:22 -07:00
Phillip Webb
3d7d9d064c Update copyright year of changed files 2020-07-22 18:50:07 -07:00
Phillip Webb
14c1b0938a Polish 2020-07-22 18:25:27 -07:00
Phillip Webb
da69286838 Merge branch '2.3.x' 2020-07-22 17:39:27 -07:00
Phillip Webb
187d3af7fc Update copyright year of changed files 2020-07-22 17:25:17 -07:00
Phillip Webb
d2a7808098 Polish 2020-07-22 17:25:04 -07:00
Phillip Webb
217b2eff89 Merge branch '2.2.x' into 2.3.x 2020-07-22 17:03:23 -07:00
Phillip Webb
b5e70157dc Update copyright year of changed files 2020-07-22 17:01:36 -07:00
Phillip Webb
51a26a4d5a Polish 2020-07-22 17:01:19 -07:00
Stephane Nicoll
0768ade5cd Merge branch '2.3.x' 2020-07-22 21:38:00 +02:00
Stephane Nicoll
dd615fd9dd Upgrade to Spring Integration 5.3.2
Closes gh-22389
2020-07-22 21:37:39 +02:00
Stephane Nicoll
6e217b4f66 Merge branch '2.2.x' into 2.3.x 2020-07-22 21:36:52 +02:00
Stephane Nicoll
0a756b5337 Merge branch '2.1.x' into 2.2.x 2020-07-22 21:36:21 +02:00
Stephane Nicoll
d9c34d5b84 Upgrade to Spring Integration 5.1.12
Closes gh-22511
2020-07-22 21:35:48 +02:00
Stephane Nicoll
68497649b1 Upgrade to Spring Integration 5.2.8
Closes gh-22385
2020-07-22 21:32:52 +02:00
Stephane Nicoll
bbf481ed1c Merge branch '2.3.x' 2020-07-22 20:38:13 +02:00
Stephane Nicoll
fb56483015 Upgrade to Spring Kafka 2.5.4
Closes gh-22390
2020-07-22 20:37:48 +02:00
Stephane Nicoll
f70670935d Merge branch '2.2.x' into 2.3.x 2020-07-22 20:37:03 +02:00
Stephane Nicoll
d1f9adc189 Upgrade to Spring Kafka 2.3.10
Closes gh-22386
2020-07-22 20:36:14 +02:00
Stephane Nicoll
cedd9c58ba Merge branch '2.3.x' 2020-07-22 18:47:38 +02:00
Stephane Nicoll
155f8a1a88 Upgrade to Spring AMQP 2.2.9
Closes gh-22387
2020-07-22 18:44:52 +02:00
Stephane Nicoll
eed4370d47 Merge branch '2.2.x' into 2.3.x 2020-07-22 18:44:10 +02:00
Stephane Nicoll
ad976bec20 Upgrade to Spring AMQP 2.2.9
Closes gh-22383
2020-07-22 18:43:46 +02:00
Stephane Nicoll
0e50f055a4 Merge branch '2.1.x' into 2.2.x 2020-07-22 18:43:09 +02:00
Stephane Nicoll
baa6a8aeb1 Upgrade to Spring AMQP 2.1.16
Closes gh-22507
2020-07-22 18:41:46 +02:00
Stephane Nicoll
42817224e1 Merge branch '2.3.x' 2020-07-22 13:38:55 +02:00
Stephane Nicoll
8be46529e1 Merge branch '2.2.x' into 2.3.x 2020-07-22 13:38:34 +02:00
Stephane Nicoll
e7297b43a5 Merge branch '2.1.x' into 2.2.x 2020-07-22 13:36:16 +02:00
Stephane Nicoll
b0f48ccb79 Add Groovy 2.5.13 to the upgrade ignore list
See gh-22505
2020-07-22 13:34:16 +02:00
Stephane Nicoll
71a41de4db Merge branch '2.3.x' 2020-07-22 11:12:20 +02:00
Stephane Nicoll
d2ed9dc090 Upgrade to Spring Data Neumann-SR2
Closes gh-22388
2020-07-22 11:11:11 +02:00
Stephane Nicoll
95f47b121b Merge branch '2.2.x' into 2.3.x 2020-07-22 11:10:41 +02:00
Stephane Nicoll
d5301f8b0a Upgrade to Spring Data Moore-SR9
Closes gh-22384
2020-07-22 11:09:58 +02:00
Stephane Nicoll
da19bf4d46 Merge branch '2.1.x' into 2.2.x 2020-07-22 11:09:12 +02:00
Stephane Nicoll
8b20840a1a Upgrade to Spring Data Lovelace-SR19
Closes gh-22382
2020-07-22 11:08:13 +02:00
Andy Wilkinson
cba3284052 Merge pull request #22499 from dreis2211
* gh-22499:
  Add plugin management for liquibase-maven-plugin

Closes gh-22499
2020-07-22 09:43:05 +01:00
dreis2211
8929fbe46c Add plugin management for liquibase-maven-plugin
See gh-22499
2020-07-22 09:42:46 +01:00
Andy Wilkinson
0ac7178ae1 Merge branch '2.3.x'
Closes gh-22491
2020-07-22 06:43:28 +01:00
Andy Wilkinson
1a35c12238 Merge pull request #22488 from dreis2211
* gh-22488:
  Remove redundant compiler arguments in Gradle build files

Closes gh-22488
2020-07-22 06:43:18 +01:00
dreis2211
198131f5e4 Remove redundant compiler arguments in Gradle build files
See gh-22488
2020-07-22 06:42:48 +01:00
Andy Wilkinson
01558100d1 Do not attempt to use AprLifecycleListener in a native image
Closes gh-22485
2020-07-22 06:30:39 +01:00
Andy Wilkinson
8799033801 Merge branch '2.3.x' 2020-07-22 06:26:44 +01:00
Andy Wilkinson
2063c242ae Polish 2020-07-22 06:25:55 +01:00
Brian Clozel
c6df64aeb6 Merge branch '2.3.x' 2020-07-21 16:50:57 +02:00