Commit Graph

13959 Commits (a5bf57aef35f4ecfb98d528399bbf1f0694808b1)

Author SHA1 Message Date
Andy Wilkinson f6b7730dac Use Asciidoctor's revision line to provide document's version
Using the revision line means that the revision number is automatically
set. The revision number is then included by the HTML and PDF backends
in the standard location. In the HTML backend that's alongside the
list of authors. In the PDF backend that's on the title page.

Closes gh-26851
3 years ago
Andy Wilkinson 6982bbdc2b Merge branch '2.5.x'
Closes gh-26890
3 years ago
Andy Wilkinson 5de5390ef9 Merge branch '2.4.x' into 2.5.x
Closes gh-26889
3 years ago
Andy Wilkinson c89430e174 Try to stabilize httpConnectionsAreClosedAfterLongPollTimeout
Closes gh-26888
3 years ago
Andy Wilkinson 06c6eee7c5 Merge branch '2.5.x'
Closes gh-26887
3 years ago
Andy Wilkinson 3858c6299d Merge branch '2.4.x' into 2.5.x
Closes gh-26886
3 years ago
Andy Wilkinson 7a14a53250 Try to stabilize TunnelClientTests.addListener()
Closes gh-26885
3 years ago
Stephane Nicoll e7df0a8bf2 Remove dependency management for Nimbus
Closes gh-26819
3 years ago
Stephane Nicoll a0cf1eed41 Add support for customizing the auto-configured ClientResources
Closes gh-26792
3 years ago
Stephane Nicoll f8555b9071 Add metrics for task execution and scheduling
Closes gh-23818
3 years ago
Stephane Nicoll 6505e03cb2 Polish "Add auto-configuration for Spring Data Envers"
See gh-22610
3 years ago
Stefano Cordio 91da8c9fc6 Add auto-configuration for Spring Data Envers
See gh-22610
3 years ago
Stephane Nicoll d17c475504 Polish "Enable Redis connection pool if commons-pool2 is available"
See gh-26326
3 years ago
weixsun 55ff163018 Enable Redis connection pool if commons-pool2 is available
See gh-26326
3 years ago
Stephane Nicoll 05acfaa690 Polish "Upgrade to Flyway 7.9.2"
See gh-26456
3 years ago
Kedar Joshi e6236b76bb Upgrade to Flyway 7.9.2
See gh-26456
3 years ago
Stephane Nicoll d5d23d73e7 Polish "Allow SpringApplicationBuilder to specify a ResourceLoader"
See gh-26690
3 years ago
Jamin Hitchcock 7b0ba35025 Allow SpringApplicationBuilder to specify a ResourceLoader
See gh-26690
3 years ago
Stephane Nicoll fc0438eda8 Polish "Allow direct use of exposed WebSessionIdResolver bean"
See gh-26437
3 years ago
weixsun 65ce1454e0 Allow direct use of exposed WebSessionIdResolver bean
See gh-26437
3 years ago
Stephane Nicoll b7f126020e Update copyright year of change file
See gh-26422
3 years ago
Marcus Klimstra 10ffaffb7b Improve configuration of Start and Stop goals
See gh-26422
3 years ago
Stephane Nicoll 6b4efcce11 Polish "Apply RSocketConnectorConfigurer beans to RSocketRequester.Builder"
See gh-26341
3 years ago
nguyensach 850c653862 Apply RSocketConnectorConfigurer beans to RSocketRequester.Builder
See gh-26341
3 years ago
Stephane Nicoll 69c2621a14 Polish "Add support for @Value annotation"
See gh-26337
3 years ago
Mark Jeffrey 14d86034a1 Add support for @Value annotation
This commit adds support for `@Value` from project Lombok for metadata
generation. This is very similar to the existing `@Data` support.

See gh-26337
3 years ago
Stephane Nicoll d847f4c69e Polish "Add configuration property for Tomcat's rejectIllegalHeader"
See gh-26311
3 years ago
David Byron e5a539d80e Add configuration property for Tomcat's rejectIllegalHeader
See gh-26311
3 years ago
Stephane Nicoll a1183c4641 Polish "Reproducible build for spring-boot-maven-plugin:build-info"
See gh-26221
3 years ago
Slawomir Jaranowski 2dec6dd552 Reproducible build for spring-boot-maven-plugin:build-info
See gh-26221
3 years ago
Andy Wilkinson 2bea21ed4f Merge branch '2.5.x'
Closes gh-26874
3 years ago
Andy Wilkinson 866f1e34c1 Merge branch '2.4.x' into 2.5.x
Closes gh-26873
3 years ago
Andy Wilkinson 37d395bad2 Try to stabilize flaky MetricsWebClientFilterFunction test
Closes gh-26855
3 years ago
Stephane Nicoll a90c7181b7 Polish "Add auto-configuration for DiskSpaceMetrics"
See gh-26001
3 years ago
bono007 e3f03dd50a Add auto-configuration for DiskSpaceMetrics
See gh-26001
3 years ago
Andy Wilkinson 151e0eb2b6 Merge branch '2.5.x'
Closes gh-26871
3 years ago
Andy Wilkinson 0ab7144bf1 Merge branch '2.4.x' into 2.5.x
Closes gh-26870
3 years ago
Andy Wilkinson 608c4509f8 Try to stabilise SocketTargetServerConnectionTests
Closes gh-26857
3 years ago
Andy Wilkinson 5123d7c937 Merge branch '2.4.x'
Closes gh-26869
3 years ago
Andy Wilkinson 00b9e7f498 Merge branch '2.4.x' into 2.5.x
Closes gh-26868
3 years ago
Andy Wilkinson 186658cc12 Attempt to stabilize stopTriggersTunnelClose
Closes gh-26856
3 years ago
Stephane Nicoll 9e46061aa6 Allow to chain ContextConsumer implementations
Closes gh-26723
3 years ago
Andy Wilkinson f3f119b111 Don't shutdown logging system before contexts
Add `SpringApplicationShutdownHook` to manage orderly application
shutdown, specifically around the `LoggingSystem`. `SpringApplication`
now offers a `getShutdownHandlers()` method that can be used to add
handlers that are guaranteed to only run after the `ApplicationContext`
has been closed and is inactive.

Fixes gh-26660
3 years ago
Andy Wilkinson 39aa27e13c Make DB init back off without DatabasePopulator
Fixes gh-26850
3 years ago
Phillip Webb 2835085ffb Polish 3 years ago
Phillip Webb 17671980dc Merge branch '2.4.x' 3 years ago
Phillip Webb 7c4f178c17 Merge branch '2.3.x' into 2.4.x 3 years ago
Phillip Webb 3b48526732 Polish 3 years ago
Stephane Nicoll 18eb88b281 Upgrade to Git Commit ID Plugin 4.0.5
Closes gh-26845
3 years ago
Stephane Nicoll f79f2b1594 Upgrade to Spring AMQP 2.3.8
Closes gh-26764
3 years ago
Stephane Nicoll ab90a948be Polish "Fix Optaplanner starter url"
See gh-26816
3 years ago
Geoffrey De Smet 736b0678e5 Fix Optaplanner starter url
See gh-26816
3 years ago
Stephane Nicoll a7c538faa0 Upgrade to RSocket 1.1.1
Closes gh-26839
3 years ago
Stephane Nicoll 2201315556 Upgrade to Jetty 9.4.42.v20210604
Closes gh-26838
3 years ago
Stephane Nicoll 5cb1bd8245 Upgrade to Jetty Reactive HTTPClient 1.1.9
Closes gh-26837
3 years ago
Madhura Bhave 2e2d1fe8d3 Merge branch '2.4.x' into main 3 years ago
Madhura Bhave e3042b38f5 Merge branch '2.3.x' into 2.4.x 3 years ago
Madhura Bhave 63806d5bac Remove duplicate copyright notice from docs 3 years ago
Andy Wilkinson d79b3597bb Upgrade to Spring AMQP 2.3.8
Closes gh-26762
3 years ago
Andy Wilkinson d4200a7c56 Upgrade to Spring Integration 5.3.8.RELEASE
Closes gh-26772
3 years ago
Andy Wilkinson 03e1b255ea Upgrade to Spring AMQP 2.2.18.RELEASE
Closes gh-26770
3 years ago
Andy Wilkinson 9fb7cf49e4 Upgrade to Spring Kafka 2.7.2
Closes gh-26765
3 years ago
Andy Wilkinson 4a11c6a135 Upgrade to Spring Kafka 2.6.9
Closes gh-26763
3 years ago
Andy Wilkinson 53068a2489 Upgrade to Spring Kafka 2.5.14.RELEASE
Closes gh-26771
3 years ago
Andy Wilkinson 46d7999b1d Lower spring.sql.init.enabled's deprecation level to warning
See gh-26682
3 years ago
Andy Wilkinson de410b7621 Merge branch '2.4.x'
Closes gh-26828
3 years ago
Andy Wilkinson a1c5fcca58 Move common Asciidoctor configuration into our conventions
Closes gh-26620
3 years ago
Stephane Nicoll 6a7a11ba59 Upgrade to RSocket 1.1.1
Closes gh-26836
3 years ago
Stephane Nicoll 66ae421f74 Upgrade to Neo4j Java Driver 4.1.3
Closes gh-26835
3 years ago
Stephane Nicoll f9a0b0308d Upgrade to Jetty 9.4.42.v20210604
Closes gh-26834
3 years ago
Stephane Nicoll 6cdbed7dc3 Upgrade to Jetty Reactive HTTPClient 1.1.9
Closes gh-26833
3 years ago
Stephane Nicoll 872ec0bf00 Upgrade to RSocket 1.0.5
Closes gh-26832
3 years ago
Stephane Nicoll f73e7bcc0c Upgrade to Neo4j OGM 3.2.24
Closes gh-26831
3 years ago
Stephane Nicoll 1ef0068b38 Upgrade to Jetty 9.4.42.v20210604
Closes gh-26830
3 years ago
Stephane Nicoll 0563955324 Upgrade to Jetty Reactive HTTPClient 1.1.9
Closes gh-26829
3 years ago
Stephane Nicoll 8590eccac4 Polish
See gh-26682
3 years ago
Stephane Nicoll d23b07a166 Upgrade to Spring Framework 5.3.8
Closes gh-26761
3 years ago
Stephane Nicoll e9592229fc Upgrade to Spring Framework 5.3.8
Closes gh-26760
3 years ago
Andy Wilkinson 03f8a46c80 Test our Gradle plugin against 7.1-rc-2
Closes gh-26825
3 years ago
Andy Wilkinson c5728c9560 Merge branch '2.4.x'
Closes gh-26827
3 years ago
Andy Wilkinson 303edac6bb Merge branch '2.3.x' into 2.4.x
Closes gh-26826
3 years ago
Andy Wilkinson d1e1796f76 Consider overridden getRootUri() when getting root URI
Fixes gh-26812
3 years ago
Phillip Webb 850088de32 Merge branch '2.4.x'
Closes gh-26823
3 years ago
Phillip Webb d5264664e6 Merge branch '2.3.x' into 2.4.x
Closes gh-26822
3 years ago
Phillip Webb 1f6983c4c9 Make CompositeHealth.getDetails() public
Change `CompositeHealth.getDetails()` to public so that it serializes
correctly when `MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS` is
disabled.

Fixes gh-26797
3 years ago
Phillip Webb f798f26596 Merge branch '2.4.x' 3 years ago
Phillip Webb 4d62e47c5d Merge branch '2.3.x' into 2.4.x 3 years ago
Phillip Webb 9e1c78da99 Update copyright year of changed files 3 years ago
Phillip Webb 703eaa71f4 Remove main class configuration fallback
Remove fallback code since we now require Gradle 6.8 and can depend
on the `getMainClass` method being present.

Closes gh-26794
3 years ago
Phillip Webb b7ac1e6cd7 Rename derivefrom to align with DataSourceBuilder
Rename the `derivefrom` method in `ConnectionFactoryBuilder` to
`derivedFrom` to align with `DataSourceBuilder`.

Fixes gh-26810
3 years ago
Phillip Webb f8c3e0e5aa Respect custom username/password properties
Fix a bug in `DataSourceInitializationConfiguration` and in
`R2dbcInitializationConfiguration` that was stopping
custom username/password properties from being applied.

Fixes gh-26676
3 years ago
Phillip Webb d19b2681ab Rework build-image-customization table in docs
Collapse parameter name and user property into a single column to give
a little more room for the description and default value.

Closes gh-25739
3 years ago
Phillip Webb 6ab2df5698 Order DataSourceScriptDatabaseInitializer last
Change the order of `DataSourceScriptDatabaseInitializerDetector` so
that it always runs last. This update allows script initialization to
be combined with a high-level migration tool such as Flyway.

Closes gh-26692
3 years ago
Phillip Webb dafd511284 Support DatabaseInitializerDetector ordering
Update `DatabaseInitializationDependencyConfigurer` so that depends-on
ordering is applied based on the `DatabaseInitializerDetector` order.

Prior to this commit, if multiple DatabaseInitializer beans were
detected the order in which they were initialized was not defined.

See gh-26692
3 years ago
Scott Frederick fba5ffc626 Fix FilePermissionsTests on Windows
See gh-26658
3 years ago
Andy Wilkinson 8df6392ca5 Polish
The use of the file's absolute path caused test failures on Windows.

See gh-26682
3 years ago
Andy Wilkinson c52143727a Reinstate mode for controlling DB initialization
Closes gh-26682
3 years ago
Andy Wilkinson 1a0e008a8c Prevent Netty tcNative from loading classes with wrong class loader
In our tests, the JNI code in Netty tcNative can cause some of its
classes to be loaded using a ModifiedClassPathClassLoader. When the
wrong class loader is used, SSL-related tests fail, for example due
to the same Netty tcNative classes being loaded by two different
ClassLoders and no longer being the same. This appears to be
dependent upon the order in which tests are executed and results in
intermittent test failures.

It looks like this should be addressed in Netty tcNative 2.0.40 which
preloads all of its classes. In the meantime, this commit updates
ModifiedClassPathClassLodaer to ignore Netty tcNative classes so that
they're only ever loaded by the system class loader.

Closes gh-26749
3 years ago
Stephane Nicoll faeda6f917 Polish 3 years ago
Stephane Nicoll 4c71e8124d Upgrade to Undertow 2.2.8.Final
Closes gh-26809
3 years ago
Stephane Nicoll 11d31edf0a Upgrade to Neo4j Java Driver 4.2.6
Closes gh-26808
3 years ago
Stephane Nicoll 88b9b88cd9 Upgrade to jOOQ 3.14.11
Closes gh-26807
3 years ago
Stephane Nicoll b755eacd86 Upgrade to Johnzon 1.2.13
Closes gh-26806
3 years ago
Stephane Nicoll 3d5caf0863 Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26805
3 years ago
Stephane Nicoll a74fb0c2f0 Upgrade to Infinispan 12.1.4.Final
Closes gh-26804
3 years ago
Stephane Nicoll b4d0c3df6d Upgrade to Hibernate 5.4.32.Final
Closes gh-26803
3 years ago
Stephane Nicoll 7ea263548c Upgrade to Gson 2.8.7
Closes gh-26802
3 years ago
Stephane Nicoll e2a877ca07 Upgrade to Ehcache3 3.9.4
Closes gh-26801
3 years ago
Stephane Nicoll 5a18553b50 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26800
3 years ago
Stephane Nicoll b9d29130fb Upgrade to Couchbase Client 3.1.6
Closes gh-26799
3 years ago
Stephane Nicoll cd8a9d3705 Upgrade to AppEngine SDK 1.9.89
Closes gh-26798
3 years ago
Phillip Webb f5b93da90f Fix conversion failures when using DefaultResolver
Update `ConfigurationPropertySourcesPropertyResolver` so that calls to
the `DefaultResolver` do not attempt conversion.

Prior to this commit, the delegate resolver was accidentally called
with the target type which could cause a `ConversionFailedException`
to be thrown. We should have always used `Object.class` and let the
`convertValueIfNecessary` method perform conversion.

Fixes gh-26732
3 years ago
Phillip Webb be23a29651 Polish 3 years ago
Andy Wilkinson 87d35250a5 Test our Gradle plugin against 7.1-rc-1
7.1-rc-1 deprecates JavaExec's main property in favor of mainClass
which was introduced in Gradle 6.4. This commit updates some tests
to use mainClass rather than main that would otherwise have failed
due to deprecation warnings in their output.

Closes gh-26793
3 years ago
Stephane Nicoll bac89a3919 Upgrade to Undertow 2.2.8.Final
Closes gh-26791
3 years ago
Stephane Nicoll d6f22f0802 Upgrade to jOOQ 3.14.11
Closes gh-26790
3 years ago
Stephane Nicoll 99169af57c Upgrade to Johnzon 1.2.13
Closes gh-26789
3 years ago
Stephane Nicoll fe249dd772 Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26788
3 years ago
Stephane Nicoll 5be4a9ab50 Upgrade to Hibernate 5.4.32.Final
Closes gh-26787
3 years ago
Stephane Nicoll e496d2e321 Upgrade to Gson 2.8.7
Closes gh-26786
3 years ago
Stephane Nicoll 16ff9318b5 Upgrade to Ehcache3 3.9.4
Closes gh-26785
3 years ago
Stephane Nicoll 90f96e2d48 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26784
3 years ago
Stephane Nicoll cfaab0904b Upgrade to AppEngine SDK 1.9.89
Closes gh-26783
3 years ago
Phillip Webb abd926788f Merge branch '2.4.x'
Closes gh-26782
3 years ago
Phillip Webb 7396e1e743 Fix property ordering within '.' and '/config'
Allow groups to be used with standard locations so that order of
profile-specific files is consistent.

Prior to this commit, the default search locations considered for
application properties/yaml files was the following:

	optional:classpath:/
	optional:classpath:/config/
	optional:file:./
	optional:file:./config/
	optional:file:./config/*/

Each of these locations was independent which could cause confusion
if certain combinations were used. For example, if profile-specific
files were added to `classpath:/` and `classpath:/config/` then the
latter would always override the former regardless of the profile
ordering.

This commit updates `StandardConfigDataLocationResolver` so that a
group of locations can be specified for each item. This allows us to
define the following set of search locations which provide more logical
ordering for profile-specific files

	optional:classpath:/;optional:classpath:/config/
	optional:file:./;optional:file:./config/;optional:file:./config/*/

Closes gh-26593
3 years ago
Stephane Nicoll 1e680241ed Upgrade to Johnzon 1.2.13
Closes gh-26781
4 years ago
Stephane Nicoll 3a0794da4b Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26780
4 years ago
Stephane Nicoll 84a4693dcf Upgrade to Hibernate 5.4.32.Final
Closes gh-26779
4 years ago
Stephane Nicoll 790a8c1f47 Upgrade to Gson 2.8.7
Closes gh-26778
4 years ago
Stephane Nicoll 7ccbe3c5f8 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26777
4 years ago
Stephane Nicoll f3049e8e94 Upgrade to AppEngine SDK 1.9.89
Closes gh-26776
4 years ago
Stephane Nicoll 5391f028a7 Start building against Spring Kafka 2.7.2 snapshots
See gh-26765
4 years ago
Stephane Nicoll caacee5f1c Start building against Spring AMQP 2.3.8
See gh-26764
4 years ago
Stephane Nicoll c435f6337c Start building against Spring Framework 5.3.8 snapshots
See gh-26761
4 years ago
Stephane Nicoll 39f259554b Start building against Spring Integration 5.3.8 snapshots
See gh-26772
4 years ago
Stephane Nicoll 37625854b6 Start building against Spring Kafka 2.5.14 snapshots
See gh-26771
4 years ago
Stephane Nicoll 323d1e224d Start building against Spring AMQP 2.2.18 snapshots
See gh-26770
4 years ago
Stephane Nicoll de06bbb4dc Start building against Spring Kafka 2.6.9 snapshots
See gh-26763
4 years ago
Stephane Nicoll 4c31ccb576 Start building against Spring AMQP 2.3.8 snapshots
See gh-26762
4 years ago
Stephane Nicoll d2fe417bbb Start building against Spring Framework 5.3.8 snapshots
See gh-26760
4 years ago
Stephane Nicoll 5ac5038176 Merge branch '2.4.x' 4 years ago
Stephane Nicoll aea8597114 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 6490edc16d Polish 4 years ago
Stephane Nicoll aff1366731 Polish "Fix typo in 'Reacting to the Maven plugin' title"
See gh-26751
4 years ago
Abel Salgado Romero 9eea502c3e Fix typo in 'Reacting to the Maven plugin' title
See gh-26751
4 years ago
Phillip Webb e73062aefa Merge branch '2.4.x'
Closes gh-26755
4 years ago
Phillip Webb 0da0d2d469 Prevent nested profile-specific resolution
Update the `ConfigDataEnvironment` so that the `resolveProfileSpecific`
method of `ConfigDataLocationResolver` is no longer called when
resolving imports declared in a profile-specific file.

Fixes gh-26753
4 years ago
Phillip Webb 3c7a0d3bf2 Merge branch '2.4.x'
Closes gh-26754
4 years ago
Phillip Webb d1b256a169 Prevent indirect standard profile-specific imports
Update `StandardConfigDataLocationResolver` so that profile-specific
imports can only be used when there is no parent import.

Prior to this commit, given the following application.properties file:

	spring.profiles.active=p1,p2
	spring.config.import=other.properties

We would attempt to import `other.properties`, `other-p1.properties`
and `other-p2.properties`. This seems quite confusing and when we really
only need to support profile-specific properties for the initial root
set of locations.

Fixes gh-26752
4 years ago
Stephane Nicoll 75f31f6bc4 Merge branch '2.4.x'
Closes gh-26748
4 years ago
Stephane Nicoll ad99aa2f4a Merge branch '2.3.x' into 2.4.x
Closes gh-26747
4 years ago
dreis2211 f470151535 Remove reference to surefirebooter JAR
See gh-26737
4 years ago
Phillip Webb 02494d63d2 Merge branch '2.4.x'
Closes gh-26744
4 years ago
Phillip Webb 1cda557d03 Merge branch '2.3.x' into 2.4.x
Closes gh-26743
4 years ago
Phillip Webb 1beee5700c Don't close early when SecurityManager present
Update `JarFile` and `JarFileWrapper` classes so that they no longer
close the `JarFile` early if a `SecurityManager` is in use.

Prior to this commit, the closed `JarFile` would cause (an ultimately
swallowed) NPE in `ZipFile` which manifested itself as a
`ClassNotFoundException` when starting the app.

Closes gh-25538
4 years ago
Madhura Bhave 554cf9d7c7 Merge branch '2.4.x' into main
Closes gh-26741
4 years ago
Madhura Bhave 2ff3fe22e5 Merge branch '2.3.x' into 2.4.x
Closes gh-26740
4 years ago
Madhura Bhave d0e2925dcc Fix link to Spring Data JPA docs
Fixes gh-26736
4 years ago
Scott Frederick f560e86f03 Write buildpack directories to builder layer
When a custom buildpack is provided for image building, the contents
of the buildpack directory, tgz file, or image are copied as tar
entries to a new layer in the ephemeral builder image. Prior to this
commit, only file entries from the buildpack source were copied as
builder layer tar entries; intermediate directory entries from the
source were not copied. This results in directories being created in
the builder container using default permissions. This worked on most
Linux-like OSs where the default permissions allow others-read
access. On some OSs like Arch Linux where the default directory
permissions do not allow others-read, this prevented the lifecycle
processes from reading the buildpack files.

This commit explicitly creates all intermediate directory tar entries
in the builder image layer to ensure that the buildpack directories
and files can be read by the lifecycle processes.

Fixes gh-26658
4 years ago
Madhura Bhave e2cba40db0 Merge branch '2.4.x' into main
Closes gh-26739
4 years ago
Madhura Bhave b102fdd392 Merge branch '2.3.x' into 2.4.x
Closes gh-26738
4 years ago
Madhura Bhave 15324956a8 Align int and long in RandomValuePropertySource
This commit aligns int and long so that a random number is generated
by delegating to ints/longs in the JDK's Random API. In the case of a
single bound value, it needs to be greater than 0 because 0 is used as
the lower bound.

Fixes gh-26628
4 years ago
Stephane Nicoll e9ed92a305 Polish 4 years ago
Stephane Nicoll 1f95989e85 Merge branch '2.4.x'
Closes gh-26735
4 years ago
Stephane Nicoll 363c43e315 Merge branch '2.3.x' into 2.4.x
Closes gh-26734
4 years ago
Stephane Nicoll 3f23b9265d Clarify when a connection pool is created for Redis
Closes gh-26733
4 years ago
Stephane Nicoll 7b490f003c Avoid dependency on Kotlin when depending on spring-security-config
Closes gh-26727
4 years ago
Stephane Nicoll 97c5a08ca5 Merge branch '2.4.x'
Closes gh-26725
4 years ago
Stephane Nicoll c8959180fe Merge branch '2.3.x' into 2.4.x
Closes gh-26724
4 years ago
Stephane Nicoll 7e4defbcba Properly guard LogbackLoggingSystem
Previously, LoggingSystem#get would chose Logback by the sole presence
of a class in logback-core, with the assumption that logback-classic is
also on the classpath. An app that only had the former would therefore
fail.

This commit updates the condition to check for a class in
logback-classic instead.

Closes gh-26711
4 years ago
Stephane Nicoll d0185e7531 Merge branch '2.4.x'
Closes gh-26717
4 years ago
Stephane Nicoll 897fd63faf Merge branch '2.3.x' into 2.4.x
Closes gh-26716
4 years ago
weixsun 4b3bf75a4c Remove redudant space
See gh-26713
4 years ago
Phillip Webb d3f0f04f05 Merge branch '2.4.x'
Closes gh-26703
4 years ago
Phillip Webb 49d3ecc2b2 Merge branch '2.3.x' into 2.4.x
Closes gh-26702
4 years ago
Phillip Webb 617f7b9587 Improve ImageName/ImageReference parse performance
Update `ImageName` and `ImageReference` to use distinct regex patterns
to parse specific parts of the value. Prior to this commit a single
regex pattern was used which could hang given certain input strings.

Fixes gh-23115
4 years ago
Madhura Bhave 54c3194164 Merge branch '2.4.x' into main
Closes gh-26701
4 years ago
Madhura Bhave 5314bda48d Merge branch '2.3.x' into 2.4.x
Closes gh-26700
4 years ago
Madhura Bhave f55e4c08f5 Add note about Kubernetes termination grace period
Closes gh-26469
4 years ago
Stephane Nicoll b8b0430139 Merge branch '2.4.x'
Closes gh-26697
4 years ago
Stephane Nicoll 7f5adb7e9d Merge branch '2.3.x' into 2.4.x
Closes gh-26696
4 years ago
Stephane Nicoll 454d72d9b2 Document spring.profiles.default in the reference guide
Closes gh-26592
4 years ago
Stephane Nicoll 67fe60ba8a Add missing static on JerseyInfrastructureConfiguration
Closes gh-26695
4 years ago
Phillip Webb 5258c26f90 Merge branch '2.4.x' 4 years ago
Phillip Webb 49c30854af Rename PRODUCTION_RUNTIME_CLASSPATH_NAME
Rename the now public constant for consistency with the JavaPlugin.

See gh-26686
4 years ago
Phillip Webb ac0c1b1456 Merge branch '2.4.x'
Closes gh-26687
4 years ago
Phillip Webb 1e0ae9d5e3 Make PRODUCTION_RUNTIME_CLASSPATH_NAME public
Change `SpringBootPlugin.PRODUCTION_RUNTIME_CLASSPATH_NAME` from package
private to public so that it can be accessed in user build scripts.

Fixes gh-26686
4 years ago
Phillip Webb 42865daca9 Merge branch '2.4.x' 4 years ago
Phillip Webb 8661f74f2e Revert "Test optional directories without sub-directories"
This reverts commit 3f858ed8a4
since the test already existed.
4 years ago
Phillip Webb 91eb37dd84 Merge branch '2.4.x'
Closes gh-26679
4 years ago
Phillip Webb 3f858ed8a4 Test optional directories without sub-directories
Add an additional test to ensure that optional wildcard
directory patterns do not fail.

See gh-26677
4 years ago
izeye 38b9a833bd Fix "Allow optional directories without sub-directories"
Fix the update to `resolvePatternEmptyDirectories` introduced in
commit 01dd68e29e which was incorrectly checking `isOptional`.

See gh-26677
4 years ago
Phillip Webb 1a10162777 Change state change logging to DEBUG
Update `ApplicationAvailabilityBean` so that state change logging is
at DEBUG rather than INFO.

Fixes gh-26624
4 years ago
Phillip Webb 78ac7b3861 Polish 4 years ago
Phillip Webb b6d31fb6a1 Use correct type for deriveFromProperties
Fix `DataSourceBuilder` so that the type used to access `deriveFrom`
properties is based on the actual instance type rather than the
user-defined type which could have been changed.

Fixes gh-26644
4 years ago
Scott Frederick eed620fc80 Allow `driverClassName` to be optional
Update `DataSourceBuilder` so that the `driverClassName` may be optional
and silently ignored if it set but the underlying type does not have
a getter/setter.

This restores Spring Boot 2.4 behavior.

Fixes gh-26631

Co-authored-by: Phillip Webb <pwebb@vmware.com>
4 years ago
Scott Frederick c679b4ccd6 Don't attempt to set null values
Update `DataSourceBuilder` so that setters are not longer called for
`null` values. This restores Spring Boot 2.4 behavior.

Fixes gh-26633

Co-authored-by: Phillip Webb <pwebb@vmware.com>
4 years ago
Scott Frederick a31e976ec6 Support fallback URL properties
Update `DataSourceBuilder` so that the url property attempts both
`getUrl()` / `setUrl(...)` and `getURL()`/`setURL(...)`.

Fixes gh-26647

Co-authored-by: Phillip Webb <pwebb@vmware.com>
4 years ago
Phillip Webb e55948456f Respect custom username/password properties
Fix a bug in `DataSourceInitializationConfiguration` that was stopping
custom username/password properties from being applied.

Fixes gh-26676
4 years ago
Scott Frederick 7d6093680d Polish 4 years ago
Stephane Nicoll e5ee1eb86f Merge branch '2.4.x'
See gh-26654
4 years ago
Stephane Nicoll 130261f0df Merge branch '2.3.x' into 2.4.x
See gh-26653
4 years ago
Stephane Nicoll 3fbf5eeb5b Document spring.profiles.default in the reference guide
Closes gh-26592
4 years ago
Phillip Webb 249c675fff Merge branch '2.4.x'
Closes gh-26672
4 years ago
Andy Wilkinson 01dd68e29e Allow optional directories without sub-directories
Update `StandardConfigDataLocationResolver` so that directory resources
are only required when the location is not optional.

Closes gh-26627

Co-authored-by: Phillip Webb <pwebb@vmware.com>
4 years ago
Stephane Nicoll 3c6bf14c16 Polish 4 years ago
Stephane Nicoll f3d4fdb9c4 Merge branch '2.4.x'
Closes gh-26655
4 years ago
Stephane Nicoll fe1e2319b2 Polish "Clarify Kotlin version requirements in documentation"
See gh-26421
4 years ago
Lovekesh Garg 944ba34556 Clarify Kotlin version requirements in documentation
See gh-26421
4 years ago
Stephane Nicoll d5b41e288f Merge branch '2.4.x'
Closes gh-26654
4 years ago
Stephane Nicoll 9ff372c915 Merge branch '2.3.x' into 2.4.x
Closes gh-26653
4 years ago
Stephane Nicoll b5ebf836e3 Document spring.profiles.default
Closes gh-26592
4 years ago
Madhura Bhave 4416859a81 Merge branch '2.4.x' into main 4 years ago
Madhura Bhave 4955c80da5 Remove test that is no long necessary 4 years ago
Madhura Bhave ae24d66af7 Merge branch '2.4.x' into main
Closes gh-26649
4 years ago
Madhura Bhave 8f2b180eb6 Use Sso Binding from SAML metadata uri if present
If the property is explicitly configured, that gets used.
If none are present, we rely on Spring Security's default value of
REDIRECT.

Fixes gh-26454
4 years ago
Stephane Nicoll cb7c3774a7 Merge branch '2.4.x'
Closes gh-26646
4 years ago
Stephane Nicoll 942691753d Merge branch '2.3.x' into 2.4.x
Closes gh-26645
4 years ago
dreis2211 01ee6190a2 Remove workaround for SUREFIRE-1679
See gh-26632
4 years ago
Oliver B. Fischer 11af8a816c Add link to Maven Git Commit Id Plugin
See gh-26635
4 years ago
Andy Wilkinson 7a7050879c Avoid eager initialization when configuring Data repository metrics
Fixes gh-26630
4 years ago
Phillip Webb 15042e2710 Merge branch '2.4.x'
Closes gh-26623
4 years ago
Phillip Webb 6bf069d9e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26622
4 years ago
Phillip Webb 004363ceaf Use WebMvcConfigurer to add resource handlers
Move resource handler auto-configuration logic back to the
`WebMvcConfigurer` so that they also get applied to child contexts.

Closes gh-25743
4 years ago
Phillip Webb ab958d2394 Include io.spring.asciidoctor.backends group
Update `repositories` declaration to include the
'io.spring.asciidoctor.backends' group.

See gh-26293
4 years ago
Phillip Webb f0896c2de6 Rework title anchors for maven docs
Closes gh-26617
4 years ago
Phillip Webb 1702c9fc3d Rework title anchors for gradle docs
Closes gh-26618
4 years ago
Phillip Webb f692b0e937 Rework title anchors for actuator docs
Closes gh-26615
4 years ago
Phillip Webb 2dbf39c738 Polish asciidoc formatting 4 years ago
Madhura Bhave a28072bab4 Merge branch '2.4.x' into main
Closes gh-26614
4 years ago
Madhura Bhave 27fee5fa95 Configure filter to process preflight requests for webflux actuator endpoints
Fixes gh-24541
4 years ago
Madhura Bhave 99ed291184 Merge branch '2.4.x' into main 4 years ago
Madhura Bhave 29d1e22b91 Fix rawtypes 4 years ago
Madhura Bhave 3ef9b7e634 Merge branch '2.4.x' into main
Closes gh-26612
4 years ago
Madhura Bhave 743ac4c394 Merge branch '2.3.x' into 2.4.x
Closes gh-26611
4 years ago
Madhura Bhave b26e842050 Configure CORS in default security configuration for MVC
Fixes gh-11987
4 years ago
Madhura Bhave 110c36e607 Merge branch '2.4.x' into main
Closes gh-26610
4 years ago
Madhura Bhave 80610fa250 Restore order of additional and active profiles
This commit restores the order of additional and active profiles
so that active profiles now take precedence.

Fixes gh-26189
4 years ago
Phillip Webb 8a3f835ffe Set Asciidoctor attribute-missing to warn
Closes gh-26590
4 years ago
Andy Wilkinson d39bb997f2 Upgrade to Spring Session 2021.0.0
Closes gh-26389
4 years ago
Andy Wilkinson 879f362c29 Merge branch '2.4.x'
Closes gh-26608
4 years ago
Andy Wilkinson 64e76badc2 Merge branch '2.3.x' into 2.4.x
Closes gh-26607
4 years ago
Andy Wilkinson b6e860b2d4 Prevent Jetty from delaying shutdown beyond grace period
Fixes gh-22689
4 years ago
Andy Wilkinson 66d087877d Merge branch '2.4.x'
Closes gh-26606
4 years ago
Andy Wilkinson 6874c42d3c Merge branch '2.3.x' into 2.4.x
Closes gh-26605
4 years ago
weixsun d2bdcddb5f Fix outdated defaults for Info endpoint
See gh-26591
4 years ago
Andy Wilkinson 2a89b11df3 Exclude SmartInitializingSingletones from lazy initialization
Fixes gh-26470
4 years ago
Stephane Nicoll b971ac8550 Upgrade to Netty 4.1.65.Final
Closes gh-26604
4 years ago
Stephane Nicoll 4caab742ca Upgrade to Jetty 9.4.41.v20210516
Closes gh-26603
4 years ago
Stephane Nicoll a5f9e3912f Upgrade to Spring WS 3.1.1
Closes gh-26390
4 years ago
Stephane Nicoll 6a45026097 Upgrade to Netty 4.1.65.Final
Closes gh-26602
4 years ago
Stephane Nicoll 8904649fcf Upgrade to Jetty 9.4.41.v20210516
Closes gh-26601
4 years ago
Stephane Nicoll 5edb788241 Upgrade to Netty 4.1.65.Final
Closes gh-26600
4 years ago
Stephane Nicoll 0d1b3fb078 Upgrade to Neo4j OGM 3.2.23
Closes gh-26599
4 years ago
Stephane Nicoll 22ec27dcd3 Upgrade to Json-smart 2.3.1
Closes gh-26598
4 years ago
Stephane Nicoll 32381ad61c Upgrade to Jetty 9.4.41.v20210516
Closes gh-26597
4 years ago
Stephane Nicoll e71b4aac7b Upgrade to Spring Batch 4.3.3
Closes gh-26392
4 years ago
Stephane Nicoll e5ab626638 Upgrade to Spring Batch 4.3.3
Closes gh-26391
4 years ago
Stephane Nicoll 7769e77775 Upgrade to Spring Batch 4.2.7
Closes gh-26426
4 years ago
Andy Wilkinson b9abcba778 Merge branch '2.4.x'
Closes gh-26596
4 years ago
Andy Wilkinson ff45e4c418 Merge branch '2.3.x' into 2.4.x
Closes gh-26595
4 years ago
Andy Wilkinson 936c31c7a7 Prevent metrics failures from adversely affecting web responses
Fixes gh-24151
4 years ago
Andy Wilkinson 55b507bccf Upgrade to Spring Integration 5.5.0
Closes gh-26388
4 years ago
Andy Wilkinson 04e3165c15 Upgrade to Spring Integration 5.4.7
Closes gh-26587
4 years ago
Phillip Webb 34b288e5fe Add prefix to appendix property anchor links
Refactor property appendix generator code so that the complete section
is generated and anchors follow the expected naming.

Closes gh-26375
4 years ago
Phillip Webb 86a5c90d20 Simplify anchor-rewrite.properties 4 years ago
Andy Wilkinson abd809366b Upgrade to Spring Asciidoctor Extensions 0.6.0
Closes gh-26306
4 years ago
Phillip Webb e08d4f1fe6 Move "Use Jedis Instead of Lettuce" How-to
See gh-26262
4 years ago
Phillip Webb 499a29c415 Move "Testcontainers" How-to
See gh-26262
4 years ago
Phillip Webb 72d50ed2f8 Move "Testing With Spring Security" How-to
See gh-26262
4 years ago
Phillip Webb 5f7e3d3952 Polish 4 years ago
Andy Wilkinson 88b383c6bb Polish "Update docs and internal dep mgmt following Spock 2.0's release"
See gh-26586
4 years ago
dreis2211 5a6c355397 Update docs and internal dep mgmt following Spock 2.0's release
See gh-26586
4 years ago
Andy Wilkinson 2edd06fb6e Start building against Spring Integration 5.4.7 snapshots
See gh-26587
4 years ago
Andy Wilkinson d8b0aadf3b Upgrade to Spring Security 5.5.0
Closes gh-26387
4 years ago
Andy Wilkinson 33a5c31fe3 Avoid duplicate crypto classes when depending on spring-security-core
See gh-26387
4 years ago
Stephane Nicoll 9dd9a2fa33 Upgrade to Spring AMQP 2.3.7
Closes gh-26384
4 years ago
Stephane Nicoll 56ba14ad2d Upgrade to Spring Kafka 2.7.1
Closes gh-26386
4 years ago
Stephane Nicoll 83ad93844b Upgrade to Spring AMQP 2.3.7
Closes gh-26383
4 years ago
Stephane Nicoll 2205024e9d Upgrade to Spring Kafka 2.6.8
Closes gh-26385
4 years ago
Stephane Nicoll 678916fb3d Upgrade to Spring Kafka 2.5.13
Closes gh-26429
4 years ago
Phillip Webb 5c28f8f6a8 Merge branch '2.4.x'
Closes gh-26585
4 years ago
Phillip Webb 0e3ef4071e Allow optional ConfigDataLocationResolver results
Update `ConfigData` so that it signal if is considered optional. This
update allows `ConfigDataLocationResolvers` to return results that
behave in the same way as `optional:` prefixed locations without the
user themselves needing to prefix the location string.

Closes gh-25894
4 years ago
Phillip Webb 0c8d819150 Merge branch '2.4.x'
Closes gh-26584
4 years ago
Phillip Webb 0699fdcc8a Polish 'Allow remote devtools access with Spring Security'
See gh-25868
4 years ago
Hatef Palizgar 9b2e13aace Allow remote devtools access with Spring Security
Update `ManagementWebSecurityAutoConfiguration` so that the
`managementSecurityFilterChain` bean has an explicit order.

Prior to this commit, the `managementSecurityFilterChain` would override
the `securityFilterChain` in `RemoteDevtoolsSecurityConfiguration` which
would prevent the remote devtools endpoint from being accessed.

See gh-25868
4 years ago
Phillip Webb ba0fe1edbd Merge branch '2.4.x'
Closes gh-26581
Closes gh-26582
Closes gh-26583
4 years ago
Madhura Bhave c45bb2bd95 Handle empty locations from patterns
Update `StandardConfigDataLocationResolver` to deal with patterns when
resolving empty directories. This update also fixes the handling of
mandatory pattern locations which would previously throw an exception.

The error message returned when a location with a pattern does not
contain any subdirectories has also been improved.

Fixes gh-26468
Fixes gh-26577
Fixes gh-26415
4 years ago
Phillip Webb 2bbad94910 Restore hasProgrammaticallySetProfiles code
Restore code lost on merge.

See gh-26580
4 years ago
Phillip Webb 634d27679a Merge branch '2.4.x'
Closes gh-26580
4 years ago
Madhura Bhave cfa26735d2 Merge programmatically set active profiles
Update `Profiles` so that any profiles set programmatically on the
`Environment` are merged with `spring.profiles.active` properties.

Fixes gh-26151

Co-authored-by: Phillip Webb <pwebb@vmware.com>
4 years ago
Andy Wilkinson 36b6235e86 Upgrade to Spring AMQP 2.2.17.RELEASE
Closes gh-26428
4 years ago
Stephane Nicoll e9174c1e3d Update copyright year of changed files
See gh-26478
4 years ago
weixsun 935199b6ba Polish AbstractServletWebServerFactory
See gh-26478
4 years ago
Andy Wilkinson d41fa13463 Merge branch '2.4.x'
Closes gh-26575
4 years ago
Andy Wilkinson 4eab9476a6 Polish "Detect use of spring.profiles.include as a YAML list"
See gh-26205
4 years ago
ChangYong 80ad6385f1 Detect use of spring.profiles.include as a YAML list
See gh-26205
4 years ago
Andy Wilkinson 4517f6057e Merge branch '2.4.x'
Closes gh-26573
4 years ago
Andy Wilkinson 1d5abf5af7 Merge branch '2.3.x' into 2.4.x
Closes gh-26572
4 years ago
Andy Wilkinson eecb7dd101 Remove stale jboss-transaction-spi dependencies
Closes gh-26569
4 years ago
Andy Wilkinson 513dd82bed Upgrade to Kotlin Coroutines 1.5.0
Closes gh-26568
4 years ago
Andy Wilkinson af506685be Upgrade to Thymeleaf Layout Dialect 2.5.3
Closes gh-26566
4 years ago
Andy Wilkinson 17506c7e13 Upgrade to Solr 8.8.2
Closes gh-26565
4 years ago
Andy Wilkinson 6d786ecfe1 Upgrade to SAAJ Impl 1.5.3
Closes gh-26564
4 years ago
Andy Wilkinson d3e8d1533f Upgrade to R2DBC Bom Arabba-SR10
Closes gh-26563
4 years ago
Andy Wilkinson b62a011643 Upgrade to Postgresql 42.2.20
Closes gh-26562
4 years ago
Andy Wilkinson f6d89fd940 Upgrade to Pooled JMS 1.2.2
Closes gh-26561
4 years ago
Andy Wilkinson ef89622a10 Upgrade to Netty tcNative 2.0.39.Final
Closes gh-26560
4 years ago
Andy Wilkinson 2d39269368 Upgrade to Netty 4.1.64.Final
Closes gh-26559
4 years ago
Andy Wilkinson c9814abe16 Upgrade to Neo4j Java Driver 4.2.5
Closes gh-26558
4 years ago
Andy Wilkinson 0e16c58ed6 Upgrade to MySQL 8.0.25
Closes gh-26557
4 years ago
Andy Wilkinson 0575f2f60a Upgrade to MariaDB 2.7.3
Closes gh-26556
4 years ago
Andy Wilkinson 27d599b9e2 Upgrade to Liquibase 4.3.5
Closes gh-26555
4 years ago
Andy Wilkinson 23c957a563 Upgrade to Lettuce 6.1.2.RELEASE
Closes gh-26554
4 years ago
Andy Wilkinson 4bbcc3edda Upgrade to Kafka 2.7.1
Closes gh-26552
4 years ago
Andy Wilkinson 4b132628a7 Upgrade to JUnit Jupiter 5.7.2
Closes gh-26551
4 years ago
Andy Wilkinson f1e4cc1c28 Upgrade to Json-smart 2.4.7
Closes gh-26550
4 years ago
Andy Wilkinson 7729755cd6 Upgrade to jOOQ 3.14.9
Closes gh-26549
4 years ago
Andy Wilkinson 875a31a70d Upgrade to Johnzon 1.2.11
Closes gh-26548
4 years ago
Andy Wilkinson 6f72007d77 Upgrade to Jetty 9.4.40.v20210413
Closes gh-26547
4 years ago
Andy Wilkinson ed316c43d5 Upgrade to Jetty Reactive HTTPClient 1.1.8
Closes gh-26546
4 years ago
Andy Wilkinson 416511bb98 Upgrade to Jedis 3.6.0
Closes gh-26545
4 years ago
Andy Wilkinson 0322a3931f Upgrade to JBoss Transaction SPI 7.6.1.Final
Closes gh-26544
4 years ago
Andy Wilkinson 2f4fbfdcf8 Upgrade to Janino 3.1.4
Closes gh-26543
4 years ago
Andy Wilkinson b7c8badfe8 Upgrade to Infinispan 12.1.3.Final
Closes gh-26542
4 years ago
Andy Wilkinson 23e02cada1 Upgrade to HttpCore5 5.1.1
Closes gh-26541
4 years ago
Andy Wilkinson a78e50bcc3 Upgrade to HttpClient5 5.0.4
Closes gh-26540
4 years ago
Andy Wilkinson 544abfd9ae Upgrade to Hibernate 5.4.31.Final
Closes gh-26539
4 years ago
Andy Wilkinson 93b385421d Upgrade to Hazelcast 4.1.3
Closes gh-26538
4 years ago
Andy Wilkinson 466a9e3421 Upgrade to Groovy 3.0.8
Closes gh-26537
4 years ago
Andy Wilkinson 53e178e1c4 Upgrade to Glassfish JAXB 2.3.4
Closes gh-26536
4 years ago
Andy Wilkinson 2a28f34717 Upgrade to Elasticsearch 7.12.1
Closes gh-26535
4 years ago
Andy Wilkinson 25f529a5f2 Upgrade to Ehcache3 3.9.3
Closes gh-26534
4 years ago
Andy Wilkinson 0bc37852a3 Upgrade to Ehcache 2.10.9.2
Closes gh-26533
4 years ago
Andy Wilkinson 3099866cf4 Upgrade to Dropwizard Metrics 4.1.21
Closes gh-26532
4 years ago
Andy Wilkinson 24d252e322 Upgrade to Couchbase Client 3.1.5
Closes gh-26531
4 years ago
Andy Wilkinson 78f7044097 Upgrade to Cassandra Driver 4.11.1
Closes gh-26530
4 years ago
Andy Wilkinson a27b34680e Upgrade to Caffeine 2.9.1
Closes gh-26529
4 years ago
Andy Wilkinson 9a981f0bc5 Upgrade to ActiveMQ 5.16.2
Closes gh-26528
4 years ago
Andy Wilkinson 7526ea860d Update upgrade policy following release of RC1
Closes gh-26527
4 years ago
Stephane Nicoll 582d7b46fd Merge branch '2.4.x'
Closes gh-26571
4 years ago
Stephane Nicoll ef093bc9c6 Merge branch '2.3.x' into 2.4.x
Closes gh-26570
4 years ago
Stephane Nicoll 306b6f6999 Configure SessionCookieConfig in MockServletWebServer
Closes gh-26479
4 years ago
Andy Wilkinson 4bf5ff8a68 Merge branch '2.4.x'
Closes gh-26526
4 years ago
Andy Wilkinson 2ef7d136ac Merge branch '2.3.x' into 2.4.x
Closes gh-26525
4 years ago
Andy Wilkinson ca85555fde Polish "Document use of module replacements to swap dependencies"
See gh-25944
4 years ago
Caleb Cushing f5b536164c Document use of module replacements to swap dependencies
See gh-25944

Signed-off-by: Caleb Cushing <xenoterracide@gmail.com>
4 years ago
Andy Wilkinson e317079446 Merge branch '2.4.x'
Closes gh-26524
4 years ago
Andy Wilkinson 49d362fd7f Merge branch '2.3.x' into 2.4.x
Closes gh-26523
4 years ago
weixsun 7f445630e4 Remove unnecessary semicolon
See gh-26446
4 years ago