Madhura Bhave
abe95fa8a7
Merge branch '2.2.x'
...
Closes gh-19600
2020-01-09 17:57:39 -08:00
Madhura Bhave
7f0573df49
Fallback on underlying server default when determining outcome tag
...
This commit also changed the default outcome to SUCCESS
Fixes gh-19367
2020-01-09 17:55:35 -08:00
Madhura Bhave
ed4261a61c
Merge branch '2.2.x'
...
Closes gh-19598
2020-01-09 17:10:24 -08:00
Madhura Bhave
a017b8905a
Adapt field name in ValidationBindHandler to a valid ConfigurationPropertyName
...
Fixes gh-19580
2020-01-09 17:08:39 -08:00
Andy Wilkinson
c584334f5e
Merge branch '2.2.x'
...
Closes gh-19592
2020-01-09 09:00:16 +00:00
Andy Wilkinson
ccf4e1ad44
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19591
2020-01-09 08:59:48 +00:00
dreis2211
2b06f17c69
Fix links to external types in javadoc
...
See gh-19581
2020-01-09 08:59:25 +00:00
Stephane Nicoll
7d6f4a6666
Merge branch '2.2.x'
...
Closes gh-19590
2020-01-09 09:52:22 +01:00
Stephane Nicoll
99c64b7cdf
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19589
2020-01-09 09:51:45 +01:00
Matthias Stock
adfbbcc0f6
Simplify validation pattern of EndpointId
...
See gh-19584
2020-01-09 09:42:31 +01:00
Madhura Bhave
6d0b4351f4
Merge branch '2.2.x'
...
Closes gh-19582
2020-01-08 13:54:13 -08:00
Madhura Bhave
437941cc51
Improve diagnostics when using `@ConstructorBinding` on a Kotlin class
...
Closes gh-19312
2020-01-08 13:53:47 -08:00
dreis2211
34419eda38
Add micrometer-registry-stackdriver dependency for javadoc generation
...
See gh-19578
2020-01-08 17:47:21 +00:00
Stephane Nicoll
79da3b6e2c
Remove support for Jetty 9.4.21 and earlier
...
Closes gh-18692
2020-01-08 15:40:01 +01:00
Andy Wilkinson
4efd8ba587
Merge branch '2.2.x'
...
Closes gh-19574
2020-01-08 14:02:50 +00:00
Andy Wilkinson
02965e9744
Fix javadoc warnings
...
Fixes gh-19572
2020-01-08 14:02:24 +00:00
Stephane Nicoll
e5c1f3133a
Harmonize cassandra tests
2020-01-08 14:57:52 +01:00
Stephane Nicoll
6ced89490c
Polish
2020-01-08 14:34:33 +01:00
Stephane Nicoll
bc066d279b
Polish cassandra tests
...
See gh-18019
2020-01-08 14:22:48 +01:00
Stephane Nicoll
462442e7d2
Polish "Add Stackdriver metrics export support"
...
See gh-19528
2020-01-08 13:35:44 +01:00
Johannes Graf
d42256d856
Add Stackdriver metrics export support
...
See gh-19528
2020-01-08 13:32:27 +01:00
Andy Wilkinson
10ba17c390
Merge branch '2.2.x'
...
Closes gh-19571
2020-01-08 11:44:40 +00:00
Andy Wilkinson
6d8f07d899
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19570
2020-01-08 11:42:56 +00:00
Andy Wilkinson
bdffa860d9
Increase startup timeout for Docker containers
...
Closes gh-19569
2020-01-08 11:39:36 +00:00
Andy Wilkinson
cbacb6116b
Merge branch '2.2.x'
...
Closes gh-19568
2020-01-08 11:15:59 +00:00
Andy Wilkinson
e04055650c
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19567
2020-01-08 11:15:29 +00:00
Andy Wilkinson
3fb1bb74ba
Configure WebTestClient to be able to consume large responses
...
Closes gh-19566
2020-01-08 11:14:42 +00:00
Madhura Bhave
c9ad3564d9
Merge branch '2.2.x'
...
Closes gh-19562
2020-01-07 14:29:45 -08:00
Madhura Bhave
82dc7bcc90
HypermediaAutoConfiguration should back off when Spring MVC absent
...
Fixes gh-19392
2020-01-07 14:28:58 -08:00
Madhura Bhave
87dd11502a
Refactor HypermediaAutoConfigurationTests
2020-01-07 14:28:09 -08:00
Madhura Bhave
6944e52052
Merge branch '2.2.x'
2020-01-07 13:49:43 -08:00
Madhura Bhave
ac10ebba33
Fix checkstyle
2020-01-07 13:49:02 -08:00
Madhura Bhave
c82d728c93
Merge branch '2.2.x'
...
Closes gh-19561
2020-01-07 13:34:43 -08:00
Madhura Bhave
67fab60fbd
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19560
2020-01-07 13:33:32 -08:00
Scott Frederick
487b9cbf96
Add profiles directly to the application environment for tests
...
Prior to this commit, active profiles were being added to the Spring Boot
application environment by setting the `spring.profiles.active` property.
This could result in profiles getting parsed differently than other uses of `@ActiveProfiles`.
Setting the profiles directly in the `Environment` prevents this parsing.
See gh-19556
2020-01-07 13:23:09 -08:00
Andy Wilkinson
30c124f549
Merge branch '2.2.x'
...
Closes gh-19554
2020-01-07 12:06:07 +00:00
Andy Wilkinson
c57359ea3b
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19553
2020-01-07 12:05:21 +00:00
Andy Wilkinson
d46406fcb9
Remove loading of non-existent properties file from antlib
...
Fixes gh-19552
2020-01-07 12:04:59 +00:00
Brian Clozel
2f78c72f92
Avoid 406 Not Acceptable for error pages
...
Prior to this commit, the `ErrorController` would override the original
error response status if the error map cannot be written due to content
negotiation with the HTTP client. In that case, the error handling
infrastructure returns a `406 Not Acceptable` response.
This commit improves the `ErrorController` so that
`HttpMediaTypeNotAcceptableException` instances thrown by that
controller are not returned as is but instead we write the error
response with an empty body and the original HTTP error status.
Fixes gh-19545
See gh-19522
2020-01-06 18:08:35 +01:00
Stephane Nicoll
ee7555750e
Add ComponentScan#nameGenerator alias on @SpringBootApplication
...
This commit allows to customize the default BeanNameGenerator for
scanned components using @SpringBootApplication.
Closes gh-19346
2020-01-06 16:33:38 +01:00
Stephane Nicoll
a0a4cbce3a
Merge branch '2.2.x'
...
Closes gh-19542
2020-01-06 13:02:10 +01:00
dreis2211
6ffe47cd06
Remove deprecated usage of WebTestClientBuilderCustomizer
...
See gh-19536
2020-01-06 12:59:12 +01:00
Stephane Nicoll
fc60301fc7
Polish "Add Java 14 to JavaVersion enumeration"
...
See gh-19511
2020-01-04 11:45:43 +01:00
Dmytro Nosan
a5a3a020b6
Add Java 14 to JavaVersion enumeration
...
See gh-19511
2020-01-04 11:44:03 +01:00
Stephane Nicoll
47481464ff
Merge branch '2.2.x'
...
Closes gh-19535
2020-01-04 11:42:43 +01:00
Rossen Stoyanchev
f6947648c9
Improve Spring MVC auto-configuration section
...
See gh-19521
2020-01-04 11:37:01 +01:00
Madhura Bhave
bb55bad170
Merge branch '2.2.x'
...
Closes gh-19529
2020-01-03 14:27:31 -08:00
Madhura Bhave
c12a3f4172
Support explicitly setting forward headers strategy to NONE
...
Prior to this commit, there was no distinction between explicitly setting
forward headers strategy to a value of NONE and not setting it at all.
This meant that in a cloud environment, a cloud provider was always checked
to see if it was active and using forward headers and there was no way to
prevent that.
This commit changes the default value of the property to null so that there
is a way to determine if the property was explicitly set to NONE.
Fixes gh-19333
2020-01-03 14:19:48 -08:00
Madhura Bhave
f94c6d7458
Merge branch '2.2.x'
2020-01-03 11:42:42 -08:00
Madhura Bhave
8e285a4387
Fix checkstyle
2020-01-03 11:42:14 -08:00
Madhura Bhave
743cf3b2a7
Merge branch '2.2.x'
...
Closes gh-19527
2020-01-03 11:21:50 -08:00
Madhura Bhave
ac46f5971f
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19526
2020-01-03 11:19:21 -08:00
Madhura Bhave
24dd416f4b
Add a test case for binding to map with wildcard types
...
This commit also changes the spring framework version
to use snapshots.
Closes gh-18767
2020-01-03 11:13:41 -08:00
Brian Clozel
cc154bbefb
Avoid 406 Not Acceptable for error pages
...
Prior to this commit, the `ErrorController` would override the original
error response status if the error map cannot be written due to content
negotiation with the HTTP client. In that case, the error handling
infrastructure returns a `406 Not Acceptable` response.
This commit improves the `ErrorController` so that
`HttpMediaTypeNotAcceptableException` instances thrown by that
controller are not returned as is but instead we write the error
response with an empty body and the original HTTP error status.
Fixes gh-19522
2020-01-03 14:51:53 +01:00
Brian Clozel
c2f8741e2e
Merge branch '2.2.x'
...
Closes gh-19517
2020-01-03 09:46:43 +01:00
Brian Clozel
1320c44a25
Use RBAC credentials for Couchbase cluster info
...
Prior to this commit, the Couchbase auto-configuration would use the
bucket credentials when RBAC is configured. This commit ensures that
RBAC is used in that case.
This commit also adds new configuration properties to customize the
bootstrap ports for Couchbase:
* `spring.couchbase.env.bootstrap.http-direct-port`
* `spring.couchbase.env.bootstrap.http-ssl-port`
Fixes gh-19393
2020-01-03 09:45:44 +01:00
Stephane Nicoll
76a48885f8
Merge branch '2.2.x'
...
Closes gh-19516
2020-01-03 09:40:11 +01:00
Stephane Nicoll
fd4829c2ea
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19515
2020-01-03 09:39:42 +01:00
dreis2211
9cbf5902dc
Update some copyrights to 2020
...
See gh-19510
2020-01-03 09:37:22 +01:00
Stephane Nicoll
679e88af47
Merge branch '2.2.x'
...
Closes gh-19509
2020-01-02 13:18:39 +01:00
Geoffrey De Smet
493762a416
Add reference to OptaPlanner starter
...
See gh-19508
2020-01-02 13:18:07 +01:00
Stephane Nicoll
c3ab4b875a
Merge branch '2.2.x'
...
Closes gh-19504
2020-01-01 13:13:06 +01:00
Stephane Nicoll
7d36599343
Polish "Fix outdated reference in ArtemisConfigurationCustomizer javadoc"
...
See gh-19503
2020-01-01 13:11:39 +01:00
Ochieng Olanga
c6f7d12270
Fix outdated reference in ArtemisConfigurationCustomizer javadoc
...
See gh-19503
2020-01-01 13:10:34 +01:00
Stephane Nicoll
6fc52b0563
Polish
2020-01-01 09:16:53 +01:00
Stephane Nicoll
a9b0b78cb2
Upgrade to Flyway 6.1.3
...
Closes gh-19266
2019-12-31 10:47:41 +01:00
Stephane Nicoll
5d1c844f21
Merge branch '2.2.x'
...
Closes gh-19499
2019-12-31 10:07:50 +01:00
Stephane Nicoll
a684ab8726
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19498
2019-12-31 10:07:32 +01:00
Johnny Lim
27d7727d9f
Polish doc
...
See gh-19491
2019-12-31 10:06:58 +01:00
Victor Ferrer
1d900f67e7
FilteringSpringBootCondition uses Class.forName instead of classLoader
...
See gh-19490
2019-12-31 09:42:06 +01:00
Stephane Nicoll
61ae4fbc04
Merge branch '2.2.x'
2019-12-31 09:41:48 +01:00
Stephane Nicoll
1de30f0d00
Polish
2019-12-31 09:40:04 +01:00
Stephane Nicoll
2148097c04
Merge branch '2.2.x'
...
Closes gh-19497
2019-12-31 09:36:27 +01:00
Stephane Nicoll
b7e6febaa0
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19496
2019-12-31 09:36:05 +01:00
Zekariyas
f005fffbc3
Fix typo in BindHandler#onFinish javadoc
...
See gh-19492
2019-12-31 09:34:45 +01:00
Stephane Nicoll
3b6f21d997
Merge branch '2.2.x'
...
Closes gh-19486
2019-12-30 17:01:53 +01:00
Stephane Nicoll
07a21ec601
Harmonize property visibility in Saml2RelyingPartyProperties
...
Closes gh-19194
2019-12-30 16:53:23 +01:00
Stephane Nicoll
334f3e08ae
Fix formatting
2019-12-30 15:08:50 +01:00
Johnny Lim
e4057dd528
Polish
...
See gh-19484
2019-12-30 14:57:29 +01:00
Stephane Nicoll
5f178db49b
Polish test setup
...
This commit polishes a test configuration to avoid registering a mock
for the same bean twice.
2019-12-30 14:52:49 +01:00
Stephane Nicoll
cf740add85
Fix component scan test setup
...
This commit fixes the setup of tests using component scan. Previously,
a configuration used an include filter to only include a particular
configuration class in a given package. Unfortunately, include filters
do not prevent regular filters by default and the definition did not
have the intended behaviour.
This commit disables default filters so that only the specified include
filter is applied.
2019-12-30 14:51:51 +01:00
Stephane Nicoll
bb5e09882a
Extract RabbitTemplate auto-configuration in a configurer
...
This commit movers the auto-configuration of RabbitTemplate to a
dedicated class that can be reused to create additional template with
similar settings.
CLoses gh-19440
2019-12-28 10:56:04 +01:00
Stephane Nicoll
015714c1d6
Merge branch '2.2.x'
...
See gh-19474
2019-12-28 10:52:30 +01:00
Stephane Nicoll
85667ba165
Merge branch '2.1.x' into 2.2.x
...
See gh-19473
2019-12-28 10:52:01 +01:00
Stephane Nicoll
c0f1aaebb6
Fix Tomcat's maxConnections default value
...
Closes gh-19472
2019-12-28 10:51:42 +01:00
Stephane Nicoll
01a474b67a
Merge branch '2.2.x'
...
Closes gh-19474
2019-12-28 10:03:41 +01:00
Stephane Nicoll
6ea522a90a
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19473
2019-12-28 10:02:07 +01:00
Stephane Nicoll
d75efad0de
Upgrade to Tomcat 9.0.30
...
Closes gh-19472
2019-12-28 09:58:09 +01:00
Stephane Nicoll
e7f45d8a34
Polish "Add toolchains support for Spring Boot Maven Plugin"
...
See gh-18732
2019-12-26 12:03:18 +01:00
Dmytro Nosan
eede16ff0a
Add toolchains support for Spring Boot Maven Plugin
...
See gh-18732
2019-12-26 12:03:18 +01:00
Stephane Nicoll
08ac72f5f0
Fix build failure
2019-12-26 12:02:38 +01:00
Stephane Nicoll
a2b2b46b83
Merge branch '2.2.x'
...
Closes gh-19463
2019-12-26 11:18:55 +01:00
Stephane Nicoll
6c016663fd
Polish contribution
...
See gh-18711
2019-12-26 11:17:51 +01:00
Dmytro Nosan
1fb904acee
Support commas embedded in command line arguments from Maven plugin
...
See gh-18711
2019-12-26 11:05:09 +01:00
Stephane Nicoll
2c1e81adf0
Polish
2019-12-26 10:42:40 +01:00
Stephane Nicoll
1e38dd5531
Merge branch '2.2.x'
...
Closes gh-19461
2019-12-25 08:32:38 +01:00
Stephane Nicoll
4969ecc59a
Polish contribution
...
See gh-19458
2019-12-25 08:31:50 +01:00
Girish Kulkarni
582a3b472d
Fix file rotation documentation according to maxHistory new default
...
See gh-19458
2019-12-25 08:27:56 +01:00
Stephane Nicoll
065fe9996d
Merge branch '2.2.x'
...
Closes gh-19454
2019-12-24 11:00:23 +01:00
Stephane Nicoll
ee98855905
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19453
2019-12-24 10:59:58 +01:00
Stephane Nicoll
5dc6491807
Clarify documentation of repackage mojo's attach property
...
Closes gh-19021
2019-12-24 10:59:36 +01:00
Stephane Nicoll
ada2d3904f
Merge branch '2.2.x'
...
Closes gh-19452
2019-12-24 10:47:14 +01:00
Stephane Nicoll
1a8a76082b
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19451
2019-12-24 10:46:46 +01:00
Stephane Nicoll
2db2daeddf
Clarify which part of @ConfigurationProperties is internal API
...
Closes gh-19199
2019-12-24 10:46:01 +01:00
Stephane Nicoll
2ee6621123
Merge branch '2.2.x'
...
Closes gh-19449
2019-12-24 09:41:25 +01:00
Stephane Nicoll
aa54a47671
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19448
2019-12-24 09:41:01 +01:00
Stephane Nicoll
8f9d9fa20e
Clarify which caches are automatically bound to the metrics registry
...
See gh-19412
2019-12-24 09:40:05 +01:00
Stephane Nicoll
f44fca95b0
Merge branch '2.2.x'
...
Closes gh-19447
2019-12-24 09:28:13 +01:00
Johnny Lim
e0840b690c
Add JMX note for Kafka consumer metrics
...
See gh-19446
2019-12-24 09:25:20 +01:00
Stephane Nicoll
5b1a622195
Harmonize class visibility
...
Closes gh-19414
2019-12-23 17:07:13 +01:00
Stephane Nicoll
58a28cf54c
Merge branch '2.2.x'
...
Closes gh-19444
2019-12-23 16:54:57 +01:00
Stephane Nicoll
c9bb17f444
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19443
2019-12-23 16:54:29 +01:00
Stephane Nicoll
c6dab447cd
Fix visibility of inner classes of ServletWebServerFactoryConfiguration
...
Closes gh-19395
2019-12-23 16:44:52 +01:00
Stephane Nicoll
68dc850a82
Execute batch jobs with ApplicationRunner
...
This commit migrates JobLauncherCommandLineRunner to an
ApplicationRunner implementation. The latter allows to parse option
arguments (i.e. `--spring.something=value`) and makes it easy to ignore
arguments that are not meant to be passed to batch jobs.
Closes gh-19442
2019-12-23 16:19:28 +01:00
Stephane Nicoll
22fcb954d4
Merge branch '2.2.x'
2019-12-23 15:36:15 +01:00
Stephane Nicoll
930a0ef748
Polish Spring Batch how-to guides
...
See gh-19211
2019-12-23 15:35:59 +01:00
Stephane Nicoll
6d9c176e19
Merge branch '2.2.x'
...
Closes gh-19441
2019-12-23 15:09:21 +01:00
Stephane Nicoll
b3643965f0
Polish "Detect config props using builder pattern and generics"
...
See gh-19099
2019-12-23 14:57:48 +01:00
如梦技术
743f4a4cb1
Detect config props using builder pattern and generics
...
See gh-19099
2019-12-23 14:54:00 +01:00
Stephane Nicoll
326ad5e8e4
Merge branch '2.2.x'
...
Closes gh-19439
2019-12-23 10:04:51 +01:00
Stephane Nicoll
5f987a67f8
Polish "Improve Spring Batch coverage in reference documentation"
...
See gh-19211
2019-12-23 10:03:34 +01:00
Jay Bryant
6bd9b2ebc6
Improve Spring Batch coverage in reference documentation
...
See gh-19211
2019-12-23 09:27:22 +01:00
Johnny Lim
6efa98951d
Polish LdapAutoConfigurationTests
...
See gh-19437
2019-12-23 08:53:10 +01:00
Stephane Nicoll
5031e6182b
Merge branch '2.2.x'
...
Closes gh-19435
2019-12-22 08:53:13 +01:00
Filip Hrisafov
bb5c151ee0
Disable SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS by default
...
See gh-19352
2019-12-22 08:52:07 +01:00
Stephane Nicoll
fde06f4edd
Merge branch '2.2.x'
...
Closes gh-19434
2019-12-22 08:44:47 +01:00
Stephane Nicoll
2171e7a425
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19433
2019-12-22 08:44:18 +01:00
Tadaya Tsuyukubo
294267d2e0
Fix typo on ConditionMessage
...
See gh-19354
2019-12-22 08:40:43 +01:00
Stephane Nicoll
e38ef6ef1f
Merge branch '2.2.x'
...
Closes gh-19429
2019-12-21 16:37:32 +01:00
Johnny Lim
0bf359f4a2
Polish
...
See gh-19409
2019-12-21 16:36:06 +01:00
Stephane Nicoll
bd179393ea
Merge branch '2.2.x'
...
Closes gh-19428
2019-12-21 16:34:47 +01:00
dark
4f99c9f281
Remove unused import statement
...
See gh-19410
2019-12-21 16:33:53 +01:00
Brian Clozel
813c901905
Merge branch '2.2.x'
...
Closes gh-19425
2019-12-20 22:12:20 +01:00
Brian Clozel
82391a406a
Polish
...
See gh-19424
2019-12-20 21:55:59 +01:00
Ferdinand Jacobs
4555123b7d
Fix typo in RSocket docs
...
See gh-19424
2019-12-20 21:50:14 +01:00
dreis2211
4b10462464
Fix compilation error
...
See gh-19423
2019-12-20 17:10:39 +00:00
Andy Wilkinson
7551a79e80
Merge branch '2.2.x'
...
Closes gh-19422
2019-12-20 15:55:16 +00:00
Andy Wilkinson
ea00ab9919
Protect against NoSuchMethodError when deploying to old Tomcats
...
Fixes gh-19308
2019-12-20 15:53:08 +00:00
Andy Wilkinson
be4c4f9c13
Merge branch '2.2.x'
...
Closes gh-19420
2019-12-20 15:41:24 +00:00
Andy Wilkinson
0e6932d550
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19419
2019-12-20 15:41:02 +00:00
Andy Wilkinson
35b74185e4
Fix test ordering problems by always clearing URL stream handler factory
...
Closes gh-19349
2019-12-20 15:36:39 +00:00
Andy Wilkinson
07857f7f24
Merge branch '2.2.x'
...
Closes gh-19418
2019-12-20 15:28:40 +00:00
Andy Wilkinson
8ed0b1a231
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19417
2019-12-20 15:28:11 +00:00
Andy Wilkinson
3cadde0900
Protect against available port actually being unavailable
...
Closes gh-19355
2019-12-20 15:22:30 +00:00
Andy Wilkinson
6009baa71b
Remove plugin management for Maven's site plugin
...
Closes gh-19085
2019-12-20 14:50:50 +00:00
Phillip Webb
93d9147864
Add deprecation documentation to Archive.iterator
...
See gh-16655
2019-12-19 16:52:47 -08:00
Brian Clozel
1e117c704b
Merge branch '2.2.x'
...
Closes gh-19404
2019-12-19 15:24:41 +01:00
Brian Clozel
979437398c
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19403
2019-12-19 15:23:19 +01:00
Brian Clozel
3e48e36e47
Improve docs on running apps behind proxies
...
Fixes gh-15046
2019-12-19 15:16:13 +01:00
Stephane Nicoll
dabb9b89c7
Merge branch '2.2.x'
2019-12-19 13:45:36 +09:00
Stephane Nicoll
b515d6ba9a
Merge pull request #19397 from aklish
...
* pr/19397:
Add Elide as 3rd party Spring Boot Starter
Closes gh-19397
2019-12-19 13:45:08 +09:00
Aaron Klish
8b149dcea9
Add Elide as 3rd party Spring Boot Starter
...
See gh-19397
2019-12-19 13:44:50 +09:00
Johnny Lim
8bbc7f7b67
Remove duplicate entry for Neo4jHealthIndicator
...
See gh-19377
2019-12-17 09:43:09 +09:00
Stephane Nicoll
bb3b6dbd7d
Merge branch '2.2.x'
...
Closes gh-19375
2019-12-15 09:05:27 +09:00
dreis2211
b6e4c0f012
Add group property to DynatraceProperties
...
See gh-19369
2019-12-15 08:54:42 +09:00
Andy Wilkinson
ef2eb2f652
Remove accidental usage of Plexus's CollectionUtils
...
See gh-16655 and 8f5777cf
2019-12-14 17:42:26 +00:00
Phillip Webb
1b1c61a2ed
Make processor output fully reproducible
...
Update `AutoConfigureAnnotationProcessor` to ensure that the generated
properties file is fully repeatable. Properties are now sorted and
written out directly to ensure that the timestamp comment is not
present.
Closes gh-19370
2019-12-13 13:04:49 -08:00
Phillip Webb
695de2c6f5
Polish end-to-end configuration properties tracing
...
See gh-14880
2019-12-13 12:47:01 -08:00
Phillip Webb
830c2ef7f1
Polish
2019-12-13 11:47:42 -08:00
Phillip Webb
be3b11db48
Merge branch '2.2.x'
2019-12-13 11:47:04 -08:00
Phillip Webb
6d372f60d9
Merge branch '2.1.x' into 2.2.x
2019-12-13 11:46:25 -08:00
Phillip Webb
8e03982bca
Fix checkstyle violation
2019-12-13 11:45:56 -08:00
Phillip Webb
2fc12bc36c
Merge branch '2.2.x'
2019-12-13 11:30:13 -08:00
Phillip Webb
26ff18f37d
Merge branch '2.1.x' into 2.2.x
2019-12-13 11:29:51 -08:00
Phillip Webb
accd830dd5
Update copyright header of changed files
2019-12-13 11:23:24 -08:00
Phillip Webb
9bdad06c10
Polish Netty SSL key alias support
...
See gh-19197
2019-12-13 11:21:42 -08:00
Madhura Bhave
51e558b08d
Merge pull request #19364 from dreis2211
...
* pr/19364:
Fix unknown tag in javadoc
Closes gh-19364
2019-12-12 17:05:09 -08:00
dreis2211
3be05f61e1
Fix unknown tag in javadoc
...
See gh-19364
2019-12-12 17:04:25 -08:00
Madhura Bhave
8dcf1e4033
Provide end-to-end traceability for config properties
...
Closes gh-14880
Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
2019-12-12 17:02:46 -08:00
Madhura Bhave
8f5777cf9e
Optimize JarLauncher when used with exploded jar
...
- Previously, we would create a JarFileArchive for all nested jars.
This was an additional overhead. We only need to create a JarFileArchive
for jars that can have nested jars in them. For all other jars we only need
the URL to build the classpath.
- While iterating over nested entries in the exploded jar, we only need to
look at BOOT-INF and we can skip any entry that does not match that.
Closes gh-16655
Co-authored-by: Phillip Webb <pwebb@pivotal.io>
2019-12-12 14:33:48 -08:00
Stephane Nicoll
58022d72f5
Merge branch '2.2.x'
...
Closes gh-19363
2019-12-12 16:59:46 +01:00
Stephane Nicoll
c3ae8bcfdc
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19362
2019-12-12 16:59:21 +01:00
dreis2211
207a5c5022
Link consistently to Tomcat 9.0 docs
...
See gh-19340
2019-12-12 16:58:37 +01:00
Stephane Nicoll
1d3554de06
Merge branch '2.2.x'
...
Closes gh-19361
2019-12-12 16:54:31 +01:00
Stephane Nicoll
fc35384b03
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19360
2019-12-12 16:54:04 +01:00
dreis2211
29b602d6a0
Fix link to Vaadin Spring Boot starter
...
See gh-19338
2019-12-12 16:53:21 +01:00
Stephane Nicoll
aa821151bb
Polish "Detect DirContextAuthenticationStrategy bean"
...
See gh-19328
2019-12-09 15:58:44 +01:00
Filip Hrisafov
c108d2d011
Detect DirContextAuthenticationStrategy bean
...
This commit improves the LDAP auto-configuration to detect if a
DirContextAuthenticationStrategy bean is defined and, if so, associates
it with the auto-configured `LdapContextSource`.
See gh-19328
2019-12-09 15:58:25 +01:00
Stephane Nicoll
20bebdc07d
Merge branch '2.2.x'
...
Closes gh-19331
2019-12-09 11:58:58 +01:00
dreis2211
b1158bf35d
Simplify some Stream API usages
...
See gh-19291
2019-12-09 11:52:46 +01:00
Phillip Webb
d2ebf5de0e
Merge branch '2.2.x'
...
Closes gh-19317
2019-12-05 20:17:47 -08:00
Phillip Webb
f1c2d36793
Upgrade to Spring Batch 4.2.1
...
Closes gh-19073
2019-12-05 20:16:37 -08:00
Madhura Bhave
1071f969bf
Merge branch '2.2.x'
...
Closes gh-19315
2019-12-05 13:32:26 -08:00
Huluvu424242
95d6dff56f
Document Nitrite starter in README
...
See gh-19196
2019-12-05 13:30:54 -08:00
Madhura Bhave
b42bc1b23d
Merge branch '2.2.x'
...
Closes gh-19314
2019-12-05 12:04:46 -08:00
Madhura Bhave
ed571bab24
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19313
2019-12-05 12:03:50 -08:00
dreis2211
20ff764756
Increase cache ttl in CachingOperationInvokerTests
...
See gh-19193
2019-12-05 11:58:23 -08:00
Andy Wilkinson
6a8d7218b6
Merge branch '2.2.x'
...
Closes gh-19310
2019-12-05 16:15:38 +00:00
Andy Wilkinson
9b0569cf81
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19309
2019-12-05 16:15:15 +00:00
Andy Wilkinson
bc53fe0344
Recommend mockito-inline for mocking and spying of CGLib proxies
...
This reverts commit 52050c173c
.
See gh-17817
Closes gh-19020
2019-12-05 16:13:02 +00:00
Andy Wilkinson
4957994def
Merge branch '2.2.x'
...
Closes gh-19305
2019-12-05 12:54:21 +00:00
Andy Wilkinson
3c0e7ccba6
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19304
2019-12-05 12:53:36 +00:00
Andy Wilkinson
effdc8f359
Polish "Honour SSL key alias when using Netty"
...
See gh-19197
2019-12-05 12:48:13 +00:00
cbono
eda7b7c3e6
Honour SSL key alias when using Netty
...
See gh-19197
2019-12-05 12:10:04 +00:00
Andy Wilkinson
ae5ec4e41a
Merge branch '2.2.x'
...
Closes gh-19300
2019-12-05 11:54:18 +00:00
Andy Wilkinson
758b80a0fe
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19299
2019-12-05 11:53:55 +00:00
luoyuan
c6a184474c
Remove redundant hasText check as query always has text
...
See gh-19290
2019-12-05 11:51:35 +00:00
Andy Wilkinson
9f1e760054
Merge branch '2.2.x'
...
Closes gh-19298
2019-12-05 11:46:02 +00:00
tongluyang
95aad5b556
Add missing closing parenthesis to the document
...
See gh-19218
2019-12-05 11:45:22 +00:00
Andy Wilkinson
4dc74793e1
Merge branch '2.2.x'
...
Closes gh-19297
2019-12-05 11:38:40 +00:00
dreis2211
f190affa6b
Upgrade to Testcontainers 1.12.4
...
See gh-19292
2019-12-05 11:37:46 +00:00
Andy Wilkinson
10d593eeee
Merge branch '2.2.x'
2019-12-05 11:34:44 +00:00
Andy Wilkinson
264d4f54ec
Merge branch '2.1.x' into 2.2.x
2019-12-05 11:34:36 +00:00
Andy Wilkinson
38340522de
Fix Asciidoc syntax
2019-12-05 11:33:58 +00:00
Andy Wilkinson
ab4e1c465f
Merge branch '2.2.x'
...
See gh-19288
2019-12-05 10:25:12 +00:00
Andy Wilkinson
47b47c28a0
Reduce visibility of the Gradle plugin's test methods
...
See gh-19287
2019-12-05 10:24:48 +00:00
Andy Wilkinson
9b88edbcf9
Merge branch '2.2.x'
...
Closes gh-19153
2019-12-05 10:07:00 +00:00
Andy Wilkinson
a2451a4f29
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19152
2019-12-05 10:06:32 +00:00
Andy Wilkinson
b46bb726ca
Clarify limitations of @PropertySource
...
Closes gh-18900
2019-12-05 10:05:50 +00:00
Madhura Bhave
0a2387ed0b
Merge branch '2.2.x'
...
Closes gh-19279
2019-12-04 14:42:34 -08:00
Madhura Bhave
2c4a1f1c15
Display @Validated constructor bound properties in configprops endpoint
...
Fixes gh-19219
2019-12-04 14:41:34 -08:00
Andy Wilkinson
d3a30dc28f
Upgrade to Maven Enforcer Plugin 3.0.0-M3
...
Closes gh-19276
2019-12-04 20:11:01 +00:00
Andy Wilkinson
edb1f9e03a
Upgrade to Webjars Locator Core 0.43
...
Closes gh-19275
2019-12-04 20:11:01 +00:00
Andy Wilkinson
896a048d9e
Upgrade to Spring Cloud Connectors 2.0.7.RELEASE
...
Closes gh-19274
2019-12-04 20:11:01 +00:00
Andy Wilkinson
d8ead5bcf7
Upgrade to Neo4j Ogm 3.2.3
...
Closes gh-19273
2019-12-04 20:11:01 +00:00
Andy Wilkinson
08db520566
Upgrade to Jetty El 8.5.49
...
Closes gh-19272
2019-12-04 20:11:01 +00:00
Andy Wilkinson
e9da6d343d
Upgrade to Mockito 3.2.0
...
Closes gh-19271
2019-12-04 20:11:01 +00:00
Andy Wilkinson
5cab3592a0
Upgrade to Mariadb 2.5.2
...
Closes gh-19270
2019-12-04 20:11:00 +00:00
Andy Wilkinson
a87ddab37f
Upgrade to Liquibase 3.8.2
...
Closes gh-19269
2019-12-04 20:11:00 +00:00
Andy Wilkinson
0c1b258c1e
Upgrade to Kotlin 1.3.61
...
Closes gh-19268
2019-12-04 20:11:00 +00:00
Andy Wilkinson
a826fabd3f
Upgrade to Hibernate 5.4.9.Final
...
Closes gh-19267
2019-12-04 20:11:00 +00:00
Andy Wilkinson
836749ee32
Upgrade to Jaybird 3.0.8
...
Closes gh-19265
2019-12-04 19:57:38 +00:00
Andy Wilkinson
ecc970f3ac
Upgrade to Elasticsearch 6.8.5
...
Closes gh-19264
2019-12-04 19:57:38 +00:00
Andy Wilkinson
c0972820e7
Upgrade to Jetty Reactive Httpclient 1.1.0
...
Closes gh-19263
2019-12-04 19:57:38 +00:00
Andy Wilkinson
1e3b701cbb
Upgrade to Jetty 9.4.24.v20191120
...
Closes gh-19262
2019-12-04 19:57:38 +00:00
Andy Wilkinson
c3d7488652
Upgrade to Aspectj 1.9.5
...
Closes gh-19261
2019-12-04 19:57:37 +00:00
Andy Wilkinson
90a46c7817
Upgrade to Tomcat 9.0.29
...
Closes gh-19260
2019-12-04 19:57:37 +00:00
Andy Wilkinson
699c684086
Upgrade to Johnzon Jsonb 1.2.2
...
Closes gh-19259
2019-12-04 19:57:37 +00:00
Andy Wilkinson
b392fa4737
Upgrade to Activemq 5.15.11
...
Closes gh-19258
2019-12-04 19:57:37 +00:00
Andy Wilkinson
2614f641f8
Upgrade to Byte Buddy 1.10.4
...
Closes gh-19257
2019-12-04 19:57:37 +00:00
Andy Wilkinson
ec71009b88
Upgrade to Undertow 2.0.28.Final
...
Closes gh-19256
2019-12-04 19:57:37 +00:00
Andy Wilkinson
23d0ef079c
Upgrade to Rxjava2 2.2.15
...
Closes gh-19255
2019-12-04 19:57:37 +00:00
Andy Wilkinson
327a17beba
Upgrade to Prometheus Pushgateway 0.8.0
...
Closes gh-19254
2019-12-04 19:57:37 +00:00
Andy Wilkinson
5729ea3fe3
Upgrade to Netty Tcnative 2.0.28.Final
...
Closes gh-19253
2019-12-04 19:57:37 +00:00
Andy Wilkinson
c253052a4d
Upgrade to Unboundid Ldapsdk 4.0.13
...
Closes gh-19252
2019-12-04 19:57:37 +00:00
Andy Wilkinson
be903123f5
Upgrade to Querydsl 4.2.2
...
Closes gh-19251
2019-12-04 19:57:37 +00:00
Andy Wilkinson
4d47cf65d5
Upgrade to Appengine Sdk 1.9.77
...
Closes gh-19250
2019-12-04 19:57:37 +00:00
Andy Wilkinson
18489bea81
Upgrade to Jackson 2.10.1
...
Closes gh-19249
2019-12-04 19:57:37 +00:00
Andy Wilkinson
11d5fcb366
Upgrade to Couchbase Client 2.7.11
...
Closes gh-19248
2019-12-04 19:57:37 +00:00
Andy Wilkinson
85b9c9cea6
Upgrade to Spring Integration 5.2.2.RELEASE
...
Closes gh-19277
2019-12-04 19:56:36 +00:00
Andy Wilkinson
05d460a974
Upgrade to Spring Integration 5.2.2.RELEASE
...
Closes gh-19070
2019-12-04 19:55:33 +00:00
Andy Wilkinson
2ab5089338
Upgrade to Spring Cloud Connectors 2.0.7.RELEASE
...
Closes gh-19247
2019-12-04 19:48:38 +00:00
Andy Wilkinson
89fbdb9fc0
Upgrade to Neo4j Ogm 3.2.3
...
Closes gh-19246
2019-12-04 19:48:36 +00:00
Andy Wilkinson
fc2bb1d3ef
Upgrade to Jetty El 8.5.49
...
Closes gh-19245
2019-12-04 19:48:35 +00:00
Andy Wilkinson
4cc1c6eb19
Upgrade to Liquibase 3.8.2
...
Closes gh-19244
2019-12-04 19:48:33 +00:00
Andy Wilkinson
197350c21e
Upgrade to Kotlin 1.3.61
...
Closes gh-19243
2019-12-04 19:48:31 +00:00
Andy Wilkinson
d3b3ee6a6a
Upgrade to Aspectj 1.9.5
...
Closes gh-19242
2019-12-04 19:48:30 +00:00
Andy Wilkinson
a8463ff538
Upgrade to Activemq 5.15.11
...
Closes gh-19241
2019-12-04 19:48:28 +00:00
Andy Wilkinson
0071e2be3f
Upgrade to Byte Buddy 1.10.4
...
Closes gh-19240
2019-12-04 19:48:27 +00:00
Andy Wilkinson
255eb498c4
Upgrade to Netty Tcnative 2.0.28.Final
...
Closes gh-19239
2019-12-04 19:48:25 +00:00
Andy Wilkinson
d2c5d971f2
Upgrade to Unboundid Ldapsdk 4.0.13
...
Closes gh-19238
2019-12-04 19:48:24 +00:00
Andy Wilkinson
ca7ef3daec
Upgrade to Couchbase Client 2.7.11
...
Closes gh-19237
2019-12-04 19:48:22 +00:00
Andy Wilkinson
3d35efb485
Upgrade to Spring Batch 4.1.3.RELEASE
...
Closes gh-19072
2019-12-04 17:57:45 +00:00
Andy Wilkinson
6a0ec7e1f4
Upgrade to Spring Data Lovelace-SR14
...
Closes gh-19068
2019-12-04 17:57:03 +00:00
Andy Wilkinson
72d3137941
Upgrade to Spring Cloud Connectors 2.0.7.RELEASE
...
Closes gh-19234
2019-12-04 17:55:29 +00:00
Andy Wilkinson
66639702be
Upgrade to Jetty El 8.5.49
...
Closes gh-19233
2019-12-04 17:55:28 +00:00
Andy Wilkinson
ff1d2ea381
Upgrade to Aspectj 1.9.5
...
Closes gh-19232
2019-12-04 17:55:27 +00:00
Andy Wilkinson
7ea088e5fb
Upgrade to Activemq 5.15.11
...
Closes gh-19231
2019-12-04 17:55:26 +00:00
Andy Wilkinson
cf80ad46e4
Upgrade to Netty Tcnative 2.0.28.Final
...
Closes gh-19230
2019-12-04 17:55:24 +00:00
Andy Wilkinson
a2b06bbf45
Upgrade to Micrometer 1.1.9
...
Closes gh-19229
2019-12-04 17:55:23 +00:00
Andy Wilkinson
677f2bc80c
Upgrade to Unboundid Ldapsdk 4.0.13
...
Closes gh-19228
2019-12-04 17:55:22 +00:00
Andy Wilkinson
f451145d03
Upgrade to Couchbase Client 2.7.11
...
Closes gh-19227
2019-12-04 17:55:21 +00:00
Andy Wilkinson
94709733da
Upgrade to Spring Kafka 2.3.4.RELEASE
...
Closes gh-19226
2019-12-04 17:53:35 +00:00
Andy Wilkinson
d0ffa8b654
Upgrade to Spring Hateoas 1.0.2.RELEASE
...
Closes gh-19225
2019-12-04 17:53:34 +00:00
Andy Wilkinson
86cd332741
Upgrade to Spring Amqp 2.2.2.RELEASE
...
Closes gh-19224
2019-12-04 17:53:32 +00:00
Andy Wilkinson
d5c8639cda
Upgrade to Spring Data Moore-SR3
...
Closes gh-19075
2019-12-04 17:51:30 +00:00
Andy Wilkinson
278b5fcc7d
Upgrade to Spring Hateoas 1.0.2.RELEASE
...
Closes gh-19223
2019-12-04 17:50:05 +00:00
Andy Wilkinson
e6567a2410
Upgrade to Spring Amqp 2.2.2.RELEASE
...
Closes gh-19222
2019-12-04 17:50:04 +00:00
Andy Wilkinson
bfb4c86801
Upgrade to Spring Data Moore-SR3
...
Closes gh-19069
2019-12-04 17:48:27 +00:00
Andy Wilkinson
4910ace6e5
Upgrade to Spring Kafka 2.3.4.RELEASE
...
Closes gh-19071
2019-12-04 17:48:24 +00:00
Madhura Bhave
201cad970a
Merge branch '2.2.x'
...
Closes gh-19217
2019-12-03 18:22:41 -08:00
Madhura Bhave
68bc82cfc2
Ignore CannotLoadBeanClassException in config props validator
...
If the bean definition type contains a placeholder value, beanFactory.getType
can throw a CannotLoadBeanClassException. We can ignore this exception while
validating the bean definitions for constructor binding beans.
Fixes gh-19207
2019-12-03 18:21:53 -08:00
Madhura Bhave
1c3526f6b6
Merge branch '2.2.x'
...
Closes gh-19216
2019-12-03 09:30:34 -08:00
Madhura Bhave
f4db8c89d4
Use generic type when binding constructor parameters
...
Fixes gh-19156
2019-12-03 09:29:51 -08:00
Brian Clozel
116699e295
Upgrade to Spring Framework 5.1.12.RELEASE
...
Closes gh-19051
2019-12-03 15:53:56 +01:00
Brian Clozel
3f798db9ed
Upgrade to Spring Framework 5.2.2.RELEASE
...
Closes gh-19053
2019-12-03 12:09:40 +01:00
Brian Clozel
48bf478d2c
Upgrade to Spring Framework 5.2.2.RELEASE
...
Closes gh-19076
2019-12-03 12:08:07 +01:00
Madhura Bhave
8488dcb754
Merge branch '2.2.x'
...
Closes gh-19210
2019-12-02 10:37:03 -08:00
Madhura Bhave
5b461843db
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19209
2019-12-02 10:36:22 -08:00
Madhura Bhave
fcc790aa15
Document how properties are applied in JPA auto-config
...
Closes gh-15361
2019-12-02 10:34:54 -08:00
dreis2211
c6c03e89a4
Remove code that is deprecated since 2.1.x
...
See gh-19189
2019-11-29 09:58:33 +00:00
Andy Wilkinson
b6fb251097
Merge branch '2.2.x'
...
Closes gh-19191
2019-11-29 09:55:14 +00:00
Andy Wilkinson
189f74220c
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19190
2019-11-29 09:52:17 +00:00
Andy Wilkinson
e8eace2d5b
Polish "Fix Liquibase endpoint's output with multiple datasources"
...
See gh-19171
2019-11-29 09:50:48 +00:00
Leo Li
5302d91930
Fix Liquibase endpoint's output with multiple datasources
...
Previously, the endpoint used the same change log history service for
for each SpringLiquibase bean that it processed. This resulted in
pollution of the reported changes as the history of each bean was not
isolated.
This commit updates the endpoint to use a new history service for each
SpringLiquibase bean that is processed.
See gh-19171
2019-11-29 09:50:43 +00:00
Stephane Nicoll
60d563e88a
Merge branch '2.2.x'
...
Closes gh-19181
2019-11-28 16:51:17 +01:00
dreis2211
aea37b5d81
Fix deprecation info in CompositeHealthIndicatorConfiguration
...
See gh-19180
2019-11-28 16:50:46 +01:00
Stephane Nicoll
4efd6a4021
Merge branch '2.2.x'
...
Closes gh-19178
2019-11-28 10:59:19 +01:00
Stephane Nicoll
e02ccd16bb
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19177
2019-11-28 10:58:55 +01:00
Johnny Lim
3df9fa6228
Add missing indentations for pom.xml in doc
...
See gh-19170
2019-11-28 10:57:20 +01:00
Stephane Nicoll
c3786e727f
Upgrade to Reactor Dysprosium-SR2
...
Closes gh-19054
2019-11-27 18:41:32 +01:00
Stephane Nicoll
d8d7129f9d
Upgrade to Reactor Dysprosium-SR2
...
Closes gh-19077
2019-11-27 18:39:38 +01:00
Stephane Nicoll
e394772864
Upgrade to Reactor Californium-SR14
...
Closes gh-19052
2019-11-27 18:37:47 +01:00
Stephane Nicoll
8888f75a41
Polish "Add dedicated namespace for RemoteIpValve properties"
...
See gh-18489
2019-11-27 14:43:10 +01:00
Victor Mandujano
479cd8856b
Add dedicated namespace for RemoteIpValve properties
...
See gh-18489
2019-11-27 14:07:44 +01:00
Andy Wilkinson
f731c92b66
Merge branch '2.2.x'
2019-11-27 12:52:14 +00:00
Andy Wilkinson
76f03a8cad
Fix reflective access to archiveBaseName property
...
Previously, reflective access to the archiveBaseName property
incorrectly treated the property as a String. It should have been
treated as a Property<String>. This caused an exception to be thrown
and the deprecated baseName property to be used as a fallback.
This commit corrects the reflective access to the archiveBaseName
property. It also updates the tests to fail if a build outputs a
deprecation warning. Tests that use Gradle's Maven plugin have been
updated to expect deprecation warnings when run with Gradle 6.0 where
the plugin is deprecated. Tests that configure an archive's base name
have been updated to use archiveBaseName when running with Gradle 6.0
and later.
Closes gh-18663
2019-11-27 12:52:05 +00:00
Stephane Nicoll
cde9c2e853
Merge branch '2.2.x'
...
Closes gh-19161
2019-11-27 13:50:50 +01:00
Johnny Lim
f234d9c0ec
Remove ConditionEvaluationReportLoggingListener usage if possible
...
See gh-19159
2019-11-27 13:49:27 +01:00
Stephane Nicoll
79201b61b6
Merge branch '2.2.x'
...
Closes gh-19158
2019-11-27 11:47:46 +01:00