root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
27,102 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

9590 Commits

Author SHA1 Message Date
Stephane Nicoll 62d3f0d872 Upgrade to Micrometer 1.3.9 
Closes gh-21820
 2020-06-10 11:21:54 +02:00
Stephane Nicoll 9acfc81244 Upgrade to Dropwizard Metrics 4.1.9 
Closes gh-21819
 2020-06-10 11:21:54 +02:00
Stephane Nicoll 6aa7f7aed5 Upgrade to Hikaricp 3.4.5 
Closes gh-21818
 2020-06-10 11:21:54 +02:00
Stephane Nicoll cda93e0af7 Upgrade to Okhttp3 3.14.9 
Closes gh-21817
 2020-06-10 11:21:54 +02:00
Stephane Nicoll 7b3070cd8c Upgrade to Caffeine 2.8.4 
Closes gh-21816
 2020-06-10 11:21:54 +02:00
Stephane Nicoll b118d8953b Upgrade to Couchbase Client 2.7.15 
Closes gh-21815
 2020-06-10 11:21:53 +02:00
Andy Wilkinson 4e5f1e49d7 Merge branch '2.3.x' 
Closes gh-21839
 2020-06-10 09:56:43 +01:00
Andy Wilkinson ce68f1a097 Merge branch '2.2.x' into 2.3.x 
Closes gh-21837
 2020-06-10 09:56:24 +01:00
Andy Wilkinson 48acaa4bd9 Make AutoConfigureMockMvc use SecurityProperties' filter ordering 
Previously, AutoConfigureMockMvc used Spring Security's default filter
ordering, ignoring the value configured by SecurityProperties that is
used at runtime. This resulted in different ordering at runtime and in
tests.

This commit updates the configuration for AutoConfigureMockMvc to
import the Spring Security filter auto-configuration, thereby ensuring
that the ordering configured via SecurityProperties is applied.

Fixes gh-21801
 2020-06-10 09:51:05 +01:00
Stephane Nicoll 2ea60ecbaf Merge branch '2.3.x' 
Closes gh-21802
 2020-06-10 09:58:39 +02:00
Stephane Nicoll 6534a9abaf Configure password-based authentication with Cassandra 
This commit updates the Cassandra auto-configuration to configure
password-based authentication on the CqlSession directly.

Closes gh-21487
 2020-06-10 09:57:47 +02:00
Madhura Bhave 4161f0b983 Merge branch '2.3.x' 
Closes gh-21799
 2020-06-09 18:22:10 -07:00
Madhura Bhave d30c0e8aec Merge branch '2.2.x' into 2.3.x 
Closes gh-21798
 2020-06-09 18:21:31 -07:00
Madhura Bhave 36faa1d42a Document using system properties in gradle plugin docs 
Closes gh-21317
 2020-06-09 16:07:54 -07:00
Stephane Nicoll 372c0369a8 Merge branch '2.3.x' 2020-06-09 16:34:36 +02:00
Stephane Nicoll a3d39c7f31 Start building against Spring Data Neumann-SR1 snapshots 
See gh-21776
 2020-06-09 16:31:27 +02:00
Stephane Nicoll 7fe85750fb Merge branch '2.2.x' into 2.3.x 2020-06-09 16:30:07 +02:00
Stephane Nicoll 6597c0c7f7 Start building against Spring Data Moore-SR8 snapshots 
See gh-21775
 2020-06-09 16:27:15 +02:00
Stephane Nicoll cc3575b3f4 Merge branch '2.1.x' into 2.2.x 2020-06-09 16:26:44 +02:00
Stephane Nicoll 79f0e38c54 Start building against Spring Data Lovelace-SR18 snapshots 
See gh-21774
 2020-06-09 16:16:34 +02:00
Stephane Nicoll 9a457527fd Polish test 2020-06-09 16:00:50 +02:00
Stephane Nicoll b378fbfa87 Start building against Spring Batch 4.2.3 snapshots 
See gh-21784
 2020-06-09 15:11:18 +02:00
Stephane Nicoll 8325ed0626 Start building against Spring Kafka 2.5.2 snapshots 
See gh-21782
 2020-06-09 15:10:37 +02:00
Stephane Nicoll a2bdbf01b0 Start building against Spring Integration 5.3.1 snapshots 
See gh-21779
 2020-06-09 15:09:56 +02:00
Stephane Nicoll 3383f48ee7 Upgrade to Spring Framework 5.2.7 
Closes gh-21739
 2020-06-09 15:09:03 +02:00
Stephane Nicoll 180e57a8d7 Start building against Spring Batch 4.2.3 snapshots 
See gh-21783
 2020-06-09 14:50:53 +02:00
Stephane Nicoll 7b4707aab5 Start building against Spring Kafka 2.3.9 snapshots 
See gh-21781
 2020-06-09 14:49:57 +02:00
Stephane Nicoll 5cde880562 Start building against Spring Integration 5.2.7 snapshots 
See gh-21778
 2020-06-09 14:49:17 +02:00
Stephane Nicoll 679816d3a4 Upgrade to Spring Framework 5.2.7 
Closes gh-21738
 2020-06-09 14:48:32 +02:00
Stephane Nicoll 36a05375c7 Start building against Spring Kafka 2.2.14 snapshots 
See gh-21780
 2020-06-09 14:23:58 +02:00
Stephane Nicoll 445a9a461b Start building against Spring Integration 5.1.11 snapshots 
See gh-21777
 2020-06-09 14:23:58 +02:00
Stephane Nicoll de6ee358fb Upgrade to Spring Framework 5.1.16 
Closes gh-21729
 2020-06-09 13:36:32 +02:00
Andy Wilkinson 0726a7d610 Merge branch '2.3.x' 
Closes gh-21788
 2020-06-09 11:31:29 +01:00
Andy Wilkinson 8155cc5f23 Merge branch '2.2.x' into 2.3.x 
Closes gh-21786
 2020-06-09 11:02:23 +01:00
Andy Wilkinson a0f29edd4d Always initialize stompWebSocketHandlerMapping eagerly 
Previously, when lazy initialization was enabled, STOMP-based WebSocket
messaging would not work as the stompWebSocketHandlerMapping bean was
not initialized and CONNECT requests would go unanswered.

This commit adds a LazyInitializationExcludeFilter that causes the
stompWebSocketHandlerMapping bean to always be initialized eagerly.
This triggers initialization of the WebSocket transport allowing
requests to be received and processed.

Fixes gh-19611
 2020-06-09 11:02:02 +01:00
Stephane Nicoll e9f6dc9d9a Upgrade to Reactor Dysprosium-SR8 
Closes gh-21731
 2020-06-09 09:04:31 +02:00
Stephane Nicoll 3889e6336a Upgrade to Reactor Dysprosium-SR8 
Closes gh-21730
 2020-06-09 09:02:55 +02:00
Stephane Nicoll 10e0ca7dce Upgrade to Reactor Californium-SR19 
Closes gh-21728
 2020-06-09 09:01:13 +02:00
Scott Frederick f3d5416cf4 Merge branch '2.3.x' 
Closes gh-21770
 2020-06-08 15:03:52 -05:00
Scott Frederick 73aff08535 Improve tests for BasicErrorController 
This commit improves the tests for BasicErrorController by decoupling
coverage for the include-message and include-binding-errors
parameters to ensure the options operate properly independent of
each other.

See gh-21702
 2020-06-08 15:00:55 -05:00
Aurdo e2e52a11cc Fix BasicErrorController include parameter parsing 
This commit fixes an error in BasicErrorController where the wrong
property was referenced for binding error inclusion.

See gh-21702
 2020-06-08 15:00:55 -05:00
Phillip Webb ad6a0d473a Merge branch '2.3.x' 
Closes gh-21768
 2020-06-08 12:09:26 -07:00
Phillip Webb b71bab2817 Document deprecations of Archive.iterator() 
Closes gh-21695
 2020-06-08 12:08:33 -07:00
Phillip Webb f2c33464c6 Merge branch '2.3.x' 
Closes gh-21766
 2020-06-08 11:40:28 -07:00
Phillip Webb ddbecf62b3 Polish 'Fix Mustache to not ignore native fetcher' 
See gh-21060
 2020-06-08 11:10:57 -07:00
Dave Syer 5199c11e37 Fix Mustache to not ignore native fetcher 
Alter the logic of `MustacheEnvironmentCollector` so that the
native fetcher is always consulted if it exists.

When the context is a map (as it is in a web View for instance) you
can't assume a non-null fetcher actually contains the property you are
searching for.

See gh-21060
 2020-06-08 11:02:04 -07:00
Phillip Webb db0f085d40 Merge branch '2.3.x' 
Closes gh-21765
 2020-06-08 10:42:50 -07:00
Phillip Webb 47729be4e3 Polish 'Clarify documentation for probe ports' 
See gh-21650
 2020-06-08 10:42:01 -07:00
Hui Li e6ade05c2d Clarify documentation for probe ports 
Update the reference documentation to provide a better description of
the port that should be used for Kubernetes probes.

See gh-21650
 2020-06-08 10:41:41 -07:00
Phillip Webb 16b1d64b43 Merge branch '2.3.x' 
Closes gh-21764
 2020-06-08 10:30:33 -07:00
dreis2211 eeb1db2176 Use supplier assertions in availability indicator 
See gh-21758
 2020-06-08 10:29:28 -07:00
Andy Wilkinson a6eb4da2ad Merge branch '2.3.x' 
Closes gh-21763
 2020-06-08 17:42:19 +01:00
Andy Wilkinson 96ae4864a2 Merge branch '2.2.x' into 2.3.x 
Closes gh-21762
 2020-06-08 17:42:02 +01:00
Andy Wilkinson 2de906caf7 Polish "Clarify loss of defaults when adding custom mapping" 
See gh-20716
 2020-06-08 17:34:11 +01:00
Norio 9f009e4445 Clarify loss of defaults when adding custom mapping 
See gh-20716
 2020-06-08 17:31:26 +01:00
Andy Wilkinson 52a5425acf Merge branch '2.3.x' 
Closes gh-21761
 2020-06-08 17:08:20 +01:00
Andy Wilkinson a97c63661a Merge branch '2.2.x' into 2.3.x 
Closes gh-21760
 2020-06-08 17:08:07 +01:00
Andy Wilkinson 4a0e8217f0 Merge branch '2.1.x' into 2.2.x 
Closes gh-21759
 2020-06-08 17:07:51 +01:00
Andy Wilkinson 5dce945e29 Document dispatcher-types configuration for secured error pages 
Closes gh-19293
 2020-06-08 17:06:42 +01:00
Andy Wilkinson b6232cbd12 Merge branch '2.3.x' 
Closes gh-21756
 2020-06-08 14:44:02 +01:00
Andy Wilkinson fe265af252 Merge branch '2.2.x' into 2.3.x 
Closes gh-21755
 2020-06-08 14:43:39 +01:00
Andy Wilkinson 296da88e31 Merge branch '2.1.x' into 2.2.x 
Closes gh-21754
 2020-06-08 14:43:14 +01:00
Andy Wilkinson c96455f7cf Remove . from CLI's classpath on Unix-like platforms 
Previously, the spring bash script added . to the classpath but the
Windows spring.bat script did not. This commit aligns the classpath
of the two scripts by removing . from the classpath in the bash
script.

Fixes gh-19910
 2020-06-08 14:40:14 +01:00
Andy Wilkinson 020a47ba3e Document support for Gradle 5 
Closes gh-15358
 2020-06-08 14:29:07 +01:00
Andy Wilkinson 676ff423dd Merge branch '2.3.x' 2020-06-08 11:36:05 +01:00
Andy Wilkinson 82b531b49e Merge branch '2.2.x' into 2.3.x 2020-06-08 11:35:53 +01:00
Andy Wilkinson 8da1e3addb Merge branch '2.1.x' into 2.2.x 2020-06-08 11:35:10 +01:00
Andy Wilkinson 6a9450ee8b Polish 2020-06-08 11:34:56 +01:00
Phillip Webb 0c76fb950d Merge branch '2.3.x' 
Closes gh-21747
 2020-06-07 11:57:44 -07:00
Phillip Webb f8982bdc14 Polish 'Support userInfo in elasticsearch URI' 
See gh-21381
 2020-06-07 11:56:18 -07:00
Evgeniy Cheban a72179aa4f Support userInfo in elasticsearch URI 
See gh-21381
 2020-06-07 10:38:41 -07:00
Phillip Webb 6e71994b6b Merge branch '2.3.x' 
Closes gh-21745
 2020-06-07 10:28:01 -07:00
Phillip Webb abaca95467 Merge branch '2.2.x' into 2.3.x 
Closes gh-21744
 2020-06-07 10:27:35 -07:00
Phillip Webb bfe1c281f0 Merge branch '2.1.x' into 2.2.x 
Closes gh-21743
 2020-06-07 10:25:33 -07:00
Phillip Webb 70e0a27949 Drop the use of the term "white list" 
Closes gh-21737
 2020-06-07 10:22:35 -07:00
Stephane Nicoll 9fd6ff7e88 Start building against Spring Framework 5.2.7 snapshots 
See gh-21739
 2020-06-07 11:14:02 +02:00
Stephane Nicoll 4c26c7d043 Start building against Spring Framework 5.2.7 snapshots 
See gh-21738
 2020-06-07 10:54:38 +02:00
Stephane Nicoll d4c8fa9b2a Start building against Spring Framework 5.1.16 snapshots 
See gh-21729
 2020-06-07 10:37:47 +02:00
Phillip Webb 621d120ba3 Merge branch '2.3.x' 
Closes gh-21735
 2020-06-06 12:07:00 -07:00
Phillip Webb c11abf48d9 Polish 'Allow beans without public constructors to load' 
See gh-20929
 2020-06-06 12:05:50 -07:00
Vlad Kisel d8d8f9cf0b Allow beans without public constructors to load 
Allow `BeanDefinitionLoader` to load classes that don't have public
constructors. The constraint was first introduced in d82c50804f to
solve an issue with anonymous Groovy classes but causes particular
problems with `@SpringBootTest`.

See gh-20929
 2020-06-06 11:59:47 -07:00
Phillip Webb 5f79bd2a09 Merge branch '2.3.x' 
Closes gh-21734
 2020-06-06 11:08:30 -07:00
dreis2211 2b5569f054 Polish 
See gh-21732
 2020-06-06 11:07:21 -07:00
Stephane Nicoll 44f375c508 Start building against Reactor Dysprosium-SR8 snapshots 
See gh-21731
 2020-06-06 09:57:21 +02:00
Stephane Nicoll f4f9df3d10 Start building against Reactor Dysprosium-SR8 snapshots 
See gh-21730
 2020-06-06 09:26:15 +02:00
Stephane Nicoll 0b0187cd0d Start building against Reactor Californium-SR19 snapshots 
See gh-21728
 2020-06-06 08:48:15 +02:00
Phillip Webb d791d18231 Merge branch '2.3.x' 
Closes gh-21727
 2020-06-05 19:34:16 -07:00
Phillip Webb 2f973ebc33 Fix default Launcher.isExploded() result 
Fix the default implementation of `Launcher.isExploded` which should
have returned `true`.

Fixes gh-21575
 2020-06-05 19:32:06 -07:00
Phillip Webb d356a24a07 Merge branch '2.3.x' 
Closes gh-21726
 2020-06-05 16:20:39 -07:00
Phillip Webb 47c1928189 Polish 'Optimize SystemEnvironmentPropertyMapper' 
Introduce a new `ConfigurationPropertyName.ofIfValid` method to
save us needing to throw and catch an exception unnecessarily.

See gh-21523
 2020-06-05 16:11:52 -07:00
dreis2211 0378de7b30 Optimize SystemEnvironmentPropertyMapper 
See gh-21523
 2020-06-05 16:11:28 -07:00
dreis2211 f8d6d9a4b0 Call append only when necessary 
See gh-21523
 2020-06-05 16:11:11 -07:00
dreis2211 33deba4948 Use chars rather than strings 
Update `SystemEnvironmentPropertyMapper` to use single chars
rather than strings whenever possible.

See gh-21523
 2020-06-05 15:52:18 -07:00
Phillip Webb b1044ca883 Update copyright year of changed files 2020-06-05 15:37:47 -07:00
Phillip Webb 8a7a5929ae Merge branch '2.3.x' 2020-06-05 15:37:33 -07:00
Phillip Webb cc50605687 Merge branch '2.2.x' into 2.3.x 2020-06-05 15:36:44 -07:00
Phillip Webb 0a05b4c9fd Update copyright year of changed files 2020-06-05 15:36:09 -07:00
Phillip Webb 3107d2de51 Merge branch '2.3.x' 
Fixes gh-21705 in master
 2020-06-05 15:33:46 -07:00
Phillip Webb 9a235197dc Propagate manifest to exploded jars 
Update `LaunchedURLClassLoader` so that packages defined from exploded
archive folders have manifest attributes applied to them. Prior to this
calling `package.getImplementationTitle()` would only return the a
manifiest attribute when running non-exploded.

The root cause of this issue is the way that `URLClassLoader` handles
the different URL types. For URLs that reference a jar the manifest is
available. For URLs that reference a folder it isn't. When running
exploded we use a URL that references to the `BOOT-INF/classes` folder
directly. To fix the issue we now attempt to detect when `definePackage`
is being called directly, and replace `null` entries with actual
manifest values.

Fixes gh-21705
 2020-06-05 15:28:16 -07:00
Stephane Nicoll 0bc6159e44 Merge branch '2.3.x' 
Closes gh-21721
 2020-06-05 16:42:12 +02:00
Stephane Nicoll 400a168ce9 Merge branch '2.2.x' into 2.3.x 
Closes gh-21720
 2020-06-05 16:41:24 +02:00
dreis2211 9bb22ffb69 Remove usages of deprecated Connector.setAttribute() 
See gh-21671
 2020-06-05 16:32:42 +02:00
Stephane Nicoll bb86d2b3d4 Merge branch '2.3.x' 2020-06-05 16:25:38 +02:00
Stephane Nicoll 79a5ca2941 Merge branch '2.2.x' into 2.3.x 2020-06-05 16:25:24 +02:00
Stephane Nicoll eb38eeaf30 Polish 2020-06-05 16:25:12 +02:00
Andy Wilkinson 82cc7e972d Polish "Print the java version being used on startup" 
See gh-21559
 2020-06-05 14:19:15 +01:00
dreis2211 731c192817 Print the java version being used on startup 
See gh-21559
 2020-06-05 14:12:08 +01:00
dreis2211 85a6686cae Add Java 15 to JavaVersion enum 
See gh-21691
 2020-06-05 14:08:09 +01:00
Andy Wilkinson 8fb7a6cace Remove JUnit 5's vintage engine from spring-boot-starter-test 
Closes gh-21625
 2020-06-05 14:02:26 +01:00
Stephane Nicoll 721399bdc4 Merge branch '2.3.x' 2020-06-05 14:54:55 +02:00
Toshiaki Maki 0cd526c266 Fix event name in documentation 
See gh-21692
 2020-06-05 14:51:53 +02:00
Stephane Nicoll 8353dea111 Merge branch '2.3.x' 2020-06-05 14:49:55 +02:00
Stephane Nicoll 4624bf6552 Polish "Add reference to rocketmq-spring-boot-starter" 
See gh-21653
 2020-06-05 14:49:19 +02:00
ThierrySquirrel c547567882 Add reference to rocketmq-spring-boot-starter 
See gh-21653
 2020-06-05 14:49:19 +02:00
Stephane Nicoll da5e8d70a1 Polish "Support filtered scrape for Prometheus" 
See gh-21545
 2020-06-05 14:16:42 +02:00
Johnny Lim cd1baf18fe Support filtered scrape for Prometheus 
See gh-21545
 2020-06-05 14:16:42 +02:00
dreis2211 54f93e9b0f Fix multi-release JAR test on JDK 15 
See gh-21605
 2020-06-05 11:56:50 +02:00
Andy Wilkinson c4faeac4d7 Merge branch '2.3.x' 
Closes gh-21703
 2020-06-04 20:27:18 +01:00
Andy Wilkinson 24138c104c Use highlightjs for syntax highlighting in Asciidoctor's HTML output 
Closes gh-21701
 2020-06-04 20:25:29 +01:00
Phillip Webb 16cab0d83c Merge branch '2.3.x' 
Closes gh-21690
 2020-06-03 19:20:01 -07:00
Phillip Webb 4d37430bfe Use servlet context that can access classloader 
Update `SpringBootServletInitializer` to use the `ServletContext` that
was provided to the initial `onStartup` call rather than the
one from the `ServletContextEvent`. This allows the `getClassLoader()`
call to complete without throwing an `UnsupportedOperationException`.

Fixes gh-21684
 2020-06-03 19:18:12 -07:00
Scott Frederick 87f5894a9a Merge branch '2.3.x' 
Closes gh-21685
 2020-06-03 16:54:37 -05:00
Scott Frederick 29253264b4 Improve Docker API 5xx error messages 
This commit improves the error messages returned by the Spring Boot
build plugins when a 5xx status code is returned from the Docker
API while attempting to build an image. If the error response has
contents containing a JSON structure with a "message" key, the value
associated with that key will be included in the exception message
and in the build plugin output error.

Fixes gh-21515
 2020-06-03 16:53:44 -05:00
Andy Wilkinson 933a85144a Merge branch '2.3.x' 
Closes gh-21669
 2020-06-03 13:07:35 +01:00
Andy Wilkinson daeca9f332 Restore Boot 2.2's compile-scoped dependencies 
Fixes gh-21507
 2020-06-03 12:55:11 +01:00
Andy Wilkinson f041be8877 Merge branch '2.3.x' 
Closes gh-21668
 2020-06-03 11:46:59 +01:00
Andy Wilkinson 210e565741 Use dirMode and fileMode to configure CLI archive entry permissions 
Closes gh-21453
 2020-06-03 11:46:01 +01:00
Andy Wilkinson 38b91f134e Merge branch '2.3.x' 
Closes gh-21665
 2020-06-03 09:26:29 +01:00
Andy Wilkinson a2bfdb5b33 Merge branch '2.2.x' into 2.3.x 
Closes gh-21663
 2020-06-03 08:13:44 +01:00
Andy Wilkinson 29c2a0471d Add Oracle DB dependency management under com.oracle.database 
Closes gh-20333
 2020-06-03 08:06:26 +01:00
Phillip Webb 39216ce3f4 Merge branch '2.3.x' 2020-06-02 22:48:16 -07:00
Phillip Webb e39d7971fb Merge branch '2.2.x' into 2.3.x 2020-06-02 22:48:01 -07:00
Phillip Webb 864daab03a Merge branch '2.1.x' into 2.2.x 2020-06-02 22:47:41 -07:00
Phillip Webb b5fe3c3494 Refine YAML type restriction error 
Closes gh-21596
 2020-06-02 22:46:47 -07:00
Phillip Webb 20c11a3cbd Merge branch '2.3.x' 
Closes gh-21661
 2020-06-02 22:29:38 -07:00
Phillip Webb ebb3f5f286 Merge branch '2.2.x' into 2.3.x 
Closes gh-21660
 2020-06-02 22:28:39 -07:00
Phillip Webb 4fc0dec6c4 Support wrapped random property sources 
Update `SpringConfigurationPropertySource` so that wrapped random
property sources can be used. It's assumed that wrapped random
sources will use the name of the source as the prefix.

Closes gh-21595
 2020-06-02 22:22:40 -07:00
Madhura Bhave e0f548fdd3 Merge branch '2.3.x' 
Closes gh-21657
 2020-06-02 17:24:20 -07:00
Madhura Bhave 2dc8048d08 Add missing since tags 
Closes gh-21576
 2020-06-02 17:22:46 -07:00
Phillip Webb fc8fdf2de0 Merge branch '2.3.x' 
Closes gh-21656
 2020-06-02 10:59:35 -07:00
Phillip Webb 2589f980d5 Merge branch '2.2.x' into 2.3.x 
Closes gh-21655
 2020-06-02 10:58:36 -07:00
Phillip Webb 09a47c9aad Fix containsDescendantOf for random sources 
Fix the `containsDescendantOf` logic for random property sources to
ensure that ancestors are correctly matched.

Closes gh-21654
 2020-06-02 10:57:48 -07:00
Andy Wilkinson 399d0f7b95 Merge branch '2.3.x' 
Closes gh-21651
 2020-06-02 09:42:34 +01:00
Andy Wilkinson f0bc8ee73c Fix version placeholder replacement in Gradle plugin docs 
Closes gh-21640
 2020-06-02 08:59:14 +01:00
Madhura Bhave dcd83ec616 Merge branch '2.3.x' 2020-06-01 15:16:14 -07:00
Madhura Bhave 1f28141f3e Use the right property in test 2020-06-01 15:15:53 -07:00
Phillip Webb c6b3db542a Merge branch '2.3.x' 
Closes gh-21646
 2020-06-01 15:08:10 -07:00
Phillip Webb 4dff0beb80 Merge branch '2.2.x' into 2.3.x 
Closes gh-21645
 2020-06-01 15:07:26 -07:00
Phillip Webb ad73daf5bc Merge branch '2.3.x' 
Closes gh-21644
 2020-06-01 15:06:01 -07:00
Phillip Webb 14e6c734a9 Merge branch '2.1.x' into 2.2.x 
Closes gh-21643
 2020-06-01 14:45:39 -07:00