Stephane Nicoll
e2033992c7
Merge branch '2.4.x'
2021-01-15 08:25:41 +01:00
Stephane Nicoll
9343633582
Merge branch '2.3.x' into 2.4.x
2021-01-15 08:25:27 +01:00
Stephane Nicoll
9a53865c8f
Polish
2021-01-15 08:24:57 +01:00
Phillip Webb
33c1a050ee
Merge branch '2.4.x'
2021-01-14 21:15:17 -08:00
Phillip Webb
909f71708f
Attempt to fix homebrew tap repo update
...
See gh-24677
2021-01-14 21:02:39 -08:00
Phillip Webb
1e3330c375
Attempt to fix homebrew tap repo update
...
See gh-24677
2021-01-14 20:55:03 -08:00
Phillip Webb
a790a9079d
Attempt to fix homebrew tap repo update
...
See gh-24677
2021-01-14 20:49:16 -08:00
Phillip Webb
f3719b99ca
Merge branch '2.4.x'
2021-01-14 20:35:26 -08:00
Spring Buildmaster
dc76aa312e
Next development version (v2.4.3-SNAPSHOT)
2021-01-15 03:19:45 +00:00
Phillip Webb
0fd3cd5ed5
Merge branch '2.4.x'
2021-01-14 17:25:22 -08:00
Phillip Webb
26f2caca22
Update copyright year of changed files
2021-01-14 17:25:09 -08:00
Phillip Webb
daf2b2fea3
Merge branch '2.4.x'
...
Fixes gh-24846
2021-01-14 17:23:24 -08:00
Phillip Webb
c0aef4c35f
Apply SystemProperties to LoggerContext
...
Update `LoggingSystemProperties` so that system environment properties
are also applied to the `LoggerContext`. This is required when multiple
applications are deployed to the same Servlet container. In such setups
there's only a single JVM and the System Environment can be changed
when multiple applications start at the same time.
Fixes gh-24835
2021-01-14 17:22:37 -08:00
Madhura Bhave
b7843f9399
Merge branch '2.4.x'
...
Closes gh-24846
2021-01-14 16:15:15 -08:00
Madhura Bhave
68fc2329c8
Revert "Remove unnecessary code"
...
Fixes gh-24835
2021-01-14 16:13:30 -08:00
Scott Frederick
45acd5f30c
Merge branch '2.4.x'
2021-01-14 14:13:13 -06:00
Scott Frederick
716dce3859
Merge branch '2.3.x' into 2.4.x
2021-01-14 14:11:51 -06:00
Spring Buildmaster
8f692a16c6
Next development version (v2.3.9.BUILD-SNAPSHOT)
2021-01-14 18:45:38 +00:00
Brian Clozel
4dd60684c9
Merge branch '2.4.x'
...
Closes gh-24844
2021-01-14 18:36:31 +01:00
Brian Clozel
6f51831001
Fix docs on probe state during graceful shutdown
...
This commit improves the "Application lifefycle and Probes states"
section and underlines the difference between `AvailabilityState` and
the availability of Probes over HTTP.
Closes gh-24843
2021-01-14 18:30:15 +01:00
Stephane Nicoll
a788ef4958
Merge branch '2.4.x'
...
Closes gh-24842
2021-01-14 18:03:38 +01:00
Stephane Nicoll
dda8b5d287
Revert "Upgrade to Kafka 2.6.1"
...
See gh-24247
2021-01-14 18:03:09 +01:00
Stephane Nicoll
2072e7242a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24841
2021-01-14 18:02:28 +01:00
Stephane Nicoll
283ed48d63
Unwrap Datasource against an actual interface
...
This commit updates DataSourceUnwrapper to take a separate interface
type argument if the target datasource has to be unwrapped, given that
the target type is usually not an interface.
Closes gh-24697
2021-01-14 18:00:35 +01:00
Stephane Nicoll
51636eef97
Merge branch '2.2.x' into 2.3.x
2021-01-14 18:00:20 +01:00
Stephane Nicoll
9f40b9de7b
Merge branch '2.4.x'
...
Closes gh-24832
2021-01-14 10:55:31 +01:00
Stephane Nicoll
5d85ac6838
Complete configuration metadata for spring.config.*
...
Closes gh-24816
2021-01-14 10:54:51 +01:00
Spring Buildmaster
4a843d40c8
Next development version (v2.2.14.BUILD-SNAPSHOT)
2021-01-14 09:32:12 +00:00
Stephane Nicoll
03844c00cc
Upgrade to Dependency Management Plugin 1.0.11
...
Closes gh-24830
2021-01-14 09:05:34 +01:00
Stephane Nicoll
146a884827
Merge branch '2.4.x'
2021-01-14 09:04:46 +01:00
Stephane Nicoll
3aa960a060
Upgrade to Spring Kafka 2.6.5
...
Closes gh-24703
2021-01-14 08:54:02 +01:00
Stephane Nicoll
d6d0abcfd5
Upgrade to Spring AMQP 2.3.4
...
Closes gh-24702
2021-01-14 08:53:30 +01:00
Stephane Nicoll
da8a8b9712
Upgrade to Spring Integration 5.4.3
...
Closes gh-24701
2021-01-14 08:52:51 +01:00
Stephane Nicoll
bb33574ad4
Upgrade to Netty tcNative 2.0.36.Final
...
Closes gh-24829
2021-01-14 08:52:16 +01:00
Stephane Nicoll
e73c124b2d
Upgrade to Netty 4.1.58.Final
...
Closes gh-24828
2021-01-14 08:52:15 +01:00
Stephane Nicoll
27162bc3b9
Upgrade to Dependency Management Plugin 1.0.11.RELEASE
...
Closes gh-24827
2021-01-14 08:52:14 +01:00
Stephane Nicoll
19188de1bf
Merge branch '2.3.x' into 2.4.x
2021-01-14 08:51:19 +01:00
Stephane Nicoll
3ecd1001a1
Upgrade to Spring Kafka 2.5.11.RELEASE
...
Closes gh-24826
2021-01-14 08:38:29 +01:00
Stephane Nicoll
696539c68f
Upgrade to Spring Integration 5.3.5.RELEASE
...
Closes gh-24825
2021-01-14 08:38:27 +01:00
Stephane Nicoll
8908969a6c
Upgrade to Spring AMQP 2.2.14.RELEASE
...
Closes gh-24824
2021-01-14 08:38:26 +01:00
Stephane Nicoll
92f132ae35
Upgrade to Netty tcNative 2.0.36.Final
...
Closes gh-24823
2021-01-14 08:38:25 +01:00
Stephane Nicoll
6f9e3a6e94
Upgrade to Netty 4.1.58.Final
...
Closes gh-24822
2021-01-14 08:38:24 +01:00
Stephane Nicoll
1dd445b6ca
Upgrade to Dependency Management Plugin 1.0.11.RELEASE
...
Closes gh-24821
2021-01-14 08:38:23 +01:00
Stephane Nicoll
f8c14c9681
Merge branch '2.2.x' into 2.3.x
2021-01-14 08:34:52 +01:00
Stephane Nicoll
5cde6ba719
Upgrade to Dependency Management Plugin 1.0.11
...
Close gh-24742
2021-01-14 08:16:54 +01:00
Stephane Nicoll
a9f7b2a29b
Upgrade to Spring Integration 5.2.11.RELEASE
...
Closes gh-24820
2021-01-14 08:16:32 +01:00
Stephane Nicoll
0d48b9ff2f
Upgrade to Spring Amqp 2.2.14.RELEASE
...
Closes gh-24819
2021-01-14 08:16:31 +01:00
Stephane Nicoll
4c68ae7102
Upgrade to Netty 4.1.58.Final
...
Closes gh-24818
2021-01-14 08:15:36 +01:00
Madhura Bhave
fec707164a
Merge branch '2.4.x'
...
See gh-24815
2021-01-13 16:23:40 -08:00
Madhura Bhave
ea08a517c7
Merge branch '2.3.x' into 2.4.x
...
See gh-24814
2021-01-13 16:23:14 -08:00