Commit Graph

16801 Commits (930b1d6fc50b9197f1563a0a73085246d0cccdfc)

Author SHA1 Message Date
Scott Frederick cabfb98a89 Merge branch '2.7.x' 3 years ago
Scott Frederick a14f3ed200 Use a ConfigurationProperties class for JMX properties
Closes gh-30327
3 years ago
Scott Frederick e5a09b3b31 Apply unique-names consistently in JmxAutoConfiguration
Ensure that the `spring.jmx.unique-names` property is applied to the
auto-configured `MBeanExporter` as well as the `ObjectNamingStrategy`.

Fixes gh-29968
3 years ago
Stephane Nicoll e49de1f2fb Upgrade to Jackson Bom 2.13.2
Closes gh-30242
3 years ago
Stephane Nicoll 1169c6df16 Upgrade to Neo4j Java Driver 4.4.5
Closes gh-30326
3 years ago
Stephane Nicoll 704a2b7795 Add additional bomr checks 3 years ago
Stephane Nicoll af15a18e02 Upgrade to Tomcat 10.0.18
Closes gh-30320
3 years ago
Andy Wilkinson 12d9127d3b Merge branch '2.7.x' 3 years ago
Andy Wilkinson c2d7e21312 Merge branch '2.6.x' into 2.7.x
Closes gh-30322
3 years ago
Andy Wilkinson 26719a211b Merge branch '2.5.x' into 2.6.x
Closes gh-30321
3 years ago
Andy Wilkinson 1669062231 Apply server.tomcat.keep-alive-timeout to HTTP/2
Closes gh-30267
3 years ago
Stephane Nicoll 39b6f2bd7d Merge branch '2.7.x' 3 years ago
Stephane Nicoll 2ab0ce3ea7 Upgrade to Neo4j Java Driver 4.4.5
Closes gh-30303
3 years ago
Andy Wilkinson a1e972ebaa Update Spock for Groovy 4.0 compatibility
Closes gh-30318
3 years ago
Andy Wilkinson f3b312f0b4 Upgrade to Thymeleaf Layout Dialect 3.1.0
Closes gh-30312
3 years ago
Andy Wilkinson dd812a3f76 Upgrade to Groovy 4.0.1
Closes gh-30279
3 years ago
Andy Wilkinson 568cd687af Remove support for REST Assured until it supports Groovy 4.0
REST Assured does not work with Groovy 4.0 so support is being
temporarily removed again.

See gh-29543
3 years ago
Andy Wilkinson e60001fb16 Adapt to deprecations in Spring Data Redis
See gh-30200
3 years ago
Stephane Nicoll 2fbb36bd04 fixup! Upgrade to Flyway 8.5.4 3 years ago
Stephane Nicoll 1e55ef2f97 Upgrade to Versions Maven Plugin 2.10.0
Closes gh-30315
3 years ago
Stephane Nicoll e79073bee3 Upgrade to UnboundID LDAPSDK 6.0.4
Closes gh-30314
3 years ago
Stephane Nicoll 3d011fc2e6 Upgrade to Tomcat 9.0.60
Closes gh-30313
3 years ago
Stephane Nicoll 426f239d2c Upgrade to Spring Retry 1.3.2
Closes gh-30311
3 years ago
Stephane Nicoll 0946f28dcd Upgrade to SendGrid 4.9.0
Closes gh-30310
3 years ago
Stephane Nicoll c70be97fc4 Upgrade to Selenium HtmlUnit 3.59.0
Closes gh-30309
3 years ago
Stephane Nicoll 6487b809fe Upgrade to Rabbit Stream Client 0.5.0
Closes gh-30308
3 years ago
Stephane Nicoll 8b27263eee Upgrade to R2DBC Bom Borca-SR1
Closes gh-30307
3 years ago
Stephane Nicoll f129a733a4 Upgrade to Netty 4.1.75.Final
Closes gh-30306
3 years ago
Stephane Nicoll b0f6166e5e Upgrade to Logback 1.2.11
Closes gh-30305
3 years ago
Stephane Nicoll d8c231a1d1 Upgrade to Mockito 4.4.0
Closes gh-30302
3 years ago
Stephane Nicoll 717f8739c5 Upgrade to Maven Dependency Plugin 3.3.0
Closes gh-30301
3 years ago
Stephane Nicoll 0b20b99f6e Upgrade to Maven Compiler Plugin 3.10.1
Closes gh-30300
3 years ago
Stephane Nicoll f8a6efb15e Upgrade to Log4j2 2.17.2
Closes gh-30299
3 years ago
Stephane Nicoll 154195d9a2 Upgrade to Liquibase 4.9.0
Closes gh-30298
3 years ago
Stephane Nicoll aa39c5a012 Upgrade to Jackson Bom 2.13.2
Closes gh-30297
3 years ago
Stephane Nicoll 20dd6463a3 Upgrade to Infinispan 13.0.8.Final
Closes gh-30296
3 years ago
Stephane Nicoll fa6bcd5d6c Upgrade to HtmlUnit 2.59.0
Closes gh-30295
3 years ago
Stephane Nicoll d40465260d Upgrade to Hibernate Validator 6.2.3.Final
Closes gh-30294
3 years ago
Stephane Nicoll 3075794175 Upgrade to Hibernate 5.6.7.Final
Closes gh-30293
3 years ago
Stephane Nicoll 00cba28390 Upgrade to Hazelcast 5.1.1
Closes gh-30292
3 years ago
Stephane Nicoll 1c11ae8a7d Upgrade to Groovy 3.0.10
Closes gh-30291
3 years ago
Stephane Nicoll ca89dd58f4 Upgrade to Flyway 8.5.4
Closes gh-30290
3 years ago
Stephane Nicoll 41150f1ef4 Upgrade to Elasticsearch 7.17.1
Closes gh-30289
3 years ago
Stephane Nicoll bf477700f6 Upgrade to Ehcache3 3.10.0
Closes gh-30288
3 years ago
Stephane Nicoll d521a7bb1b Upgrade to Dropwizard Metrics 4.2.9
Closes gh-30287
3 years ago
Stephane Nicoll 046afae1aa Upgrade to Couchbase Client 3.2.6
Closes gh-30286
3 years ago
Stephane Nicoll 5b44ad15f7 Upgrade to Cassandra Driver 4.14.0
Closes gh-30285
3 years ago
Stephane Nicoll 8732ac708d Upgrade to Awaitility 4.2.0
Closes gh-30284
3 years ago
Andy Wilkinson f693d7dfad Merge branch '2.7.x' 3 years ago
Andy Wilkinson b787ea4802 Add property for media types of reactive Mustache views
Closes gh-28858
3 years ago
Andy Wilkinson 36f24cf6bb Merge branch '2.7.x' 3 years ago
Andy Wilkinson 3a5a748ec0 Rework Mustache properties to show which are Servlet-specific
Closes gh-30273
3 years ago
Andy Wilkinson 6625a77f64 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 2ba064c855 Merge branch '2.6.x' into 2.7.x
Closes gh-30277
3 years ago
Andy Wilkinson 3c117ca2d4 Merge branch '2.5.x' into 2.6.x
Closes gh-30276
3 years ago
Andy Wilkinson 2b75ea5fb8 Improve testing of spring.mustache.* properties
Closes gh-30274
3 years ago
Stephane Nicoll 3afda66be2 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 2631b0ce01 Merge branch '2.6.x' into 2.7.x
Closes gh-30275
3 years ago
Stephane Nicoll be34ad36b5 Restore WebSockets section in the reference guide
Closes gh-30231
3 years ago
Stephane Nicoll 92e5e91623 Start building against Spring Batch 5.0.0-M2 snapshots
See gh-30232
3 years ago
Stephane Nicoll 5c944bf5b8 Upgrade to Spring Framework 6.0.0-M3
Closes gh-29957
3 years ago
Moritz Halbritter 29746e1029 Upgrade to Micrometer 2.0.0-M3
Closes gh-29753
3 years ago
Stephane Nicoll 5c197ceae0 Upgrade to Spring Framework 5.3.17
Closes gh-30188
3 years ago
Stephane Nicoll c7e788bd91 Upgrade to Micrometer 1.8.4
Closes gh-30178
3 years ago
Stephane Nicoll 947fee1663 Upgrade to Spring Framework 5.3.17
Closes gh-30177
3 years ago
Stephane Nicoll 9824d40b14 Upgrade to Micrometer 1.7.10
Closes gh-30171
3 years ago
Stephane Nicoll 0bd50fedbc Upgrade to Spring Framework 5.3.17
Closes gh-30170
3 years ago
Andy Wilkinson 625ccc7c11 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 4b318a76fa Merge branch '2.6.x' into 2.7.x
Closes gh-30271
3 years ago
Andy Wilkinson 0facba1f88 Merge branch '2.5.x' into 2.6.x
Closes gh-30270
3 years ago
Andy Wilkinson f342cec5cd Relocate ConnectorStartFailureAnalyzer to remove package tangle
Closes gh-30268
3 years ago
Stephane Nicoll 1784fc19bb Adapt mock to API change 3 years ago
Andy Wilkinson f3f5a87af4 Merge branch '2.7.x' 3 years ago
Andy Wilkinson fee3b89b1b Merge branch '2.6.x' into 2.7.x
Closes gh-30257
3 years ago
Andy Wilkinson cdaafce614 Merge branch '2.5.x' into 2.6.x
Closes gh-30256
3 years ago
Andy Wilkinson 7f036e35fd Make MustacheViewResolvers conditional onspring.mustache.enabled
Closes gh-30250
3 years ago
Stephane Nicoll 626cfff940 Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll 8e7f7d3c76 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll b97a3ae07a Revert unnecessary suppress warnings
See https://github.com/spring-projects/spring-framework/issues/28079
3 years ago
Andy Wilkinson 09510db630 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 81383e552a Merge branch '2.6.x' into 2.7.x
Closes gh-30254
3 years ago
Andy Wilkinson 6bc000565d Merge branch '2.5.x' into 2.6.x
Closes gh-30253
3 years ago
Andy Wilkinson 0accc3d67d Convert MustacheAutoConfigurationTests to application context runner
Closes gh-30252
3 years ago
Andy Wilkinson 23b5a3f70e Merge branch '2.7.x' 3 years ago
Andy Wilkinson 2282f9cc88 Upgrade to Embedded Mongo 3.4.2
As part of the upgrade, the property for configuring features has
been removed as support for feature-aware versions has been removed
from Embedded Mongo. For advanced configuration where features were
specified, users should provide a MongodConfig bean instead.

Closes gh-29985
Closes gh-30219
3 years ago
Stephane Nicoll 9ccbfe52f8 Upgrade to Tomcat 9.0.60
Closes gh-30249
3 years ago
Stephane Nicoll 82bc28d530 Upgrade to Spring Retry 1.3.2
Closes gh-30248
3 years ago
Stephane Nicoll 82f4092cd4 Upgrade to Netty tcNative 2.0.51.Final
Closes gh-30247
3 years ago
Stephane Nicoll 28c8f16b78 Upgrade to Netty 4.1.75.Final
Closes gh-30246
3 years ago
Stephane Nicoll 7cf5dcd3f9 Upgrade to Logback 1.2.11
Closes gh-30245
3 years ago
Stephane Nicoll 8deab79cac Upgrade to Log4j2 2.17.2
Closes gh-30244
3 years ago
Stephane Nicoll 57d3a52301 Upgrade to Kafka 3.0.1
Closes gh-30243
3 years ago
Stephane Nicoll 1385c6af90 Upgrade to Hibernate Validator 6.2.3.Final
Closes gh-30241
3 years ago
Stephane Nicoll 230ebcbe88 Upgrade to Hibernate 5.6.6.Final
Closes gh-30240
3 years ago
Stephane Nicoll 8e016e8922 Upgrade to Groovy 3.0.10
Closes gh-30239
3 years ago
Stephane Nicoll 9a1f60131e Upgrade to Dropwizard Metrics 4.2.9
Closes gh-30238
3 years ago
Stephane Nicoll 8be87b19cf Upgrade to Couchbase Client 3.2.6
Closes gh-30237
3 years ago
Stephane Nicoll 59f4004fa6 Upgrade to Tomcat 9.0.60
Closes gh-30230
3 years ago
Stephane Nicoll 417a6792a0 Upgrade to Spring Retry 1.3.2
Closes gh-30229
3 years ago
Stephane Nicoll 58e0665ac8 Upgrade to Netty tcNative 2.0.51.Final
Closes gh-30228
3 years ago
Stephane Nicoll fc72be112c Upgrade to Netty 4.1.75.Final
Closes gh-30227
3 years ago
Stephane Nicoll a98f7f273c Upgrade to Logback 1.2.11
Closes gh-30226
3 years ago
Stephane Nicoll 5c7a43e9d3 Upgrade to Log4j2 2.17.2
Closes gh-30225
3 years ago
Stephane Nicoll 0229706440 Upgrade to Hibernate Validator 6.2.3.Final
Closes gh-30224
3 years ago
Stephane Nicoll 17e07c22ca Upgrade to Groovy 3.0.10
Closes gh-30223
3 years ago
Stephane Nicoll 9bf18ead23 Upgrade to Dropwizard Metrics 4.1.31
Closes gh-30222
3 years ago
Stephane Nicoll 4d4d5348ab Upgrade to Couchbase Client 3.1.8
Closes gh-30221
3 years ago
Andy Wilkinson 05130d9eb0 Merge branch '2.7.x' 3 years ago
Andy Wilkinson e97fa0ae52 Merge branch '2.6.x' into 2.7.x
See gh-30167
3 years ago
Andy Wilkinson 05c12737fe Merge branch '2.5.x' into 2.6.x
See gh-30166
3 years ago
Andy Wilkinson 3ab688ef82 Add missing task dependencies
See gh-29406
3 years ago
Andy Wilkinson 1dadc77346 Document that the minimum supported version of Kotlin is now 1.6
Closes gh-30197
3 years ago
Andy Wilkinson 98678ed415 Merge branch '2.7.x' 3 years ago
Andy Wilkinson b4cbcd797e Merge branch '2.6.x' into 2.7.x
Closes gh-30218
3 years ago
Andy Wilkinson c4d2602a3e Merge branch '2.5.x' into 2.6.x
Closes gh-30217
3 years ago
Octavia Togami 264a6888a9 Refactor code to avoid using internal LazyPublishArtifact
See gh-30209
3 years ago
Stephane Nicoll 0e07eb2393 Remove deprecated Spring Kafka's only-log-record-metadata property
See gh-30089
3 years ago
Andy Wilkinson 9bf77b1a06 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 4935c11a07 Merge branch '2.6.x' into 2.7.x
Closes gh-30215
3 years ago
Andy Wilkinson 464fce621d Merge branch '2.5.x' into 2.6.x
Closes gh-30213
3 years ago
Andy Wilkinson f11ddb4bd7 Prevent eager creation of bootWar task
Previously, querying the artifact's extension in
SinglePublishedArtifact would result in eager creation of the task
that creates the artifact. Typically, this is the bootWar task.

Instead of querying the extension, this commit reworks
SinglePublishedArtifact and its callers to call separate methods for
jar and war artifacts so that the extension check is no longer
required.

Tests have been added to ensure that running help does not trigger
any unexpected task creation. The tests' assertions tolerate some
variation in behavior that depend on the version of Gradle and
whether the configuration cache is enabled.

Closes gh-30211
3 years ago
Stephane Nicoll d757328ce3 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 4ac2309d9f Upgrade to Reactor 2020.0.17
Closes gh-30187
3 years ago
Stephane Nicoll 8158ce7d8b Upgrade to Reactor 2020.0.17
Closes gh-30176
3 years ago
Stephane Nicoll 75693c1a00 Upgrade to Reactor 2020.0.17
Closes gh-30169
3 years ago
Stephane Nicoll 253e6976d5 Start building against Spring Integration 6.0.0-M2 snapshots
See gh-30204
3 years ago
Stephane Nicoll 22d7f536b5 Start building against Spring Ws 4.0.0-M2 snapshots
See gh-30203
3 years ago
Stephane Nicoll acfd50fce9 Start building against Spring Security 6.0.0-M2 snapshots
See gh-30202
3 years ago
Stephane Nicoll b48fae696a Start building against Spring AMQP 3.0.0-M2 snapshots
See gh-30201
3 years ago
Stephane Nicoll 24158a7ab0 Start building against Spring Data 2022.0.0-M2 snapshots
See gh-30200
3 years ago
Stephane Nicoll 7c8b4b6914 Restore Kafka tests 3 years ago
Stephane Nicoll bb92019ac1 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 01a7cfa979 Start building against Spring Integration 5.5.10 snapshots
See gh-30193
3 years ago
Stephane Nicoll ddf778e1cc Start building against Spring WS 3.1.3 snapshots
See gh-30192
3 years ago
Stephane Nicoll 85d4a07038 Start building against Spring Security 5.7.0-M3 snapshots
See gh-30191
3 years ago
Stephane Nicoll 695685996a Start building against Spring Kafka 2.8.4 snapshots
See gh-30190
3 years ago
Stephane Nicoll 2da206d2b9 Start building against Spring Integration 5.5.10 snapshots
See gh-30183
3 years ago
Stephane Nicoll 15c2eb9c9c Start building against Spring WS 3.1.3 snapshots
See gh-30182
3 years ago
Stephane Nicoll 3717c4c883 Start building against Spring Kafka 2.8.4 snapshots
See gh-30181
3 years ago
Stephane Nicoll 4ca6cffd87 Start building against Spring AMQP 2.4.3 snapshots
See gh-30189
3 years ago
Stephane Nicoll 6c1e194dd4 Start building against Spring Data 2021.2.0-M4 snapshots
See gh-30185
3 years ago
Stephane Nicoll 6baa248228 Start building against Spring Framework 5.3.17 snapshots
See gh-30188
3 years ago
Stephane Nicoll 001bc04c8c Start building against Reactor 2020.0.17 snapshots
See gh-30187
3 years ago
Stephane Nicoll 31fb515d16 Start building against Spring AMQP 2.4.3 snapshots
See gh-30180
3 years ago
Stephane Nicoll 64d706026d Start building against Spring Data 2021.1.3 snapshots
See gh-30179
3 years ago
Stephane Nicoll 33ec810b2e Start building against Micrometer 1.8.4 snapshots
See gh-30178
3 years ago
Stephane Nicoll 71e6a836a6 Start building against Spring Framework 5.3.17 snapshots
See gh-30177
3 years ago
Stephane Nicoll 2d1f5d3bc1 Start building against Reactor 2020.0.17 snapshots
See gh-30176
3 years ago
Scott Frederick 377b13c048 Merge branch '2.7.x' 3 years ago
Scott Frederick de321b00b7 Support podman for building images
Closes gh-30196
3 years ago
Scott Frederick 5e07db7d21 Merge branch '2.7.x' 3 years ago
Scott Frederick 7ad538cd84 Add option to use configured Docker host in builder
This commit adds support for a `docker.bindHostToBuilder` option in
the Maven and Gradle image building goal and task.

Fixes gh-29384
3 years ago
Scott Frederick 040afdeafe Merge branch '2.7.x' 3 years ago
Scott Frederick 93622d18eb Merge branch '2.6.x' into 2.7.x
Closes gh-30195
3 years ago
Scott Frederick 35a9a7fee2 Ignore deprecation warnings in Paketo system tests
Closes gh-30194
3 years ago
Stephane Nicoll 43ba80d431 Start building against Spring Integration 5.5.10 snapshots
See gh-30175
3 years ago
Stephane Nicoll 9ed4086ac2 Start building against Spring WS 3.1.3 snapshots
See gh-30174
3 years ago
Stephane Nicoll 07b6269a69 Start building against Spring AMQP 2.3.15 snapshots
See gh-30173
3 years ago
Stephane Nicoll e391215643 Start building against Spring Data 2021.0.10 snapshots
See gh-30172
3 years ago
Stephane Nicoll c55f0a1eac Start building against Micrometer 1.7.10 snapshots
See gh-30171
3 years ago
Stephane Nicoll 2620710480 Start building against Spring Framework 5.3.17 snapshots
See gh-30170
3 years ago
Stephane Nicoll d14d0c3f04 Start building against Reactor 2020.0.17 snapshots
See gh-30169
3 years ago
Andy Wilkinson a2ecd600f8 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 1c19995db7 Merge branch '2.6.x' into 2.7.x
Closes gh-30165
3 years ago
Andy Wilkinson 6bbf3aff0e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
3 years ago
Andy Wilkinson eef89c6c35 Increase tests' Cassandra timeouts to 60s
Closes gh-30163
3 years ago
Andy Wilkinson 5736f5401b Merge branch '2.7.x' 3 years ago
Andy Wilkinson c0a72bf5ea Merge branch '2.6.x' into 2.7.x
Closes gh-30167
3 years ago
Andy Wilkinson 4c1d1a6a69 Merge branch '2.5.x' into 2.6.x
Closes gh-30166
3 years ago
Andy Wilkinson cced7edd9c Document Devtools' property defaults directly in reference docs
Closes gh-29406
3 years ago
Andy Wilkinson f97bf544bf Polish 3 years ago
Andy Wilkinson faf7a35425 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 6494a9f08a Merge branch '2.6.x' into 2.7.x
Closes gh-30165
3 years ago
Andy Wilkinson 7c3c5d3d3e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
3 years ago
Andy Wilkinson bbdef2b026 Increase timeouts in tests that use Cassandra
Closes gh-30163
3 years ago
Andy Wilkinson 14128ffc27 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 085fb0766f Merge branch '2.6.x' into 2.7.x
Closes gh-30162
3 years ago
Andy Wilkinson 0958498a47 Merge branch '2.5.x' into 2.6.x
Closes gh-30161
3 years ago
Andy Wilkinson 6eacc07de0 Fix handling of Flux responses from Actuator endpoints
Closes gh-30095
3 years ago
Andy Wilkinson ab74bfcf65 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 9075849143 Upgrade to Hazelcast 5.1
Closes gh-30154
3 years ago
Madhura Bhave 44f71a46aa Merge branch '2.7.x' into main 3 years ago
Madhura Bhave 24c48f0b43 Merge branch '2.6.x' into 2.7.x
Closes gh-30150
3 years ago
Madhura Bhave bdcc2509f5 Merge branch '2.5.x' into 2.6.x
Closes gh-30149
3 years ago
Madhura Bhave d0883ba6ef Document the WebSocket-related exclusions that are required to use Jetty 10
Closes gh-29275
3 years ago
Andy Wilkinson 2600bf4719 Merge branch '2.6.x' into 2.7.x
Closes gh-30142
3 years ago
Andy Wilkinson 382c6972ec Merge branch '2.5.x' into 2.6.x
Closes gh-30141
3 years ago
Andy Wilkinson 5264fb3d1e Test our Gradle Plugin against Gradle 7.4.1
Closes gh-30139
3 years ago
Andy Wilkinson abcc246a38 Polish 3 years ago
Andy Wilkinson e9d2ec507e Merge branch '2.7.x' 3 years ago
Andy Wilkinson f5ca568014 Remove versions less than 17 from JavaVersion enum
Closes gh-29503
3 years ago
Andy Wilkinson 813c2a5b1e Merge branch '2.6.x' into 2.7.x
Closes gh-30135
3 years ago
Andy Wilkinson 3cb1629f45 Merge branch '2.5.x' into 2.6.x
Closes gh-30134
3 years ago
Andy Wilkinson da1eb25e4b Remove redundant JRE-based enabled and disabled annotations from tests
Closes gh-29693
3 years ago
Andy Wilkinson a031c0c659 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 881f2788ae Merge branch '2.6.x' into 2.7.x
Closes gh-30133
3 years ago
Andy Wilkinson b1be6ac271 Merge branch '2.5.x' into 2.6.x
Closes gh-30132
3 years ago
Andy Wilkinson 314acd3407 Add EIGHTEEN to JavaVersion
Closes gh-29524
3 years ago
Andy Wilkinson d552f49128 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 83de1995c7 Merge branch '2.6.x' into 2.7.x
Closes gh-30130
3 years ago