Commit Graph

3237 Commits

Author SHA1 Message Date
Johnny Lim 78b43279a7 Polish
See gh-33455
2022-12-05 11:14:38 +01:00
Johnny Lim 90589fd6d4 Polish
See gh-33384
2022-12-01 11:32:39 +01:00
Moritz Halbritter 351084ea06 Document that native-maven-plugin is required for native images
Closes gh-33422
2022-11-30 15:03:10 +01:00
Moritz Halbritter 8626bdc05b Merge branch '2.7.x' 2022-11-29 16:27:45 +01:00
Moritz Halbritter e755f5107e Fix formatting 2022-11-29 16:27:26 +01:00
Moritz Halbritter 41f6d54020 Merge branch '2.7.x'
Closes gh-33410
2022-11-29 16:22:57 +01:00
Moritz Halbritter 20d51a128b Clarify that shutdown endpoint only works in jar packaging
Closes gh-17398
2022-11-29 16:21:24 +01:00
Brian Clozel d48ab37505 Reinstate GraphQL testing documentation
Closes gh-33407
2022-11-29 14:15:36 +01:00
Andy Wilkinson 92415c996a Fix formatting of NEVER's description
Closes gh-33398
2022-11-28 14:17:03 +00:00
Moritz Halbritter 012e13527a Fix typo in documentation 2022-11-28 13:39:24 +01:00
Moritz Halbritter 39aaab082b Polish "Document observation for R2DBC"
See gh-33335
2022-11-24 09:19:36 +01:00
Tadaya Tsuyukubo 9ddad34f42 Document observation for R2DBC
Adds a link to the R2DBC observation repo in documentation.

See gh-33335
2022-11-24 09:17:32 +01:00
Moritz Halbritter 26db0c7120 Merge branch '2.7.x' 2022-11-23 17:25:07 +01:00
Moritz Halbritter 2170941cf6 Update Kotlin example for Tomcat connector customization
See gh-33331
2022-11-23 17:10:36 +01:00
Moritz Halbritter 9af2a5712c Merge branch '2.6.x' into 2.7.x
Closes gh-33331
2022-11-23 17:01:19 +01:00
Moritz Halbritter b00f4f926a Create a HTTP connector in the custom tomcat connector example
Closes gh-28707
2022-11-23 17:00:08 +01:00
Moritz Halbritter d9aea476b4 Merge branch '2.7.x'
Closes gh-33327
2022-11-23 14:23:24 +01:00
Moritz Halbritter 1da3a9d636 Merge branch '2.6.x' into 2.7.x
Closes gh-33326
2022-11-23 14:23:08 +01:00
Moritz Halbritter ae8ec86486 Clarify startup probe in actuator documentation
Closes gh-28432
2022-11-23 14:21:51 +01:00
Brian Clozel 07766c436c Apply user-provided ObservationConventions in auto-configurations
Prior to this commit, we would advise developers, as migration path from
Spring Boot 2.0-x metrics, to create `GlobalObservationConvention` beans
for the observations they want to customize (observation name or key
values).

`GlobalObservationConvention` are currently applied **in addition** to
the chosen convention in some cases, so this does not work well with
this migration path.

Instead, instrumentations always provide a default convention but also a
way to configure a custom convention for their observations. Spring Boot
should inject custom convention beans in the relevant
auto-configurations.

Fixes gh-33285
2022-11-22 20:44:05 +01:00
Moritz Halbritter 369424853b Update links to GraalVM page on wiki 2022-11-22 14:39:57 +01:00
Andy Wilkinson cb14089d24 Align reference docs with @Timed changes
Closes gh-33282
2022-11-21 14:14:28 +00:00
Andy Wilkinson 4100561b3d Align docs with tags provider and contributor changes
Closes gh-33281
2022-11-21 13:58:27 +00:00
Andy Wilkinson 1f7da3e4eb Merge branch '2.7.x'
Closes gh-33266
2022-11-18 16:29:25 +00:00
Andy Wilkinson 77cb05e804 Merge branch '2.6.x' into 2.7.x
Closes gh-33265
2022-11-18 16:29:11 +00:00
Andy Wilkinson ec467402b3 Link to Micrometer's documentation on @Timed
Closes gh-33264
2022-11-18 16:28:28 +00:00
Moritz Halbritter e9429b4652 Merge branch '2.7.x'
Closes gh-33260
2022-11-18 14:54:38 +01:00
Moritz Halbritter 2cee6a88e3 Merge branch '2.6.x' into 2.7.x
Closes gh-33259
2022-11-18 14:54:18 +01:00
Moritz Halbritter acb5491b79 Fix section links to not include .html suffix
Closes gh-33206
2022-11-18 14:53:44 +01:00
Moritz Halbritter edb0ee219d Merge branch '2.7.x'
Closes gh-33258
2022-11-18 14:39:19 +01:00
Moritz Halbritter b72b70f0ba Merge branch '2.6.x' into 2.7.x
Closes gh-33257
2022-11-18 14:35:39 +01:00
Moritz Halbritter d05e792157 Clarify spring.cache.type=hazelcast in the documentation
Closes gh-33245
2022-11-18 14:30:49 +01:00
Vedran Pavic ca72f322d6 Fix Spring Security filter dispatcher types related docs
See gh-33252
2022-11-18 12:52:07 +00:00
Moritz Halbritter 517ec654ed Document @NestedConstructorBinding in all cases
This covers Kotlin data classes, constructor injection and records.

Closes gh-33235
2022-11-18 11:43:12 +01:00
Moritz Halbritter 5a88468c09 Refine example to show @NestedConfigurationProperty usage
Closes gh-33239
2022-11-18 10:25:30 +01:00
Moritz Halbritter 5c10ae2f0b Revert "Remove unneeded NestedConfigurationProperty"
This reverts commit 8048e2d6c2.
2022-11-18 10:23:09 +01:00
Moritz Halbritter 8048e2d6c2 Remove unneeded NestedConfigurationProperty
Closes gh-33239
2022-11-18 09:45:55 +01:00
Moritz Halbritter b7de4020cb Mention @RegisterReflectionForBinding in the docs
Closes gh-32903
2022-11-18 09:39:41 +01:00
Andy Wilkinson 421f2fac67 Fail fast when constructor bound and not compiled with -parameters
Closes gh-33182
2022-11-16 21:00:55 +00:00
Johnny Lim 6027508cf7 Polish
See gh-33108
2022-11-16 10:00:36 +01:00
dreis2211 3b496766da Fix broken links in docs
See gh-33209
2022-11-16 08:24:16 +01:00
Stephane Nicoll 731797ed84 Merge branch '2.7.x'
Closes gh-33214
2022-11-16 08:19:26 +01:00
Stephane Nicoll 2fa1cc74ab Merge branch '2.6.x' into 2.7.x
Closes gh-33213
2022-11-16 08:18:48 +01:00
Stephane Nicoll 4d6f956b24 Fix summary of "Core Features" section
Closes gh-33207
2022-11-16 08:18:08 +01:00
Sébastien Deleuze 88cf2bbae9 Remove outdated native image documentation
See gh-33109
2022-11-11 18:30:11 +01:00
Phillip Webb 954ed3e15e Merge branch '2.7.x'
Closes gh-33102
2022-11-10 11:12:34 -08:00
Phillip Webb 9193e527cc Merge branch '2.6.x' into 2.7.x
Closes gh-33101
2022-11-10 11:12:25 -08:00
67 e55e23482a Fix kafka streams start description typo in documentation
See gh-33098
2022-11-10 11:11:13 -08:00
Scott Frederick a53141f8a4 Fix JMX exposure default in config metadata and docs
Fixes gh-33072
2022-11-09 14:56:44 -06:00
Johnny Lim ea4f22684d Polish Log4j2 changes
See gh-32742
2022-11-08 13:27:01 +00:00
Andy Wilkinson 1481676b54 Merge branch '2.7.x'
Closes gh-33069
2022-11-08 13:15:02 +00:00
Andy Wilkinson bb141ffc09 Merge branch '2.6.x' into 2.7.x
Closes gh-33068
2022-11-08 13:14:30 +00:00
EricGao888 569e752159 Fix a minor bug in an example in oauth2 doc
See gh-32931
2022-11-08 13:14:06 +00:00
Andy Wilkinson 6d1fca10a3 Polish "Remove Sleuth references in favor of Micrometer Tracing"
See gh-32994
2022-11-08 12:36:04 +00:00
Toshiaki Maki bf4c367d7e Remove Sleuth references in favor of Micrometer Tracing
See gh-32994
2022-11-08 12:33:51 +00:00
Andy Wilkinson 5a299dd501 Correct coordinates of Artemis' server artifact
Closes gh-33065
2022-11-08 12:31:08 +00:00
Andy Wilkinson df2445a6be Update docs now that GraalVM 22.3 is fully available
Closes gh-32813
2022-11-08 12:28:14 +00:00
Phillip Webb 2c193e7736 Remove legacy cookie processor documentation
Remove legacy processor documentation since support will be removed
in Tomcat 10.1.

Closes gh-33021
2022-11-05 18:50:33 -07:00
Moritz Halbritter 5d1ff17a0a Add Micrometer Observability documentation
Closes gh-32833
Closes gh-32912
2022-10-31 09:47:16 +01:00
Phillip Webb 9856286a2d Refine actuator httpexhanges naming
See gh-32885
2022-10-28 12:50:59 -07:00
Phillip Webb 3e50836b1a Rename httptrace endpoint and related classes to httpexchanges
Rename `/actuator/httptrace` to `/actuator/httpexchanges` to better
describe its purpose and to remove confusion with distribute tracing.

This change also takes the opportunity to improve the code by making
the `HttpExchange` class (previously `HttpTrace`) fully immutable.

Closes gh-32885

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
2022-10-27 16:34:42 -07:00
Andy Wilkinson 67e4ac4f1e Remove stale reference to MetricsWebFilter from the docs
Closes gh-32909
2022-10-27 16:56:34 +01:00
Moritz Halbritter 40e2d0b8cd Remove mention of the Infinispan Spring Boot starter
The starter is not yet Spring Boot 3 compatible.

Closes gh-32896
2022-10-27 16:48:34 +02:00
Phillip Webb a59b6cb1f3 Polish 2022-10-25 21:56:53 -07:00
Phillip Webb 4be3218cb6 Merge branch '2.7.x' 2022-10-25 15:48:26 -07:00
Moritz Halbritter 605dd3d4bd Polish docs 2022-10-24 11:01:30 +02:00
Moritz Halbritter ff6d9aa881 Polish "Add micrometer tracing documentation" 2022-10-21 14:51:19 +02:00
Moritz Halbritter e999513838 Add micrometer tracing documentation
Closes gh-30658
2022-10-21 10:04:40 +02:00
Scott Frederick 072ce5c151 Fix versions in documentation links
Fixes gh-32772
2022-10-20 14:59:14 -05:00
Scott Frederick bdedae21c0 Polish native image documentation
See gh-32582
2022-10-20 11:45:10 -05:00
Stephane Nicoll 010891a3c6 Merge branch '2.7.x'
Closes gh-32821
2022-10-20 16:43:25 +02:00
Stephane Nicoll 7bd9754ce1 Merge branch '2.6.x' into 2.7.x
Closes gh-32820
2022-10-20 16:43:14 +02:00
James Seung Hyun Son 5e0a67ac66 Fix typos in logging.adoc
See gh-32812
2022-10-20 16:41:24 +02:00
Stephane Nicoll 74a8eb7160 Merge branch '2.7.x'
Closes gh-32819
2022-10-20 16:40:30 +02:00
Stephane Nicoll 13691f27bd Merge branch '2.6.x' into 2.7.x
Closes gh-32818
2022-10-20 16:37:57 +02:00
Stephane Nicoll 4d7cb7144e Upgrade copyright year of changed files
See gh-32644
2022-10-20 16:35:55 +02:00
Ada-Claire c5a1944267 Harmonize ConfigurationProperties code samples
Rename the SomeProperties class so that it is consistent with other
examples given within the Type-safe Configuration Properties. This
ensures that readers can intuitively draw the conclusion that the
MyProperties class is annotated with ConfigurationProperties.

See gh-32644
2022-10-20 16:35:18 +02:00
Moritz Halbritter 1635f61368 Update GraalVM requirement to 22.3
See gh-32813
2022-10-20 10:36:42 +02:00
Phillip Webb 73a34b6c0a Fix checkstyle issues
See gh-32582
2022-10-20 00:09:07 -07:00
Phillip Webb fb736e8427 Add native image reference documentation
Update reference documentation with a new "native image" section.

This commit includes some work derived from the "Spring Native"
project documentation written by Andy Clement, Sébastien Deleuze,
Filip Hanik, Dave Syer, Esteban Ginez, Jay Bryant, Brian Clozel,
Stéphane Nicoll, and Josh Long.

Closes gh-32582

Co-authored-by: Moritz Halbritter <mkammerer@vmware.com>
2022-10-19 23:46:21 -07:00
Phillip Webb 0219b222c2 Merge branch '2.7.x' 2022-10-19 22:03:18 -07:00
Phillip Webb d3750c4991 Merge branch '2.6.x' into 2.7.x 2022-10-19 22:01:13 -07:00
Phillip Webb c416c17fe8 Polish documentation title case 2022-10-19 21:53:21 -07:00
Madhura Bhave ce3c933f77 Adapt to Spring Security changes
Closes gh-32604
2022-10-19 11:46:27 -07:00
Brian Clozel b2fe807d47 Move MVC metrics to Observation auto-configuration
This commit moves the entire Metrics auto-configuration for Spring MVC
to the new `Observation` API and the instrumentation contributed in
Spring Framework.

Closes gh-32538
2022-10-19 19:33:31 +02:00
Phillip Webb 43a44006c9 Update getting started documentation to use @SpringBootApplication
Closes gh-32780
2022-10-18 20:45:23 -07:00
Phillip Webb 8dadf86f93 Merge branch '2.7.x'
Closes gh-32778
2022-10-18 17:15:03 -07:00
Phillip Webb fcaac2b343 Merge branch '2.6.x' into 2.7.x
Closes gh-32777
2022-10-18 17:14:48 -07:00
Guirong Hu 33e379c4a2 Use exclamation character for the document separator prefix
See gh-32521
2022-10-18 17:07:51 -07:00
Phillip Webb cb48674536 Switch Java versions used in documentation
See gh-32746
2022-10-18 13:28:29 -07:00
Phillip Webb 7d03a201c0 Switch Java version displayed in documentation
Closes gh-32746
2022-10-18 11:48:12 -07:00
Phillip Webb 76ef540716 Merge branch '2.7.x' 2022-10-15 14:19:18 -07:00
Phillip Webb 0f4a978731 Merge branch '2.6.x' into 2.7.x 2022-10-15 14:19:06 -07:00
Phillip Webb 6641a98913 Improve the phrasing around property source ordering 2022-10-15 14:18:49 -07:00
Phillip Webb 029aab6b58 Document Log4j2 extensions
See gh-32578
2022-10-14 10:14:43 -07:00
Emil ea654b42fa Fix typo "Elastixsearch"
See gh-32656
2022-10-12 12:35:23 +01:00
Johnny Lim 73fd760137 Polish HTTP client observability changes
See gh-32484
See gh-32518

Closes gh-32636
2022-10-07 19:05:14 +02:00
Brian Clozel 23a9818e0d Auto-configure ProblemDetails support
This commit auto-configures ProblemDetails support for both Spring MVC
and Spring WebFlux, contributing a `@ControllerAdvice` annotated
`ResponseEntityExceptionHandler` bean if the
`spring.mvc.problemdetails.enabled` or
`spring.webflux.problemdetails.enabled` properties are set to `true`.

Closes gh-32634
2022-10-07 17:23:12 +02:00
Brian Clozel d25fc73dae Upgrade to Neo4J Java Driver 5.0.0
Closes gh-32620
2022-10-06 19:46:31 +02:00
Andy Wilkinson 4f86f685c5 Reinstate support for Infinispan
Closes gh-32556
2022-10-04 11:32:56 +01:00
Andy Wilkinson 51df7813a5 Remove code deprecated in 2.x and add since and forRemoval attributes
Closes gh-32548
Closes gh-32549
2022-09-30 14:39:05 +01:00
Brian Clozel 7f7ecdc7ac Fix documentation build
See gh-32518
2022-09-30 12:18:41 +02:00
Brian Clozel a0735eb3fb Migrate remaining usage of httpclient API
This commit migrates our remaining usage of the httpclient 4.x to use
instead httpclient5, now that the 4.x support has been removed in
`RestTemplate`.

Closes gh-32461
2022-09-29 18:55:42 +02:00
Brian Clozel 5fb2a50ad0 Adapt build dependencies to httpclient5
As htttpclient 4.x is not supported anymore by `RestTemplate`, this
commit changes such dependencies to httpclient5 instead. In some cases,
the httpclient 4.x was transitively brought by a non-Spring dependency.

See gh-32461
2022-09-29 18:55:41 +02:00
Brian Clozel b325edbc55 Polish
See gh-32484
2022-09-27 22:45:46 +02:00
Stephane Nicoll fcafd2abdb Merge branch '2.7.x'
Closes gh-32516
2022-09-27 09:00:57 +02:00
Stephane Nicoll cb191dfec2 Merge branch '2.6.x' into 2.7.x
Closes gh-32515
2022-09-27 08:59:11 +02:00
heqiang 5db6cc1cba Remove redundant @ExtendWith(SpringExtension.class) for sample
See gh-32476
2022-09-27 08:49:46 +02:00
Andy Wilkinson 9d30de9966 Exclude all tools projects from the aggregated javadoc
Closes gh-31955
2022-09-23 16:44:57 +01:00
Andy Wilkinson f67db3d9ad Move spring-boot-cli into spring-boot-tools
Closes gh-32492
2022-09-23 16:44:57 +01:00
Vedran Pavic 230f2cda84 Migrate to AuthorizationFilter in Spring Security auto-config
This commit updates Servlet based Spring Security auto-configuration
to use AuthorizationFilter, which is intended to supersede
FilterSecurityInterceptor.

See gh-31255
2022-09-22 13:53:54 +01:00
Scott Frederick f9c341c75a Revert "Generate the AutoConfiguration.imports file from annotations"
This reverts commit da4de7d67d.
2022-09-21 14:50:15 -05:00
Brian Clozel 56dcae8a3c Merge branch '2.7.x'
Closes gh-32471
2022-09-21 21:11:29 +02:00
Brian Clozel 8f9323d66c Document "classpath:*" location for GraphQL Schemas
This commit mentions the `"classpath*:graphql/**` schema location in
case the application needs to find schemas across multiple classpath
roots, for example across multiple modules.

Closes gh-31772
2022-09-21 21:09:22 +02:00
Andy Wilkinson f731279fef Merge branch '2.7.x'
Closes gh-32403
2022-09-16 11:39:25 +01:00
Andy Wilkinson 7827e8166e Merge branch '2.6.x' into 2.7.x
Closes gh-32402
2022-09-16 11:38:07 +01:00
Andy Wilkinson ab26050fe7 Document support for Java 19
Closes gh-32259
2022-09-16 11:37:14 +01:00
Phillip Webb 7f5785182d Switch @SpringBootTest to UseMainMethod.NEVER by default
See gh-22405
2022-09-15 12:37:26 -07:00
Phillip Webb 48f3cd75d4 Refine SpringBootTest.useMainMethod support
Refine `SpringBootContextLoader` so that calls to the main method do
not exit early and the hook is only used when necessary.

See gh-22405
2022-09-15 10:48:58 -07:00
Phillip Webb 41e0bbf4bb Add SpringBootTest.useMainMethod support
Add a new `useMainMethod` attribute to `SpringBootTest` which can be
used to determine how the test should run. The three available options
are:

	- `ALWAYS`
	- `NEVER`
	- `WHEN_AVAILABLE`

The default is `WHEN_AVAILABLE` which will attempt to launch the test
using the `main` method if there is one.

The `SpringBootContextLoader` has been updated to use the new
`SpringApplicationHook` interface when the main method is being used.

Closes gh-22405
2022-09-14 22:37:37 -07:00
Stephane Nicoll ebef52b207 Merge branch '2.7.x'
Closes gh-32292
2022-09-10 09:13:53 +02:00
Stephane Nicoll 04a668fd07 Merge branch '2.6.x' into 2.7.x
Closes gh-32291
2022-09-10 09:13:40 +02:00
Oliver B. Fischer 6e4e76597a Make the path of the config directory better understandable
Currently, the documentation relates to the subdirectory for external
configurations as `/config`. Read as UNIX path, the leading slash
could be read as reference to the root directory `/`.

This commit updates the documentation to use 'config/' instead.

See gh-32224
2022-09-10 09:09:43 +02:00
Andy Wilkinson 0555dda63d Remove rarely used commands from the CLI
Closes gh-32263
2022-09-08 21:23:33 +01:00
Vedran Pavic 94f42d11e5 Add support for customizing WebJars resource handler path pattern
At present, both Spring MVC and Spring WebFlux auto-configurations
hardcode the path pattern for WebJars resource handlers to
"/webjars/**", which means users are unable to change the path.

This commit introduces "spring.mvc.webjars-path-pattern" and
"spring.webflux.webjars-path-pattern" configuration properties that
allow customization of WebJars resource handler path pattern.

See gh-31769
2022-09-07 11:46:19 +02:00
Stephane Nicoll ec63a981d0 Merge branch '2.7.x'
Closes gh-32248
2022-09-07 09:33:29 +02:00
Stephane Nicoll 2fb257ad22 Merge branch '2.6.x' into 2.7.x
Closes gh-32247
2022-09-07 09:33:17 +02:00
Stephane Nicoll 19c69ff743 Polish "Add support for detecting .yml Hazelcast config files"
See gh-32142
2022-09-07 09:32:53 +02:00
Scott Frederick da4de7d67d Generate the AutoConfiguration.imports file from annotations
This commit adds the `AutoConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module. When added to a project build, the annotation processor will
generate the
`org.springframework.boot.autoconfigure.AutoConfiguration.imports`
file automatically from `@AutoConfiguration`-annotated classes. It
also applies the annotation processor to the Spring Boot build.

Closes gh-31228
2022-09-02 15:10:22 -05:00
Scott Frederick 01c68a3dc8 Merge branch '2.7.x'
Closes gh-32217
2022-09-01 15:36:12 -05:00
Scott Frederick 7763a5df7d Polish auto-configuration documentation
Remove references to outdated information, emphasize use of the
`@AutoConfiguration` annotation and attributes, and edit for clarity.

Closes gh-32174
2022-09-01 15:35:59 -05:00
Andy Wilkinson ee701e5c7d Merge branch '2.7.x'
Closes gh-32199
2022-08-31 14:42:05 +01:00
Andy Wilkinson a253d8d589 Merge branch '2.6.x' into 2.7.x
Closes gh-32198
2022-08-31 14:41:47 +01:00
Andy Wilkinson 7d983be769 Clarify docs on disabling HTTP client request metrics
Closes gh-32136
2022-08-31 14:36:07 +01:00
Andy Wilkinson 4c01810ca2 Merge branch '2.7.x'
Closes gh-32197
2022-08-31 11:37:20 +01:00
Andy Wilkinson 13edfba1f5 Fix Kotlin example for empty @DefaultValue constructor binding
Closes gh-32177
2022-08-31 11:35:58 +01:00
Madhura Bhave 47effdcade Support role-based sanitization for actuator endpoints
Closes gh-32156
2022-08-24 16:03:58 -07:00
Phillip Webb 6db88e12c8 Polish 'Allow multiple hosts to be set in MongoProperties'
See gh-32125
2022-08-23 20:23:11 -07:00
Madhura Bhave cea6492c4a Align default JMX and WEB endpoint exposures
Closes gh-32005
2022-08-16 14:29:08 -07:00
Stephane Nicoll 1efad88c8c Merge branch '2.7.x'
Closes gh-32027
2022-08-09 09:53:22 +02:00
Stephane Nicoll 6e64f49593 Merge branch '2.6.x' into 2.7.x
Closes gh-32026
2022-08-09 09:53:13 +02:00
Stephane Nicoll 12c1da275b Polish contribution
See gh-32004
2022-08-09 09:52:11 +02:00
Ionascu Stefan Ciprian c441bafe27 Document the DefaultServlet is no longer being enabled by default
See gh-32004
2022-08-09 09:41:53 +02:00
Andy Wilkinson ba93e6c0ed Restore support for Jersey
Closes gh-28637
2022-08-08 15:45:20 +01:00
Madhura Bhave 0991bd3983 Harmonize data configuration
Any classes that rely on Spring Data being on the classpath
have been moved under a data package.

Certain configuration properties have also been updated to
accurately reflect whether Spring Data is required for the
auto-configuration to work.

Closes gh-11574
2022-08-05 13:32:25 -07:00
Andy Wilkinson 36cf3b9f78 Merge branch '2.7.x'
See gh-31988
2022-08-04 21:56:57 +01:00
Andy Wilkinson eb67470b89 Merge branch '2.6.x' into 2.7.x
See gh-31987
2022-08-04 21:56:35 +01:00
Andy Wilkinson b905d7f341 Normalize included log output to remove CI-specific details
See gh-28208
2022-08-04 21:55:17 +01:00
Andy Wilkinson 05877dc927 Merge branch '2.7.x'
Closes gh-31988
2022-08-04 14:17:39 +01:00
Andy Wilkinson a69cf002f0 Merge branch '2.6.x' into 2.7.x
Closes gh-31987
2022-08-04 14:16:16 +01:00