Commit Graph

8289 Commits (f39f33bb8d13c29ca3e72b1efbea60d0587ad997)

Author SHA1 Message Date
Stephane Nicoll c31917daa0 Start building against Spring Framework 5.1.17 snapshots
See gh-22370
4 years ago
Andy Wilkinson d9882f2c88 Clarify the effects of ordering auto-configuration classes
Closes gh-22337
4 years ago
Andy Wilkinson 9558779dd4 Replace ConfigurationPropertiesBeanDefinitionValidator with a FailureAnalyzer
Previously, regular bean definitions for configuration properties classes
that attempt to use constructor binding were detected in a bean factory
post-processor, ConfigurationPropertiesBeanDefinitionValidator. This
validation examined every standard bean definition and failed if it
encountered one for a class that should have used constructor binding.
There were two downsides to this approach:

1. Reflection used to identify if the bean should be using constructor
   binding triggered class loading that could prevent subsequent
   instrumentation by a load-time weaver.
2. The cost of the validation was incurred when there was no
   misconfiguration to report.

This commit replaces ConfigurationPropertiesBeanDefinitionValidator
with a failure analyzer. This failure analyzer only runs once a failure
has occurred and the application context is not going to complete
refresh. This avoids causing problems with subsequent instrumentation
and also avoids the cost of validation and error reporting unless there
is an error.

Fixes gh-20798
4 years ago
Andy Wilkinson afa5b12bdb Make reactive Jetty auto-config back off without jetty-servlet
Fixes gh-22275
4 years ago
Andy Wilkinson 66987533d1 Link to application properties section from externalized config list
Closes gh-22262
4 years ago
Andy Wilkinson 4e79bb1cff Disable bean method proxying in SpringBootJdbcConfiguration
Closes gh-22231
4 years ago
Andy Wilkinson 14f24dbecc Merge branch '2.1.x' into 2.2.x
Closes gh-22248
4 years ago
Andy Wilkinson 26f591264c Fix handling of NestedServletException with no root cause
Fixes gh-22169
4 years ago
Andy Wilkinson a8d3f9af31 Polish "Rename NoneOfNestedConditions to NoneNestedConditions in example docs"
See gh-22207
4 years ago
Clayton Walker 7fee70a625 Rename NoneOfNestedConditions to NoneNestedConditions in example docs
See gh-22207
4 years ago
Andy Wilkinson a0f1424393 Polish "Fix unwrapping of captured PrintStream in test support's OutputCapture"
See gh-22214
4 years ago
XenoAmess 75a64bd901 Fix unwrapping of captured PrintStream in test support's OutputCapture
See gh-22214
4 years ago
Andy Wilkinson 4301580095 Improve testing of PropertyPlaceholderAutoConfiguration
Since Spring Framework 4.3.0.RC2, a default embedded value resolver
has been registered with the bean factory when one is not otherwise
configured. This meant that placeholders in `@Value` would be resolved
with or without PropertyPlaceholderAutoConfiguration defining a
PropertySourcesPlaceholderConfigurer bean. However, placeholders in
bean definitions would only be resolved if a
PropertySourcesPlaceholderConfigurer was defined.

This commit updates PropertyPlaceholderAutoConfigurationTests to align
with this change in Framework. We now test that placeholders are
resolved in `@Value` annotations with or without the auto-configuration
and that placeholders in bean definitions are only resolved with the
auto-configured.

Closes gh-22230
4 years ago
Andy Wilkinson 21453b5016 Ignore scoped targets when finding matching beans
Fixes gh-22038
4 years ago
Andy Wilkinson 81d6751ba7 Use ApplicationContextRunner in ConditionalOnSingleCandidateTests 4 years ago
Andy Wilkinson a13acf9f2b Upgrade to Reactor Dysprosium-SR9
Closes gh-21937
4 years ago
dreis2211 8c0e302f2e Accept empty filter dispatcher types in auto-configurations
Prior to this commit, the usage of EnumSet.copyOf resulted in exceptions when
the underlying collection was empty.

See gh-22138
4 years ago
Andy Wilkinson 3922fb7164 Polish "Avoid NPE when binder is closed before started event"
See gh-22141
4 years ago
im47cn b34c268547 Avoid NPE when binder is closed before started event
Previously, if TomcatMetricsBinder destroy() was called before it had
received an ApplicationStartedEvent an NPE would be thrown due to
TomcatMetrics being null. This NPE was then caught and logged at
warning level by the disposable bean adapter.

This prevents the NPE by checking that the TomcatMetrics instance is
null before calling close() on it.

See gh-22141
4 years ago
May c1b9d3c226 Simplify logic in ErrorPage's equals method
See gh-22082
4 years ago
Andy Wilkinson 5475f10657 Remove WebClient's in-memory buffer size limit for endpoint tests
Previously, the thread dump endpoint's response could exceed
WebClient's in-memory buffer limt when there were a large number of
threads or the threads had large stacks.

This commit disables WebClient's in-memory buffer size limit so that
the test passing is not dependent on the number of active threads and
their stack sizes.

Closes gh-22101
4 years ago
Scott Frederick b27303704f Fix RedisReactiveHealthIndicator in clustered configuration
Prior to Spring Data Redis version 2.2.8, the contents of the
Properties object returned from the
ReactiveRedisConnection.ServerCommands.info API were the same
for clustered and non-clustered Redis configurations, containing a set
of key/value pairs. This allowed ReactiveRedisHealthIndicator to get
a version property using a well-known key. Starting with Spring Data
Redis 2.2.8, the info property keys contain a host:port prefix in a
clustered Redis configuration. This prevented
ReactiveRedisHealthIndicator from getting the version property as
before and resulted in the health always being reported as DOWN.

This commit adjusts ReactiveRedisHealthIndicator to detect the
clustered configuration from Spring Data Redis and find the version
property for one of the reported cluster nodes.

Fixes gh-22061
4 years ago
Andy Wilkinson 3fed27fd90 Merge branch '2.1.x' into 2.2.x
Closes gh-22085
4 years ago
Andy Wilkinson 0b4533659f Use Groovy's bom in spring-boot-dependencies
Closes gh-22084
4 years ago
Phillip Webb e6eb02603c Polish 'Inherit show-details property in health groups'
Rework the inheritance so that the property metadata JSON more
accurately reflects the default value.

See gh-22022
4 years ago
Leo Li 10de88884f Inherit show-details property in health groups
Update `Group` properties so that the `showDetails` value does not
inherit `Show.NEVER`. Prior to this commit, the `Group` properties
would not correctly inherit a `showDetails` value from the main
`management.endpoint.health.show-details` property.

See gh-22022
4 years ago
Phillip Webb 3b3a49db1f Polish 'Fix infinite loop in FieldValues'
See gh-22040
4 years ago
Konrado85 39a853c57b Fix infinite loop in FieldValues
Update `FieldValues` test object so that it doesn't cause an infinite
loop if it is actually created.

See gh-22040
4 years ago
Stephane Nicoll 9b803af3c3 Polish "Document how to exclude an annotation processor with Maven"
See gh-22000
4 years ago
Marco Pens 627c0b1031 Document how to exclude an annotation processor with Maven
See gh-22000
4 years ago
Andy Wilkinson 41173f7c40 Polish "Use Awaitility instead of Thread.sleep"
See gh-21988
4 years ago
Tomek Szmytka c13385ea74 Use Awaitility instead of Thread.sleep
See gh-21988
4 years ago
Andy Wilkinson 67604a5416 Only process main metadata as it already includes additional metadata
Previously, the configuration property table generation was reading
both the main metadata and the additional metadata from each project.
This was unnecessary as the annotation processor will have already
merged the additional metadata into the main metadata before writing
it to disk. Processing both the main and additional metadata led to
a clash as the metadata overlapped. When the entry in the additional
metadata won the clash, the resulting entry in the configuration
property table would lose any details that aren't contained in the
additional metadata.

This commit updates the property table generation code to only use
the main metadata files.

Fixes gh-21131
4 years ago
Andy Wilkinson 1b62abab9a Configure context on SizeAndTimeBasedRollingPolicy
Previously, when file-based logging was enabled, Logback would output
the following during logging system initialization:

LOGBACK: No context given for c.q.l.core.rolling.SizeAndTimeBasedRollingPolicy

This commit updates the default logback configuration to set the
context on the SizeAndTimeBasedRollingPolicy that it creates.

Fixes gh-21056
4 years ago
Andy Wilkinson 907b64a5eb Remove redundant stop() calls from LiveReloadServerTests 4 years ago
Madhura Bhave 615cf63a82 Make MockBean resolve right type for abstract test class
Fixes gh-20916
4 years ago
Stephane Nicoll 58974ab9cf Start building against Reactor Dysprosium-SR9 snapshots
See gh-21937
4 years ago
Stephane Nicoll ec8c1e3860 Update copyright year of changed files
See gh-21906
4 years ago
lltx de897b9b72 Fix wrong property reference to keys-to-sanitize in Javadoc
See gh-21906
4 years ago
Stephane Nicoll f8a0ca0d80 Upgrade to Netty Tcnative 2.0.31.Final
Closes gh-21889
5 years ago
Stephane Nicoll 9af5f70b75 Upgrade to Spring Batch 4.2.4
Closes gh-21783
5 years ago
Stephane Nicoll e64bfb80e4 Upgrade to Postgresql 42.2.14
Closes gh-21888
5 years ago
Stephane Nicoll 664436a3d6 Upgrade to Spring Kafka 2.3.9
Closes gh-21781
5 years ago
Stephane Nicoll 49ba5dc6bc Upgrade to Postgresql 42.2.14
Closes gh-21887
5 years ago
Stephane Nicoll c496f2401f Upgrade to Netty Tcnative 2.0.31.Final
Closes gh-21886
5 years ago
Stephane Nicoll 7dee9e34b5 Upgrade to Spring Kafka 2.2.14
Closes gh-21780
5 years ago
Phillip Webb ac197be815 Fix checkstyle issue 5 years ago
Phillip Webb 3f36f6ea47 Rollback to Spring Batch 4.2.2
See gh-21885
5 years ago
Phillip Webb 02bfc9d30a Polish 5 years ago
Madhura Bhave 4e014da9e9 Return all loggers for Log4j2
This commit aligns log4j2's behavior with logback such that loggers
with a null configuredLevel are also returned by the actuator endpoint.

Fixes gh-20037
5 years ago
Madhura Bhave 92ce94b3d8 Align default log levels for Log4j2 and Logback
Fixes gh-21293
5 years ago
Scott Frederick 0fa1d0ef2e Handle bind exceptions in management context
This commit updates the logic for handling binding exceptions in the
management context when it is separate from the application context.
The changes allow the exception details to be visible to
DefaultErrorAttributes without causing the servlet container to
detect an error condition.

Fixes gh-21036
5 years ago
Andy Wilkinson 3927bd81eb Upgrade to Spring Integration 5.2.7.RELEASE
Closes gh-21778
5 years ago
Andy Wilkinson 4eea0329d3 Upgrade to Spring Data Moore SR8
Closes gh-21775
5 years ago
Andy Wilkinson ea55bb32a2 Upgrade to Spring Data Lovelace-SR18
Closes gh-21774
5 years ago
Andy Wilkinson 4eba8e2dc2 Upgrade to Spring Integration 5.1.11.RELEASE
Closes gh-21777
5 years ago
Stephane Nicoll f5b0ebc9c2 Upgrade to Maven Shade Plugin 3.2.4
Closes gh-21838
5 years ago
Stephane Nicoll 331390cd74 Upgrade to Spring Security 5.2.5.RELEASE
Closes gh-21836
5 years ago
Stephane Nicoll 4c15c512fa Upgrade to Spring Amqp 2.2.7.RELEASE
Closes gh-21835
5 years ago
Stephane Nicoll 7a0b22086f Upgrade to Postgresql 42.2.13
Closes gh-21834
5 years ago
Stephane Nicoll 6ca229c678 Upgrade to Kotlin Coroutines 1.3.7
Closes gh-21833
5 years ago
Stephane Nicoll a91c157bf4 Upgrade to Hibernate Validator 6.0.20.Final
Closes gh-21832
5 years ago
Stephane Nicoll 5ae2a9e25c Upgrade to Hibernate 5.4.17.Final
Closes gh-21831
5 years ago
Stephane Nicoll 1f6582e3e4 Upgrade to Jaybird 3.0.9
Closes gh-21830
5 years ago
Stephane Nicoll c3cf3bd72b Upgrade to Elasticsearch 6.8.10
Closes gh-21829
5 years ago
Stephane Nicoll d07b460247 Upgrade to Jetty 9.4.29.v20200521
Closes gh-21828
5 years ago
Stephane Nicoll eadc6d07b8 Upgrade to Groovy 2.5.12
Closes gh-21827
5 years ago
Stephane Nicoll ad321895d5 Upgrade to Awaitility 4.0.3
Closes gh-21826
5 years ago
Stephane Nicoll 78a06d5343 Upgrade to Tomcat 9.0.36
Closes gh-21825
5 years ago
Stephane Nicoll ec5dc3bfa4 Upgrade to Johnzon Jsonb 1.2.7
Closes gh-21824
5 years ago
Stephane Nicoll a2738b51d6 Upgrade to Byte Buddy 1.10.11
Closes gh-21823
5 years ago
Stephane Nicoll 2eff659fa4 Upgrade to Rsocket 1.0.1
Closes gh-21822
5 years ago
Stephane Nicoll 518cdf2751 Upgrade to Netty 4.1.50.Final
Closes gh-21821
5 years ago
Stephane Nicoll 62d3f0d872 Upgrade to Micrometer 1.3.9
Closes gh-21820
5 years ago
Stephane Nicoll 9acfc81244 Upgrade to Dropwizard Metrics 4.1.9
Closes gh-21819
5 years ago
Stephane Nicoll 6aa7f7aed5 Upgrade to Hikaricp 3.4.5
Closes gh-21818
5 years ago
Stephane Nicoll cda93e0af7 Upgrade to Okhttp3 3.14.9
Closes gh-21817
5 years ago
Stephane Nicoll 7b3070cd8c Upgrade to Caffeine 2.8.4
Closes gh-21816
5 years ago
Stephane Nicoll b118d8953b Upgrade to Couchbase Client 2.7.15
Closes gh-21815
5 years ago
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
5 years ago
Stephane Nicoll 5d2a9e9220 Upgrade to Maven Shade Plugin 3.2.4
Closes gh-21814
5 years ago
Stephane Nicoll 8841feb311 Upgrade to Spring Security 5.1.11.RELEASE
Closes gh-21813
5 years ago
Stephane Nicoll 9d80ece9a5 Upgrade to Spring Amqp 2.1.15.RELEASE
Closes gh-21812
5 years ago
Stephane Nicoll c456b633d5 Upgrade to Postgresql 42.2.13
Closes gh-21811
5 years ago
Stephane Nicoll b560501c3c Upgrade to Hibernate Validator 6.0.20.Final
Closes gh-21810
5 years ago
Stephane Nicoll fa9890b381 Upgrade to Jaybird 3.0.9
Closes gh-21809
5 years ago
Stephane Nicoll 357ada7aa0 Upgrade to Jetty 9.4.29.v20200521
Closes gh-21808
5 years ago
Stephane Nicoll 544b688b62 Upgrade to Groovy 2.5.12
Closes gh-21807
5 years ago
Stephane Nicoll 4724839aea Upgrade to Tomcat 9.0.36
Closes gh-21806
5 years ago
Stephane Nicoll a07ccb0c39 Upgrade to Netty 4.1.50.Final
Closes gh-21805
5 years ago
Stephane Nicoll 27c94bd649 Upgrade to Micrometer 1.1.14
Closes gh-21804
5 years ago
Stephane Nicoll e88ae68430 Upgrade to Couchbase Client 2.7.15
Closes gh-21803
5 years ago
Madhura Bhave 36faa1d42a Document using system properties in gradle plugin docs
Closes gh-21317
5 years ago
Stephane Nicoll 6597c0c7f7 Start building against Spring Data Moore-SR8 snapshots
See gh-21775
5 years ago
Stephane Nicoll cc3575b3f4 Merge branch '2.1.x' into 2.2.x 5 years ago
Stephane Nicoll 79f0e38c54 Start building against Spring Data Lovelace-SR18 snapshots
See gh-21774
5 years ago
Stephane Nicoll 9a457527fd Polish test 5 years ago
Stephane Nicoll 180e57a8d7 Start building against Spring Batch 4.2.3 snapshots
See gh-21783
5 years ago
Stephane Nicoll 7b4707aab5 Start building against Spring Kafka 2.3.9 snapshots
See gh-21781
5 years ago
Stephane Nicoll 5cde880562 Start building against Spring Integration 5.2.7 snapshots
See gh-21778
5 years ago
Stephane Nicoll 679816d3a4 Upgrade to Spring Framework 5.2.7
Closes gh-21738
5 years ago
Stephane Nicoll 36a05375c7 Start building against Spring Kafka 2.2.14 snapshots
See gh-21780
5 years ago
Stephane Nicoll 445a9a461b Start building against Spring Integration 5.1.11 snapshots
See gh-21777
5 years ago
Stephane Nicoll de6ee358fb Upgrade to Spring Framework 5.1.16
Closes gh-21729
5 years ago
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
5 years ago
Stephane Nicoll 3889e6336a Upgrade to Reactor Dysprosium-SR8
Closes gh-21730
5 years ago
Stephane Nicoll 10e0ca7dce Upgrade to Reactor Californium-SR19
Closes gh-21728
5 years ago
Andy Wilkinson 2de906caf7 Polish "Clarify loss of defaults when adding custom mapping"
See gh-20716
5 years ago
Norio 9f009e4445 Clarify loss of defaults when adding custom mapping
See gh-20716
5 years ago
Andy Wilkinson 4a0e8217f0 Merge branch '2.1.x' into 2.2.x
Closes gh-21759
5 years ago
Andy Wilkinson 5dce945e29 Document dispatcher-types configuration for secured error pages
Closes gh-19293
5 years ago
Andy Wilkinson 296da88e31 Merge branch '2.1.x' into 2.2.x
Closes gh-21754
5 years ago
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
5 years ago
Andy Wilkinson 020a47ba3e Document support for Gradle 5
Closes gh-15358
5 years ago
Andy Wilkinson 8da1e3addb Merge branch '2.1.x' into 2.2.x 5 years ago
Andy Wilkinson 6a9450ee8b Polish 5 years ago
Phillip Webb bfe1c281f0 Merge branch '2.1.x' into 2.2.x
Closes gh-21743
5 years ago
Phillip Webb 70e0a27949 Drop the use of the term "white list"
Closes gh-21737
5 years ago
Stephane Nicoll 4c26c7d043 Start building against Spring Framework 5.2.7 snapshots
See gh-21738
5 years ago
Stephane Nicoll d4c8fa9b2a Start building against Spring Framework 5.1.16 snapshots
See gh-21729
5 years ago
Stephane Nicoll f4f9df3d10 Start building against Reactor Dysprosium-SR8 snapshots
See gh-21730
5 years ago
Stephane Nicoll 0b0187cd0d Start building against Reactor Californium-SR19 snapshots
See gh-21728
5 years ago
Phillip Webb 0a05b4c9fd Update copyright year of changed files 5 years ago
dreis2211 9bb22ffb69 Remove usages of deprecated Connector.setAttribute()
See gh-21671
5 years ago
Stephane Nicoll eb38eeaf30 Polish 5 years ago
Andy Wilkinson 29c2a0471d Add Oracle DB dependency management under com.oracle.database
Closes gh-20333
5 years ago
Phillip Webb 864daab03a Merge branch '2.1.x' into 2.2.x 5 years ago
Phillip Webb b5fe3c3494 Refine YAML type restriction error
Closes gh-21596
5 years ago
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
5 years ago
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
5 years ago
Phillip Webb 14e6c734a9 Merge branch '2.1.x' into 2.2.x
Closes gh-21643
5 years ago
Phillip Webb 95031295b9 Restore TomcatReactiveWebServerFactoryTests
Restore tests that were previously ignored due to a framework bug.

Closes gh-19702
5 years ago
Madhura Bhave 573cb98d90 Make management security configuration back off when SAML present
Fixes gh-21620
5 years ago
Phillip Webb 14c9804c5c Fix checkstyle issues 5 years ago
Phillip Webb af90604030 Merge branch '2.1.x' into 2.2.x
Closes gh-21597
5 years ago
Phillip Webb 587b840666 Restrict use of custom YAML types
Update `YamlJsonParser` and `OriginTrackedYamlLoader` to ensure that
custom types cannot be loaded.

Closes gh-21596
5 years ago
Bram De Cneudt 591d234e43 Fix links for Apache Camel starter
See gh-21540
5 years ago
Stephane Nicoll 77981ac2ae Polish "Use the container IP address for tests using TestContainer"
See gh-21480
5 years ago
olivier lamy 0c2bf70bb8 Use the container IP address for tests using TestContainer
See gh-21480
5 years ago
Stephane Nicoll afcb5d54b2 Polish "Fix uri tag for empty path"
See gh-21392
5 years ago
Jon Schneider f78f2d57e1 Fix uri tag for empty path
See gh-21392
5 years ago
Moritz do Rio Schulze 1e168a2145 Fix typo in section 4.30.6
See gh-21485
5 years ago
Scott Frederick 4a812fc29c Fix log name in ServletWebServerApplicationContext
Fixes gh-21354
5 years ago
Andy Wilkinson 4a896f2272 Merge branch '2.1.x' into 2.2.x
Closes gh-21471
5 years ago
Andy Wilkinson fdc63d71fe Use HTTPS when linking to groovy-lang.org
Closes gh-21466
5 years ago
Andy Wilkinson b78e4dacec Work around file handle leak when Undertow is stopped
There's a bug in Undertow that means it may leak a file handle is
the server is stopped immediately after a response to an SSL request
has been received. The stop processing races with Undertow's SSL
support tidying things up after sending the response. When the stop
processing wins, the tidying up fails with a NullPointerException that
prevents an input stream from being closed. On Windows, the input
stream remaining open prevents JUnit from being able to clean up its
temporary directory.

This commit uses Awaitility to wait for the file that's being served
over SSL to be deleted before stopping the server. On Windows, this
will delay the stop processing from beginning until after the tidy up
that's performed after sending the response has been completed,
hopefully eliminating the race condition that resulted in the input
stream being left open.

Fixes gh-21172
5 years ago
Phillip Webb 49a21ded7a Create endpoint beans as late as possible
Update `EndpointDiscoverer` so that `@Endpoint` and `@EndpointExtension`
beans are created as late as possible.

Prior to this commit, endpoint beans and extension beans would be
created during the discovery phase which could cause early bean
initialization. The problem was especially nasty when using an embedded
servlet container since `ServletEndpointRegistrar` is loaded as the
container is initialized. This would trigger discovery and load all
endpoint beans, including the health endpoint, and all health indicator
beans.

Fixes gh-20714
5 years ago
Madhura Bhave 27ada029b5 Revert "Expose property to configure OAuth2 provider configurationMetadata"
This reverts commit 7b79029949.

See gh-21375
5 years ago
Phillip Webb daed512076 Restore getUseRelativeRedirects in deprecated form
Restore the `getUseRelativeRedirects` method with a `Boolean` object
result and introduce `isUseRelativeRedirects` for the primitive boolean
variant.

See gh-20796
5 years ago
Phillip Webb 5157a75119 Polish 5 years ago