Commit Graph

2254 Commits

Author SHA1 Message Date
Andy Wilkinson 9b65409e23 Generalize database initialization detection and include R2DBC
Closes gh-25818
2021-03-29 20:07:54 +01:00
Andy Wilkinson e49a88cb9b Auto-configure script-based R2DBC database initialization
See gh-24741
2021-03-29 12:01:19 +01:00
Andy Wilkinson 90b4ced7a6 Move DataSource init auto-config out of DataSourceAutoConfiguration
Previously, the auto-configuration for DataSource initialization and
the properties used to configure it were part of the general
DataSource auto-configuration and properties.

This commit moves the auto-configuration of DataSource initialization
out into a separate top-level auto-configuration class. Similarly,
the properties for configuring DataSource initialization have been
moved from `spring.datasource.*` into `spring.sql.init.*`.

The old initialization-related `spring.datasource.*` properties have
been deprecated but can still be used. When they are used, they new,
separate initialization auto-configuration will back off. In other
words, the initialization related `spring.datasource.*` properties
and the `spring.sql.init.*` properties cannot be used in combination.

Closes gh-25323
2021-03-24 14:57:29 +00:00
Andy Wilkinson 5dee68c925 Move script-based DataSource initializer into spring-boot
Closes gh-25487
Closes gh-25756
2021-03-22 20:14:30 +00:00
Andy Wilkinson fb670ee654 Drop support for Gradle 5.6.x
Closes gh-24225
2021-03-19 17:30:27 +00:00
Phillip Webb bb38ee38a6 Fix package tangle and polish prefix support
Polish the prefix support introduced in commit a8592f36d4 and fix a
package tangle between `boot.context.properties.source` and `boot.env`.

The `Prefix` interface has now been moved into a new default method on
`OriginLookup`.

See gh-3450
2021-03-18 14:49:52 -07:00
Tommy Ludwig 8eb73bcf01 Support sending metrics to InfluxDB v2
See gh-25721
2021-03-17 15:14:43 +01:00
Stephane Nicoll eb406867ea Polish "Upgrade to Micrometer 1.7.0-M1"
See gh-25707
2021-03-17 11:28:52 +01:00
Stephane Nicoll 4fcbfd3e84 Merge branch '2.4.x'
Closes gh-25645
2021-03-15 16:09:05 +01:00
Stephane Nicoll 6b9032b4d3 Document that Java 16 is supported
Closes gh-25527
2021-03-15 16:08:56 +01:00
Stephane Nicoll ed39075177 Merge branch '2.4.x'
Closes gh-25644
2021-03-15 14:25:49 +01:00
Stephane Nicoll 9aa1ce235f Document DataSource implementations supported by DataSourceBuilder
Closes gh-25333
2021-03-15 14:25:22 +01:00
Stephane Nicoll 9b0cdac97a Add support for external configuration for Cassandra
Closes gh-24065
2021-03-15 10:44:13 +01:00
Phillip Webb bea307b115 Extract code samples from docs
See gh-6313
2021-03-12 17:49:17 -08:00
Phillip Webb 08c4d03649 Fix LocalCacheVerifier include tags
Fixes gh-25567
2021-03-11 16:26:53 -08:00
Phillip Webb 05cf7fbb04 Use new backend features for extracted samples
Update extracted samples to make use of code folding and chomping.

See gh-6313
2021-03-09 11:55:23 -08:00
Andy Wilkinson ed72bca6c8 Provide more pluggable way to indicate DataSource init dependencies
Closes gh-17619
Closes gh-25559
2021-03-09 13:55:48 +00:00
Andy Wilkinson 99b7d29c2c Merge branch '2.4.x' 2021-03-09 11:12:07 +00:00
Andy Wilkinson 9be36f3a72 Merge branch '2.3.x' into 2.4.x 2021-03-09 11:11:46 +00:00
Phillip Webb 6e5c510e0a Migrate to asciidoctor-spring-backends
Migrate to the snapshot version of asciidoctor-spring-backends.

See gh-25553
2021-03-08 22:07:17 -08:00
Phillip Webb 3bb9b2300e Polish asciidoc markup 2021-03-08 22:03:35 -08:00
Stephane Nicoll bb0f43cf07 Allow JMX endpoint ObjectNames to be customized
Closes gh-25317
2021-03-05 16:19:19 +01:00
Andy Wilkinson 006cb643ea Merge branch '2.4.x'
Closes gh-25514
2021-03-05 14:16:27 +00:00
Andy Wilkinson 2f95c1e2c8 Merge branch '2.3.x' into 2.4.x
Closes gh-25513
2021-03-05 14:16:07 +00:00
Andy Wilkinson 22b73f3020 Polish "Improve documentaion of Mockito test execution listeners"
See gh-25375
2021-03-05 14:14:36 +00:00
cdalexndr 72562e0fd4 Improve documentaion of Mockito test execution listeners
See gh-25375
2021-03-05 12:49:18 +00:00
Andy Wilkinson 2cffbc90cb Merge branch '2.4.x'
Closes gh-25511
2021-03-05 11:03:41 +00:00
Andy Wilkinson 836ad76df1 Merge branch '2.3.x' into 2.4.x
Closes gh-25510
2021-03-05 11:03:08 +00:00
Andy Wilkinson 92133d47d0 Polish "Make link to Actuator API docs more prominent"
See gh-25486
2021-03-05 10:58:47 +00:00
cdalexndr 5f4e1b747e Make link to Actuator API docs more prominent
See gh-25486
2021-03-05 10:57:59 +00:00
Madhura Bhave 37dcb90876 Merge branch '2.4.x'
Closes gh-25502
2021-03-04 14:48:11 -08:00
Madhura Bhave ae630e03ce Warn against using multi-document files with TestPropertySource
Closes gh-24945
2021-03-04 14:46:59 -08:00
Madhura Bhave e1904fb72f Merge branch '2.4.x'
Closes gh-25500
2021-03-04 13:04:18 -08:00
Madhura Bhave cfac223cff Document configtree support for Docker secrets
Closes gh-25095
2021-03-04 13:02:28 -08:00
Stephane Nicoll 9db78022bd Merge branch '2.4.x'
Closes gh-25464
2021-03-01 10:45:16 +01:00
Stephane Nicoll 63cca9b8c6 Polish "Document precedence between properties and yaml"
See gh-25300
2021-03-01 10:44:43 +01:00
Robert Smith 20ed8c2ec3 Document precedence between properties and yaml
See gh-25300
2021-03-01 10:39:34 +01:00
izeye c823f44e76 Polish
See gh-25451
2021-02-27 11:22:05 +01:00
Andy Wilkinson 9713bfc765 Enable the logging shutdown hook by default
This commit updates LoggingApplicationListener to register the logging
shutdown hook by default.

The hook is detrimental in a war deployment as it may pin parts of an
application in memory after it has been undeployed. For this reason,
the hook is still disabled by default in war deployments. This is
achieved by setting an attribute on the servlet context in
SpringBootServletInitializer that is then consumed via the Environment
by LoggingApplicationListener.

Closes gh-25046
2021-02-26 14:00:08 +00:00
Madhura Bhave a8592f36d4 Add prefix support for property source
We configure the `SystemEnvironmentPropertySource` as a `Prefixed` property
source. When adapting this to a `ConfigurationPropertySource, a
`PrefixedConfigurationPropertySource` will be created for it.
A `PrefixedConfigurationPropertySource` will resolve property
such as `foo.bar` to `my.foo.bar` for a prefix of `my`.

Closes gh-3450
2021-02-25 12:53:34 -08:00
Stephane Nicoll 9e3cfc5d7a Merge branch '2.4.x'
Closes gh-25432
2021-02-25 15:58:51 +01:00
John Blum cec4d45cf6 Fix grammatical error in documentation
See gh-25411
2021-02-25 15:57:56 +01:00
Andy Wilkinson f09630f73c Allow additional keys to be configured for value sanitization
Closes gh-25384
2021-02-24 19:28:29 +00:00
Andy Wilkinson 10ef991e1d Sanitize sensitive portion of the value of url and urls keys
Closes gh-25387
2021-02-24 14:42:25 +00:00
Stephane Nicoll d9dcfeba5c Polish "Add more customization options for InfluxDB"
See gh-25319
2021-02-23 11:35:15 +01:00
Stephane Nicoll 808e58265f Merge branch '2.4.x'
Closes gh-25372
2021-02-19 12:50:08 +01:00
Stephane Nicoll 9e6302ee6a Merge branch '2.3.x' into 2.4.x
Closes gh-25371
2021-02-19 12:49:40 +01:00
Tommy Ludwig bd2a890899 Polish HTTP client metrics documentation wording
See gh-25353
2021-02-19 12:48:56 +01:00
Phillip Webb a1dc107144 Update copyright year of changed files 2021-02-18 16:23:56 -08:00
Andy Wilkinson df5f59127a Support Jetty 10
Closes gh-24886
2021-02-17 17:49:59 +00:00
Madhura Bhave d69565cf3e Merge branch '2.4.x'
Closes gh-25346
2021-02-17 09:45:26 -08:00
Madhura Bhave 52a15647a9 Polish "Remove old documentation relating to yaml and profiles"
See gh-24620
2021-02-17 09:43:44 -08:00
Ramiro Aparicio 93f822e7b6 Remove old documentation relating to yaml and profiles
See gh-24620
2021-02-17 09:43:29 -08:00
Andy Wilkinson 2f83a6714b Rework DataSource initialization
Previously, DataSource initialization was triggered via a
BeanPostProcessor or a schema created event from JPA. This caused
numerous problems with circular dependencies, bean lifecycle, etc and
added significant complexity.

This commit reworks DataSource initialization to remove the use of a
BeanPostProcessor entirely. In its place, DataSource initialization is
now driven by an InitializingBean with dependency relationships
between beans ensuring that initialization has been performed before
the DataSource is used. This aligns with the approach that's worked
well with Flyway and Liquibase.

More changes are planned to further simplify DataSource initialization.
The changes in this commit are a foundation for those changes. Any new
public API in this commit is highly likely to change before the next
GA.

Fixes gh-13042
Fixes gh-23736
2021-02-17 12:10:22 +00:00
Stephane Nicoll 9bc4f8ede1 Polish "Group jdbc-related batch properties beneath spring.batch.jdbc"
See gh-25316
2021-02-17 11:29:35 +01:00
Stephane Nicoll b50fb824a3 Merge branch '2.4.x'
Closes gh-25298
2021-02-15 14:16:01 +01:00
Stephane Nicoll a9ff33f74f Merge branch '2.3.x' into 2.4.x
Closes gh-25297
2021-02-15 14:15:42 +01:00
Stephane Nicoll 569002e917 Polish "Document Kafka Streams metrics support"
See gh-25272
2021-02-15 14:11:34 +01:00
izeye dff4ca2293 Document Kafka Streams metrics support
See gh-25272
2021-02-15 14:07:39 +01:00
Stephane Nicoll 8c0c30e7a8 Polish "Add support to auto-configure javax.jms.ExceptionListener"
See gh-25278
2021-02-15 13:58:25 +01:00
Stephane Nicoll ca9b583c7d Merge branch '2.4.x'
Closes gh-25271
2021-02-14 09:37:49 +01:00
izeye f48893def5 Polish 2021-02-14 09:34:30 +01:00
Madhura Bhave c05cb21ab7 Add a property to disable the `/actuator` discovery page
Closes gh-24693
2021-02-09 11:36:29 -08:00
Stephane Nicoll dca643500a Polish "Make Scheduler consistent for Spring Integration"
See gh-25109
2021-02-09 17:06:43 +01:00
Artem Bilan c5491cfdd7 Make Scheduler consistent for Spring Integration
Currently Spring Integration creates its own `TaskScheduler` bean if one
does not exist in the context yet. When we add `@EnableScheduling`,
Spring Boot auto-configures one for us, but this one comes with slightly
different options than the default in Spring Integration.

This commit makes sure that Spring Integration reuses the
auto-configured TaskScheduler if possible, regardless of the user
opting-in for `@EnabledScheduling`.

See gh-25109
2021-02-09 17:06:43 +01:00
Andy Wilkinson 6521d39867 Merge branch '2.4.x'
Closes gh-25143
2021-02-09 14:12:36 +00:00
Andy Wilkinson caa9249987 Merge branch '2.3.x' into 2.4.x
Closes gh-25142
2021-02-09 14:11:59 +00:00
Andy Wilkinson 7898b6afb0 Remove duplicate publication from spring-boot-docs
Fixes gh-25132
2021-02-09 14:10:58 +00:00
Stephane Nicoll a9a8d3a167 Merge branch '2.4.x'
Closes gh-25137
2021-02-09 09:49:59 +01:00
izeye 63ee99bf75 Polish
See gh-25093
2021-02-09 09:48:35 +01:00
Stephane Nicoll ee59f644ed Merge branch '2.4.x'
Closes gh-25136
2021-02-09 09:45:37 +01:00
Stephane Nicoll b2818680fd Polish "Clarify usage of BufferingApplicationStartup"
See gh-25075
2021-02-09 09:44:19 +01:00
Oleg Sukhov 853dbc3de3 Clarify usage of BufferingApplicationStartup
See gh-25075
2021-02-09 09:21:52 +01:00
Phillip Webb 23ebf017c0 Extract code samples from docs
See gh-6313
2021-02-04 15:55:35 -08:00
Phillip Webb 0e326d6b0f Extract some code samples from docs
See gh-6313
2021-02-03 18:10:44 -08:00
Phillip Webb e0392c4558 Add additional dependencies for example code
Add additional dependencies useful for the example code.

See gh-6313
2021-02-03 17:53:52 -08:00
Phillip Webb 9f6f2d36df Polish documented application logged output
Update the documented application output based on the latest version.
2021-02-03 17:53:52 -08:00
Phillip Webb b2a51e4504 Polish asciidoctor formatting 2021-02-03 17:47:36 -08:00
Phillip Webb ae1be76cce Add pending-extract attribute to source
Add `pending-extract=true` to source blocks to help us identify
those that need to be extracted to a real source file.

See gh-6313
2021-02-03 17:45:40 -08:00
Phillip Webb 073f8c4b23 Polish spring-boot-docs
See gh-25089
2021-02-03 16:25:11 -08:00
Phillip Webb 2a85427324 Refine spring-boot-docs package restructure
Refine the package restructure started in 91ccc23462 to help provide
a solid foundation for code snippets. This commit renames many of the
classes so that they no longer end in `Example`. It also removes some
of the inner types that were previously used. Many tag comments have
also been moved to ensure that `import` statements are available in
the docs.

Closes gh-25089
2021-02-03 15:47:05 -08:00
Phillip Webb 91ccc23462 Restructure spring-boot-docs packages
Restructure the packages in `spring-boot-docs` so that they mirror
the documentation sections. There are now three main packages:
`springbootfeatures`, `productionreadyfeatures` and `howto`. Each
of the main packages has a subpackage named after the section headings.

Example code now uses consistent `// tag::` names and imports are
applied using `[tag=*]` whenever possible.

Test snippets have been moved to `src/main/java` so that only a single
import attribute needs to be defined.

Closes gh-25089
2021-02-02 17:09:45 -08:00
Andy Wilkinson db781a0d84 Merge branch '2.4.x'
See gh-25077
2021-02-02 15:14:18 +00:00
Andy Wilkinson 788a42d694 Merge branch '2.3.x' into 2.4.x
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson 67479b6380 Add junit-platform-launcher dependency by convention
Closes gh-25074
2021-02-02 13:03:21 +00:00
Phillip Webb d8b6960997 Merge branch '2.4.x'
Closes gh-25077
2021-02-01 16:08:57 -08:00
Phillip Webb 257608a3a3 Merge branch '2.3.x' into 2.4.x
Closes gh-25076
2021-02-01 16:03:43 -08:00
Phillip Webb 939b5dfc26 Add junit-platform-launcher dependency
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.

Closes gh-25074
2021-02-01 15:31:28 -08:00
Madhura Bhave c73e3cc2dc Update documentation for layered wars
Closes gh-22821
Closes gh-22195
2021-02-01 14:43:43 -08:00
Phillip Webb 0104ee677e Merge branch '2.4.x'
Closes gh-25067
2021-01-30 17:58:05 -08:00
Phillip Webb 57f1f17320 Merge branch '2.3.x' into 2.4.x
Closes gh-25066
2021-01-30 17:57:53 -08:00
Phillip Webb 187258aa6a Fix classpath.idx format documentation
Since 2.3.8 and 2.4.2 the format includes the directory.

Closes gh-24856
2021-01-30 17:56:09 -08:00
Phillip Webb d6eb1eb5ae Merge branch '2.4.x'
Closes gh-25065
2021-01-30 17:46:25 -08:00
Phillip Webb 9ac5151932 Merge branch '2.3.x' into 2.4.x
Closes gh-25064
2021-01-30 17:46:10 -08:00
Phillip Webb 19c5864d2c Clarify square bracket map binding notation
Update reference docs to make it clearer when the square bracket map
binding notation should be used.

Closes gh-23390
2021-01-30 17:42:49 -08:00
Phillip Webb 99d400f302 Merge branch '2.4.x'
Closes gh-25062
2021-01-30 17:04:24 -08:00
Phillip Webb d7c44e4503 Merge branch '2.3.x' into 2.4.x
Closes gh-25061
2021-01-30 17:04:10 -08:00
Phillip Webb 549d4f7fbe Document that Spring MVC has own ConversionService
Update documentation to make it clearer that Spring MVC does not use the
`ApplicationConversionService` unless configured explicitly.

Closes gh-22718
2021-01-30 17:03:55 -08:00
Andy Wilkinson 82b90d5749 Merge branch '2.4.x'
Closes gh-25052
2021-01-29 09:07:40 +00:00
Andy Wilkinson a3058200cb Merge branch '2.3.x' into 2.4.x
Closes gh-25050
2021-01-29 09:06:42 +00:00
dreis2211 4940694db2 Fix duplicate anchor id
See gh-25048
2021-01-29 09:06:06 +00:00
Phillip Webb f6097e7da4 Merge branch '2.4.x'
Closes gh-25045
2021-01-28 19:29:14 -08:00
Phillip Webb 2d056525d8 Merge branch '2.3.x' into 2.4.x
Closes gh-25044
2021-01-28 19:28:56 -08:00
Phillip Webb c03d8773e7 Improve logging.register-shutdown-hook docs
Update the "Logging" reference documentation with a section about
shutting down the logging system.

Closes gh-24507
2021-01-28 19:26:18 -08:00
Phillip Webb 479180fdf9 Merge branch '2.4.x'
Closes gh-25041
2021-01-28 18:49:04 -08:00
Phillip Webb c86ee4c851 Merge branch '2.3.x' into 2.4.x
Closes gh-25040
2021-01-28 18:48:51 -08:00
Phillip Webb 5b2d1f19a0 Polish 'Add note about exploded jars and banner properties'
See gh-24982
2021-01-28 18:48:14 -08:00
Robert Smith 33c038199d Add note about exploded jars and banner properties
Add a note to the "Customizing the Banner" explaining that you need
to be using the `JarLauncher` to use the `application.*` properties.

See gh-24982
2021-01-28 18:48:11 -08:00
Phillip Webb 802da9dc87 Merge branch '2.4.x'
Closes gh-25039
2021-01-28 18:01:06 -08:00
Phillip Webb 53f1aab833 Merge branch '2.3.x' into 2.4.x
Closes gh-25038
2021-01-28 18:00:42 -08:00
Phillip Webb 60bb33f231 Polish 'Add a tip about actuator endpoints'
See gh-24336
2021-01-28 17:55:09 -08:00
Wesley Ugang 6ced1d7f4e Add a tip about actuator endpoints
Update the "Externalized Configuration" section with a tip that about
the actuator `env` and `configprops` endpoints.

See gh-24336
2021-01-28 17:53:04 -08:00
Hatef Palizgar 53c1e79810 Change info endpoint to be secure and unexposed by default
See gh-24715
2021-01-21 13:54:59 -08:00
dreis2211 d4eccb7715 Upgrade to Groovy 3.0.7
See gh-24946
2021-01-21 14:32:42 +00:00
Stephane Nicoll 012a199773 Remove Spring Data Solr support
In preparation to the upgrade to Spring Data 2021.0, this commit removes
auto-configuration for Spring Data Solr.

Closes gh-24939
2021-01-20 15:03:42 +01:00
Stephane Nicoll 85729d2a8a Merge branch '2.3.x' into 2.4.x
Closes gh-24943
2021-01-20 13:57:18 +01:00
Stephane Nicoll 10b4cb8cb5 Deprecate Spring Data Solr support
Closes gh-24942
2021-01-20 13:56:50 +01:00
Stephane Nicoll 600be08225 Merge branch '2.4.x'
Closes gh-24855
2021-01-15 16:51:27 +01:00
Stephane Nicoll 7ec7569939 Merge branch '2.3.x' into 2.4.x
Closes gh-24854
2021-01-15 16:51:10 +01:00
Stephane Nicoll b3ab77a5c3 Move Spring Boot version to main index in reference guide
Closes gh-24848
2021-01-15 16:50:45 +01:00
Stephane Nicoll 1a2a3d6598 Merge branch '2.4.x' 2021-01-15 14:37:25 +01:00
Stephane Nicoll e8ae18ae11 Polish
See gh-24837
2021-01-15 14:36:53 +01:00
Stephane Nicoll a18f01addf Remove bitronix support
See gh-24806
2021-01-15 14:14:27 +01:00
Brian Clozel 4dd60684c9 Merge branch '2.4.x'
Closes gh-24844
2021-01-14 18:36:31 +01:00
Brian Clozel 6f51831001 Fix docs on probe state during graceful shutdown
This commit improves the "Application lifefycle and Probes states"
section and underlines the difference between `AvailabilityState` and
the availability of Probes over HTTP.

Closes gh-24843
2021-01-14 18:30:15 +01:00
Stephane Nicoll 0897af0dfa Add customizer for jOOQ's configuration
This commit adds a customizer hook point for jOOQ's configuration. When
such a bean is present, it is invoked with the auto-configuration
`Configuration`. This effectively supersedes checking for a number of
jOOQ `*Provider`beans. The existing beans are still honoured, in a
deprecated fashion.

Closes gh-24732
2021-01-11 14:16:34 +01:00
Stephane Nicoll 1d30a4716e Merge branch '2.4.x'
Closes gh-24708
2021-01-08 15:54:36 +01:00
Stephane Nicoll b8a1869569 Merge branch '2.3.x' into 2.4.x
Closes gh-24707
2021-01-08 15:53:53 +01:00
Stephane Nicoll 826d79be3e Clarify behaviour of WebServerFactory in reference guide
Closes gh-24705
2021-01-08 15:50:16 +01:00
Phillip Webb 42e649debe Merge branch '2.4.x'
Closes gh-24682
2021-01-06 16:47:46 -08:00
Phillip Webb 04616a01cf Merge branch '2.3.x' into 2.4.x
Closes gh-24681
2021-01-06 16:47:24 -08:00
Phillip Webb ef09982b39 Merge branch '2.2.x' into 2.3.x
Closes gh-24680
2021-01-06 16:46:50 -08:00
Phillip Webb 25033ee5e7 Migrate away from pivotal-legacy/homebrew-tap
Update reference documentation to the new spring-io/homebrew-tap repo.

Closes gh-24659
2021-01-06 16:45:10 -08:00
Stephane Nicoll 2547a9e255 Merge branch '2.4.x'
See gh-24655
2021-01-06 14:24:34 +01:00
Stephane Nicoll c014bb9880 Merge branch '2.3.x' into 2.4.x
See gh-24647
2021-01-06 14:24:13 +01:00
Stephane Nicoll 67d1f355d7 Fix Nullable reference
See gh-24647
2021-01-06 14:23:38 +01:00
Stephane Nicoll b3278f459e Merge branch '2.4.x'
See gh-24655
2021-01-06 08:59:14 +01:00
Stephane Nicoll 4e6f15a466 Merge branch '2.3.x' into 2.4.x
See gh-24647
2021-01-06 08:58:48 +01:00
Stephane Nicoll 2bd78355dc Reference javax.annotation.Nonnull support in reference guide
See gh-24647
2021-01-06 08:58:13 +01:00
Andy Wilkinson 77652961cd Merge branch '2.4.x'
Closes gh-24650
2021-01-05 17:13:45 +00:00
Andy Wilkinson 89f29c933f Merge branch '2.3.x' into 2.4.x
Closes gh-24649
2021-01-05 17:13:30 +00:00
dreis2211 fe3217d2c4 Exclude starters from Javadoc aggregation
See gh-24648
2021-01-05 17:12:39 +00:00
Stephane Nicoll 63444ae957 Merge branch '2.4.x'
Closes gh-24627
2021-01-01 09:18:31 +01:00
Stephane Nicoll 052565ef2b Merge branch '2.3.x' into 2.4.x
Closes gh-24626
2021-01-01 09:18:13 +01:00
dreis2211 261b7a5b18 Update copyrights to 2021
See gh-24625
2021-01-01 09:17:13 +01:00
Stephane Nicoll 1a2577a07e Fix sample formatting 2020-12-23 17:19:18 +01:00
Stephane Nicoll 1fd17cf641 Add support for Elasticsearch sniffer
Closes gh-24174
2020-12-23 17:11:40 +01:00
Stephane Nicoll 1e8d5c37ed Merge branch '2.4.x'
Closes gh-24607
2020-12-23 16:09:13 +01:00
izeye 5e3f618f9d Polish
See gh-24604
2020-12-23 16:08:21 +01:00
Stephane Nicoll e3d7ab0e3b Merge branch '2.3.x' into 2.4.x 2020-12-23 16:08:08 +01:00