Andy Wilkinson
d2fae6e19e
Merge branch '2.3.x'
...
Closes gh-23407
2020-09-18 09:09:53 +01:00
Andy Wilkinson
3861ef13fb
Merge branch '2.2.x' into 2.3.x
...
Closes gh-23406
2020-09-18 09:09:41 +01:00
Andy Wilkinson
5ec673ff2a
Add anchors to section headers in Gradle plugin docs
...
Fixes gh-23402
2020-09-18 09:06:54 +01:00
Phillip Webb
35673b7472
Add Binder to BootstrapContext
...
Update `ConfigDataEnvironment` so that it adds the initial `Binder`
to the `BootstrapContext` for `Bootstrappers` to use.
Closes gh-23401
2020-09-17 12:37:19 -07:00
Phillip Webb
8b8d5ccb10
Allow trailing whitespace document split marker
...
Refine `OriginTrackedPropertiesLoader` document split detection to be
more lenient if there is trailing whitespace.
Closes gh-23399
2020-09-17 11:23:59 -07:00
Andy Wilkinson
90483d343f
Merge pull request #23391 from dreis2211
...
* gh-23391:
Upgrade Java 15 CI image to use the Java 15 GA build
Closes gh-23391
2020-09-17 16:37:12 +01:00
dreis2211
f85fe952fc
Upgrade Java 15 CI image to use the Java 15 GA build
...
See gh-23391
2020-09-17 16:36:36 +01:00
Andy Wilkinson
46cd48737f
Merge branch '2.3.x'
2020-09-17 15:17:11 +01:00
Spring Buildmaster
f466ea1f2a
Next development version (v2.3.5.BUILD-SNAPSHOT)
2020-09-17 13:14:51 +00:00
Andy Wilkinson
aaf25d3aab
Upgrade to SendGrid 4.6.5
...
Closes gh-23397
2020-09-17 13:22:11 +01:00
Andy Wilkinson
7957e246fc
Upgrade to Micrometer 1.5.5
...
Closes gh-23396
2020-09-17 13:22:10 +01:00
Andy Wilkinson
ac9abab921
Upgrade to Flyway 6.5.6
...
Closes gh-23395
2020-09-17 13:22:08 +01:00
Andy Wilkinson
ab64067545
Merge branch '2.3.x'
...
Closes gh-23394
2020-09-17 13:02:47 +01:00
Andy Wilkinson
07dc202966
Upgrade to Micrometer 1.5.5
...
Closes gh-23393
2020-09-17 13:02:23 +01:00
Andy Wilkinson
e93e267679
Merge branch '2.3.x'
2020-09-17 12:52:09 +01:00
Andy Wilkinson
6e369c9505
Merge branch '2.2.x' into 2.3.x
2020-09-17 12:51:56 +01:00
Spring Buildmaster
bd8300cb6b
Next development version (v2.2.11.BUILD-SNAPSHOT)
2020-09-17 11:04:48 +00:00
Andy Wilkinson
ea5c6c2923
Polish BootstrapRegistry's javadoc
...
See gh-23326
2020-09-17 09:55:05 +01:00
Andy Wilkinson
986a9a49a3
Merge branch '2.3.x'
2020-09-17 09:48:02 +01:00
Andy Wilkinson
16ff7022db
Merge branch '2.2.x' into 2.3.x
2020-09-17 09:47:18 +01:00
Andy Wilkinson
c23e420914
Merge branch '2.1.x' into 2.2.x
2020-09-17 09:47:06 +01:00
Andy Wilkinson
dbd27839e5
Polish logging in BintrayService
2020-09-17 09:46:39 +01:00
Phillip Webb
99dc7914b2
Attempt to fix ConcurrentModificationException
...
Attempt to fix `ConcurrentModificationException` which occurs on
Java 11+.
See gh-23326
2020-09-17 01:41:39 -07:00
Andy Wilkinson
cad079ce7d
Merge branch '2.3.x'
2020-09-17 09:36:05 +01:00
Andy Wilkinson
0fd61c1a14
Merge branch '2.2.x' into 2.3.x
2020-09-17 09:35:55 +01:00
Andy Wilkinson
71e3844460
Merge branch '2.1.x' into 2.2.x
2020-09-17 09:35:41 +01:00
Spring Buildmaster
cb4eb929f6
Next development version (v2.1.18.BUILD-SNAPSHOT)
2020-09-17 07:33:44 +00:00
Phillip Webb
c284edde67
Update copyright year of changed files
2020-09-17 00:31:01 -07:00
Phillip Webb
1ae1436211
Refactor BootstrapRegistry support
...
Refactor `BootstrapRegistry` support following initial prototype work
with the Spring Cloud team.
This update splits the `BootstrapRegistry` API into `BootstrapRegistry`,
`BootstrapContext` and `ConfigurableBootstrapContext` interfaces and
moves it to the same package as `SpringApplication`.
A new `Bootstrapper` interface has been introduced that can be added
to the `SpringApplication` to customize the `BootstrapRegistry` before
it's used.
Closes gh-23326
2020-09-17 00:31:00 -07:00
Phillip Webb
27095d9043
Polish
2020-09-17 00:31:00 -07:00
Phillip Webb
10ad53afbd
Fix FailureAnalyzer package tangle
...
Move `IncompatibleConfigurationFailureAnalyzer` to fix a package tangle.
Closes gh-23385
2020-09-17 00:31:00 -07:00
Phillip Webb
6509310fdb
Fix DefaultPropertiesPropertySource package tangle
...
Relocate `DefaultPropertiesPropertySource` to fix a package tangle.
Closes gh-23383
2020-09-17 00:31:00 -07:00
Stephane Nicoll
268904d6ae
Upgrade Java 15 version in CI image
...
Closes gh-23379
2020-09-17 09:27:15 +02:00
Stephane Nicoll
4d7339d189
Upgrade to Spring Session 2020.0.0-RC1
...
Closes gh-23188
2020-09-17 08:53:54 +02:00
Stephane Nicoll
0867b3cf87
Merge branch '2.3.x'
2020-09-17 08:53:18 +02:00
Stephane Nicoll
3622fd5b04
Upgrade to Spring Session Dragonfruit-SR1
...
Closes gh-23187
2020-09-17 08:51:49 +02:00
Stephane Nicoll
0b06457ace
Merge branch '2.2.x' into 2.3.x
2020-09-17 08:51:06 +02:00
Stephane Nicoll
ab2115633f
Upgrade to Micrometer 1.3.14
...
Closes gh-23388
2020-09-17 08:46:30 +02:00
Stephane Nicoll
35b33303d0
Upgrade to Spring Session Corn-SR4
...
Closes gh-23186
2020-09-17 08:45:52 +02:00
Stephane Nicoll
71aa911c61
Merge branch '2.3.x'
2020-09-17 08:23:10 +02:00
Stephane Nicoll
29988f1d38
Merge branch '2.2.x' into 2.3.x
2020-09-17 08:22:57 +02:00
Stephane Nicoll
3e93a3ec58
Merge branch '2.1.x' into 2.2.x
2020-09-17 08:22:39 +02:00
Stephane Nicoll
91c1d52fc1
Upgrade to Micrometer 1.1.18
...
Closes gh-23384
2020-09-17 07:40:59 +02:00
Stephane Nicoll
db04672403
Upgrade to Spring Session Bean-SR12
...
Closes gh-23185
2020-09-17 07:37:14 +02:00
Stephane Nicoll
f1438f3e67
Upgrade to Spring Batch 4.3.0-RC1
...
Closes gh-23189
2020-09-17 07:27:42 +02:00
Stephane Nicoll
bb6d86d30b
Upgrade to Spring Integration 5.4.0-M3
...
Closes gh-23010
2020-09-17 07:27:15 +02:00
Stephane Nicoll
06b842e29c
Upgrade to Spring Kafka 2.6.1
...
Closes gh-23382
2020-09-17 07:26:40 +02:00
Stephane Nicoll
1d66b25b26
Merge branch '2.3.x'
2020-09-17 07:25:38 +02:00
Stephane Nicoll
a2be6e0817
Upgrade to Spring Kafka 2.5.6
...
Closes gh-23199
2020-09-17 07:25:09 +02:00
Stephane Nicoll
a76f5ae03e
Merge branch '2.2.x' into 2.3.x
2020-09-17 07:24:24 +02:00