Commit Graph

3114 Commits

Author SHA1 Message Date
Stern, Ittay (is9613) e05363f9b0 Restore Custom Favicon section in the reference guide
The section about favicon was mistakenly removed in 5fceb9d and this
commit reinstates it.

See gh-31224
2022-06-13 14:50:18 +02:00
Stephane Nicoll ed7ff31d01 Merge branch '2.7.x'
Closes gh-31357
2022-06-13 14:46:04 +02:00
Stephane Nicoll 4b0fe63bdf Merge branch '2.6.x' into 2.7.x
Closes gh-31356
2022-06-13 14:45:54 +02:00
Stephane Nicoll d896d995d1 Polish contribution
See gh-31190
2022-06-13 14:39:58 +02:00
tudormarc e313aa5f6c Document that Lombok must be configured before our annotation processor
See gh-31190
2022-06-13 14:33:21 +02:00
Stephane Nicoll 365d96daf6 Merge branch '2.7.x'
Closes gh-31355
2022-06-13 14:29:40 +02:00
Stephane Nicoll 72dd51ae0b Merge branch '2.6.x' into 2.7.x
Closes gh-31354
2022-06-13 14:29:18 +02:00
Henning Poettker 9fdd471adf Use Lambda-based API in Spring Security examples
See gh-31143
2022-06-13 13:15:56 +02:00
Phillip Webb ff4e6f7639 Merge branch '2.7.x'
Closes gh-31339
2022-06-10 12:38:48 -07:00
Phillip Webb 0f7fa84214 Polish 'Update Dynatrace documentation for Micrometer 1.9.0'
See gh-31132
2022-06-10 12:36:45 -07:00
Georg Pirklbauer 6df9f50642 Update Dynatrace documentation for Micrometer 1.9.0
Update the actuator documentation for Dynatrace to reflect the
updates and improvements that were made in Micrometer 1.9.0.

See gh-31132
2022-06-10 12:34:05 -07:00
Moritz Halbritter 486b3073ce Add tracing in integration tests paragraph to the documentation
See gh-31308
2022-06-10 14:25:12 +02:00
Moritz Halbritter b250d8a1e4 Add @AutoConfigureObservability annotation
This annotation is read by ObservabilityContextCustomizerFactory, which
then sets test properties depending on the annotation attributes.

@AutoConfigureMetrics is deprecated, to support backwards compatability
it's now meta-annotated with @AutoConfigureObservability

See gh-31308
2022-06-10 14:25:12 +02:00
Andy Wilkinson 85ad4fd4b4 Merge branch '2.7.x'
Closes gh-31212
2022-05-30 17:17:26 +01:00
Andy Wilkinson 70bcade232 Merge branch '2.6.x' into 2.7.x
Closes gh-31211
2022-05-30 17:16:53 +01:00
Andy Wilkinson 419ac26e0d Use conventions for source and encoding of aggregatedJavadoc
Closes gh-31210
2022-05-30 17:15:45 +01:00
Stephane Nicoll a27427b977 Merge branch '2.7.x'
Closes gh-31207
2022-05-30 14:57:57 +02:00
Stephane Nicoll 95dad34482 Merge branch '2.6.x' into 2.7.x
Closes gh-31206
2022-05-30 14:57:45 +02:00
Matei Cernăianu eb8b9e17c5 Fix "spring.factories" typos in database initialization documentation
See gh-31203
2022-05-30 14:55:15 +02:00
Andy Wilkinson 90752e559a Polish "Auto-configure JvmCompilationMetrics"
See gh-31151
2022-05-27 10:18:31 +01:00
Andy Wilkinson 4bb5ba2bd0 Merge branch '2.7.x' 2022-05-26 18:26:52 +01:00
Andy Wilkinson 935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson 3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson 5dfa5adb75 Merge branch '2.7.x'
Closes gh-31178
2022-05-26 15:54:58 +01:00
Andy Wilkinson 455ee0ce22 Merge branch '2.6.x' into 2.7.x
Closes gh-31177
2022-05-26 15:53:38 +01:00
Andy Wilkinson ee45fd2fc8 Remove redundant throws declarations from internal APIs
Closes gh-31176
2022-05-26 15:47:35 +01:00
Andy Wilkinson 96c2d08fc4 Remove support for Solr as it is not compatible with Jetty 11
Closes gh-31054
2022-05-18 11:33:55 +01:00
Phillip Webb f8a41d34aa Merge branch '2.7.x' 2022-05-17 22:22:08 -07:00
Phillip Webb 23eceb0d8a Merge branch '2.6.x' into 2.7.x 2022-05-17 22:21:41 -07:00
Phillip Webb ea41e89c6c Merge branch '2.5.x' into 2.6.x 2022-05-17 22:21:10 -07:00
Phillip Webb 7d2f1bafc0 Update copyright year of changed files 2022-05-17 22:20:05 -07:00
Madhura Bhave c730ab7d0c Merge branch '2.7.x' into main 2022-05-17 14:29:36 -07:00
Scott Frederick 7d459a13c2 Add properties for SAML relying party single logout
Closes gh-30128

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
2022-05-17 14:07:48 -07:00
Andy Wilkinson a496cb9298 Merge branch '2.7.x' 2022-05-12 12:52:46 +01:00
Andy Wilkinson 2669f8c343 Merge branch '2.6.x' into 2.7.x
Closes gh-30997
2022-05-12 12:47:52 +01:00
Andy Wilkinson 655ceefead Merge branch '2.5.x' into 2.6.x
Closes gh-30996
2022-05-12 12:47:38 +01:00
Andy Wilkinson 3f6fcac683 Polish "Extend documentation on Datadog metrics"
See gh-30879
2022-05-12 12:36:50 +01:00
Denis Washington 09db7e4001 Extend documentation on Datadog metrics
- Document that an application key must be set to publish metadata
  for the exported metrics.

- Point out that using a non-US Datadog site (e.g., EU) requires
  changing the `uri` property.

See gh-30879
2022-05-12 12:36:18 +01:00
Andy Wilkinson c12171f2e9 Merge branch '2.7.x' 2022-05-12 12:28:20 +01:00
Andy Wilkinson 09b9a1f729 Merge branch '2.6.x' into 2.7.x
Closes gh-30995
2022-05-12 12:28:07 +01:00
Andy Wilkinson 9f46cf88c8 Merge branch '2.5.x' into 2.6.x
Closes gh-30994
2022-05-12 12:27:52 +01:00
颜虎 309e54bd21 Fix link to Upgrading From 1.x in multi-page documentation
See gh-30890
2022-05-12 12:15:30 +01:00
Andy Wilkinson 2744649892 Update started log message as app may not be running on a JVM
Closes gh-30974
2022-05-11 11:08:25 +01:00
Andy Wilkinson 770cb840c3 Use more flexible SpringFactoriesLoader
Closes gh-30235

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
2022-05-09 14:13:04 +01:00
Andy Wilkinson 0fbfb8ef09 Remove remnants of support for Embedded Mongo
See gh-30863 and 7e089a6b
2022-05-09 09:55:42 +01:00
Scott Frederick 7e089a6b81 Remove support for embedded MongoDB
This commit removes auto-configuration and dependency management
for Flapdoodle embedded MongoDB in favor of the Spring Boot support
provided by Flapdoodle.

Closes gh-30863
2022-05-06 17:05:36 -05:00
Andy Wilkinson 1ee079c265 Reinstate support for pooled-jms as it is now JMS 3.0 compatible
Closes gh-30865
2022-05-04 18:04:02 +01:00
Andy Wilkinson 0e00fafe38 Polish "Provide callback mechanism for customizing validation configuration"
See gh-29429
2022-05-04 11:45:39 +01:00
Scott Frederick 7f395941c7 Add timezone offset to default logging date format patterns
Closes gh-28654
2022-05-03 17:09:27 -05:00
Andy Wilkinson 541ab69aff Merge branch '2.7.x' 2022-05-03 15:18:20 +01:00
Andy Wilkinson 4cd850cfc0 Merge branch '2.6.x' into 2.7.x
Closes gh-30851
2022-05-03 15:17:13 +01:00
Andy Wilkinson fa327a783d Merge branch '2.5.x' into 2.6.x
Closes gh-30850
2022-05-03 15:14:00 +01:00
Eddú Meléndez f7a7e8cb89 Add auto-configuration for OtlpMeterRegistry
See gh-30825
2022-05-03 13:18:07 +01:00
izeye 77c3b6c899 Polish Micrometer tracing changes
See gh-30833
2022-05-03 11:39:31 +01:00
Eddú Meléndez 6a65aa4a23 Auto-configure Micrometer's JvmInfoMetrics
See gh-30832
2022-04-29 11:04:50 +01:00
Moritz Halbritter 85a4c94dea Merge branch '2.7.x' 2022-04-25 15:32:08 +02:00
Moritz Halbritter b406971094 Remove hyphen from asserting-party
spring.security.saml2.relyingparty.registration.*.asserting-party.* is
now named spring.security.saml2.relyingparty.registration.*.assertingparty.*

Closes gh-30785
2022-04-25 15:26:38 +02:00
Moritz Halbritter 35efc23deb Merge branch '2.7.x' 2022-04-25 09:15:39 +02:00
Moritz Halbritter e8b7843fe9 Merge branch '2.6.x' into 2.7.x
Closes gh-30782
2022-04-25 09:13:52 +02:00
Moritz Halbritter 63eb6b6ad9 Merge branch '2.5.x' into 2.6.x
Closes gh-30781
2022-04-25 09:13:34 +02:00
Moritz Halbritter 9b8b87009c Document support for Java 18
Closes gh-30548
2022-04-25 09:13:07 +02:00
Phillip Webb 7a6ca8ce25 Merge branch '2.7.x' 2022-04-20 15:30:01 -07:00
Phillip Webb dd5696b59b Update copyright year of changed files 2022-04-20 15:26:30 -07:00
Phillip Webb 36f1249fc6 Polish 2022-04-20 15:26:15 -07:00
Moritz Halbritter 1950d06585 Merge branch '2.7.x' 2022-04-20 08:26:35 +02:00
Moritz Halbritter 6c400daa48 Rename 'identityprovider' property to 'asserting-party'
Rename spring.security.saml2.relyingparty.registration.*.identity-provider.*
to spring.security.saml2.relyingparty.registration.*.asserting-party.*

The old property names are still supported, but will lead to a warning
in the logs.

Closes gh-30642
2022-04-20 08:25:58 +02:00
Stephane Nicoll 1698faffee Merge branch '2.7.x' 2022-04-20 08:24:32 +02:00
Stephane Nicoll 38c2a5c14b Merge branch '2.6.x' into 2.7.x
Closes gh-30750
2022-04-20 08:24:21 +02:00
Stephane Nicoll d049ae8703 Merge branch '2.5.x' into 2.6.x
Closes gh-30749
2022-04-20 08:24:07 +02:00
rfigueroa ae267bfab2 Use eclipse-temurin in docker samples
As AdoptOpenJDK moved to the Eclipse Foundation, this commit updates the
docs to reflect that in docker file samples.

See gh-30748
2022-04-20 08:21:55 +02:00
Stephane Nicoll 2d663f2e94 Upgrade to Spring Data 2021.2.0-RC1
Closes gh-30610
2022-04-20 08:05:15 +02:00
Brian Clozel 2dc2e5ab11 Auto-configure RSocketGraphQlClient
This commit contributes a `RSocketGraphQlClient.Builder` component to
the context, pre-configured with the `RSocketStrategies`, a customized
`RSocketConnector` and the expected data MIME type.

See gh-30453
2022-04-19 10:53:15 +02:00
Stephane Nicoll eb2f840446 Merge branch '2.7.x' 2022-04-19 09:55:40 +02:00
Stephane Nicoll 9c3cce58ea Merge branch '2.6.x' into 2.7.x
Closes gh-30740
2022-04-19 09:55:29 +02:00
Stephane Nicoll 57b3cb5135 Polish "Fix incorrect link in kafka.adoc"
See gh-30674
2022-04-19 09:52:56 +02:00
Chanhyeong Cho 577f0add0c Fix incorrect link in kafka.adoc
See gh-30674
2022-04-19 09:48:03 +02:00
Stephane Nicoll a4cccc98c6 Merge branch '2.7.x' 2022-04-19 09:37:08 +02:00
izeye ed412af138 Polish
See gh-30695
2022-04-19 09:34:28 +02:00
Stephane Nicoll 2ce840986f Merge branch '2.7.x' 2022-04-19 09:25:41 +02:00
Stephane Nicoll 4c5cb772ff Polish
See gh-30674
2022-04-19 09:25:02 +02:00
Brian Clozel eddb2b16ff Configure RSocket server support in GraphQL
This commit adds the RSocket server auto-configuration for GraphQL.

See gh-30453
2022-04-14 19:54:40 +02:00
Moritz Halbritter 3860eb211a Implement auto-configurations for Brave and OpenTelemetry
- Configure Zipkin
- Configure Wavefront
- Configure Brave
- Configure OpenTelemetry
- Configure Micrometer Tracing bridges for OpenTelemetry and Brave
- Create the ObservationHandler for tracing with Micrometer

Closes gh-30156
2022-04-14 09:14:44 +02:00
Scott Frederick f5f7fc8e9a Merge branch '2.7.x' 2022-04-13 16:29:00 -05:00
Scott Frederick d387b3fa81 Support configuration of web SSL using PEM-encoded certificates
This commit adds the ability to configure SSL in embedded web containers
using PEM-encoded certificate and private key files, as an alternative
to configuring SSL with Java KeyStore files.

Closes gh-29273
2022-04-13 16:28:04 -05:00
Andy Wilkinson 258ae5e153 Merge branch '2.7.x' 2022-04-12 21:58:41 +01:00
Andy Wilkinson 562627fb42 Deprecate auto-configuration for RestHighLevelClient
Closes gh-28598
2022-04-12 21:58:08 +01:00
Andy Wilkinson d5a92ccb8b Merge branch '2.7.x' 2022-04-12 21:20:34 +01:00
Andy Wilkinson a7a71da9ef Polish "Bring back Elasticsearch RestClient auto-configuration"
See gh-28496
2022-04-12 21:13:05 +01:00
Filip Hrisafov eb3bf40bdb Bring back Elasticsearch RestClient auto-configuration
Prior to this commit, Spring Boot would only auto-configure the
`RestHighLevelClient` and `RestClientBuilder` if the
`RestHighLevelClient` was present. This was done in 1d73d4ed.

This commit brings back the exposing of the `RestClient` bean in when
exposing the `RestHighLevelClient` or when the `RestHighLevelClient`
is not present. It allows for using the auto-configuration and its
customizers of the `RestClientBuilder` in a similar way as it is done
for the `RestTemplateBuilder` and the `WebClient.Builder`.

The presence of the `elasticsearch-rest-high-level-client` module is
now optional. This opens the door for potentially adding support for
the new Elasticsearch Java Client[1] that is based on the same
`RestClient`.

The health contributor and its configuration has also been updated to
only depend on the low-level RestClient.

See gh-28496

[1] https://github.com/elastic/elasticsearch-java
2022-04-12 21:13:05 +01:00
Brian Clozel e57bbdfcf5 Polish
See gh-29666
2022-04-12 18:41:01 +02:00
Andy Wilkinson 44211564a4 Adapt to latest changes in Micrometer 2.0 snapshots
See gh-29666
2022-04-12 15:25:43 +01:00
Andy Wilkinson 6580f6c742 Align with latest changes in Micrometer 1.9 snapshots
See gh-30605
2022-04-12 11:47:34 +01:00
Andy Wilkinson b871a1e457 Merge branch '2.7.x' 2022-04-12 08:51:47 +01:00
Andy Wilkinson 48f8021d88 Migrate @Local*Port annotations to spring-boot-test
Closes gh-29589
2022-04-12 08:48:43 +01:00
Andy Wilkinson 2dcc1ea257 Merge branch '2.7.x' 2022-04-07 20:44:38 +01:00
Andy Wilkinson 612e4114d2 Merge branch '2.6.x' into 2.7.x
Closes gh-30584
2022-04-07 20:44:29 +01:00
Andy Wilkinson f027faafa2 Merge branch '2.5.x' into 2.6.x
Closes gh-30583
2022-04-07 20:44:10 +01:00
izeye 618d113fad Move Jetty 9 specific exclusions to correct dependency
See gh-30522
2022-04-07 20:41:42 +01:00
Andy Wilkinson e6b485b317 Merge branch '2.7.x' 2022-04-07 16:31:58 +01:00
Andy Wilkinson 8727361221 Polish "Order ExitCodeGenerators and return first non-zero exit code"
See gh-30457
2022-04-07 16:31:19 +01:00
dugenkui 6718b10fa9 Order ExitCodeGenerators and return first non-zero exit code
See gh-30457
2022-04-07 16:30:09 +01:00
Andy Wilkinson a70249e368 Merge branch '2.7.x' 2022-04-05 15:11:41 +01:00
Andy Wilkinson ffc0fafe1a Merge branch '2.6.x' into 2.7.x
Closes gh-30545
2022-04-05 15:11:25 +01:00
Andy Wilkinson 05d4093381 Merge branch '2.5.x' into 2.6.x
Closes gh-30544
2022-04-05 15:11:01 +01:00
Andy Wilkinson 83cfc951f8 Polish "Refer to list of internal proxies in reference documentation"
See gh-30461
2022-04-05 14:37:08 +01:00
Damiano Albani 91306b58d5 Refer to list of internal proxies in reference documentation
See gh-30461
2022-04-05 14:34:37 +01:00
Moritz Halbritter 5b05fd9fb2 Merge branch '2.7.x' 2022-04-04 14:27:24 +02:00
Moritz Halbritter eedb8573b7 Polish documentation 2022-04-04 14:27:18 +02:00
Moritz Halbritter 6fa696f13d Merge branch '2.7.x' 2022-04-04 14:23:24 +02:00
Moritz Halbritter bd1424b004 Merge branch '2.6.x' into 2.7.x
Closes gh-30528
2022-04-04 14:22:49 +02:00
Moritz Halbritter bf3c2d713d Merge branch '2.5.x' into 2.6.x
Closes gh-30526
2022-04-04 14:18:45 +02:00
izeye 09d6215b65 Polish documentation
See gh-30498
2022-04-04 14:09:28 +02:00
Moritz Halbritter 9791318e55 Merge branch '2.7.x' 2022-04-04 13:49:05 +02:00
Jonatan Ivanov d0bc31a5e9 Add support for Prometheus Exemplars
See gh-30472
2022-04-04 13:35:38 +02:00
Andy Wilkinson 24e6417ddc Adapt to latest changes in Spring for GraphQL snapshots
See gh-30463
2022-03-29 16:50:12 +01:00
Andy Wilkinson 5d8c1d9bd7 Merge branch '2.7.x' 2022-03-29 14:30:42 +01:00
Andy Wilkinson 2f3ae02385 Merge branch '2.6.x' into 2.7.x
Closes gh-30466
2022-03-29 14:24:42 +01:00
Andy Wilkinson 8f985474a6 Merge branch '2.5.x' into 2.6.x
Closes gh-30465
2022-03-29 14:24:25 +01:00
Andy Wilkinson d574563616 Document @ConstructorBinding and @DefaultValue with records
Closes gh-30460
2022-03-29 14:14:28 +01:00
Moritz Halbritter be3523b1cd Move metric properties
- Moved from 'management.metrics.export.<product>' to
  'management.<product>.metrics.export'
- The default enabled property moved from 'management.metrics.export.defaults.enabled'
  to 'management.defaults.metrics.export.enabled'

Closes gh-30381
2022-03-28 08:24:03 +02:00
Andy Wilkinson eabf6cd1d8 Merge branch '2.7.x' 2022-03-25 15:15:26 +00:00
Andy Wilkinson 685d2d4391 Polish
See gh-30152
2022-03-25 15:15:02 +00:00
Andy Wilkinson 2e32f800e1 Merge branch '2.7.x' 2022-03-25 13:34:37 +00:00
Andy Wilkinson 8646ac4215 Move JsonComponent docs to general Jackson section
Closes gh-30405
2022-03-25 13:30:06 +00:00
Andy Wilkinson 5d09260870 Reinstate support for REST Assured
Closes gh-29543
Closes gh-30426
2022-03-25 10:12:42 +00:00
Andy Wilkinson 2c1b30514a Merge branch '2.7.x' 2022-03-23 15:30:53 +00:00
Andy Wilkinson 06c3e2a041 Merge branch '2.6.x' into 2.7.x
Closes gh-30394
2022-03-23 15:30:43 +00:00
Andy Wilkinson 2317f69f4c Add Apache Kafka to Messaging section's description
Closes gh-30389
2022-03-23 15:29:56 +00:00
Andy Wilkinson 009666bc64 Merge branch '2.7.x' 2022-03-23 09:36:46 +00:00
Andy Wilkinson ac3b0ea24a Merge branch '2.6.x' into 2.7.x
Closes gh-30380
2022-03-23 09:36:31 +00:00
Henning Poettker 22eb301bcf Fix links to Spring Security Reference Guide
See gh-30349
2022-03-23 09:35:30 +00:00
Stephane Nicoll 9de234f913 Fix asciidoc include and anchor 2022-03-21 14:35:37 +01:00
Stephane Nicoll b8e93b27af Merge branch '2.7.x' 2022-03-21 14:15:29 +01:00
Stephane Nicoll 7402a584bd Merge branch '2.6.x' into 2.7.x
Closes gh-30347
2022-03-21 14:15:13 +01:00
Stephane Nicoll 55a385cc36 Merge branch '2.5.x' into 2.6.x
Closes gh-30346
2022-03-21 14:00:30 +01:00
Stephane Nicoll 8824a09572 Polish "Document WebSecurityCustomizer for H2 Console"
See gh-29932
2022-03-21 13:55:46 +01:00
Henning Poettker 9d46a18406 Document WebSecurityCustomizer for H2 Console
See gh-29932
2022-03-21 13:38:42 +01:00
Stephane Nicoll e342070ec4 Merge branch '2.7.x' 2022-03-21 13:16:15 +01:00
Stephane Nicoll d0a0e7c6a2 Merge branch '2.6.x' into 2.7.x
Closes gh-30345
2022-03-21 13:16:06 +01:00
Stephane Nicoll 0aa141b5d9 Merge branch '2.5.x' into 2.6.x
Closes gh-30344
2022-03-21 13:15:56 +01:00
Stephane Nicoll 9455831d2a Polish contribution
See gh-30234
2022-03-21 13:15:06 +01:00
Abel Salgado Romero 5e270c18ae Include Netty in servers that supports HTTP response compression
See gh-30234
2022-03-21 13:10:46 +01:00
Stephane Nicoll 2088381d4b Merge branch '2.7.x' 2022-03-21 10:06:56 +01:00
Stephane Nicoll a2959bbcf2 Polish "Add support for cache2k in memory caching"
See gh-28498
2022-03-21 09:59:24 +01:00
Andy Wilkinson 17b5611ace Merge branch '2.7.x' 2022-03-19 11:05:21 +00:00
Andy Wilkinson f05c19a40a Kotlin Fix JsonSerializer example in reference guide
Closes gh-30331
2022-03-19 10:53:22 +00:00
Chris Dennis 3ed3d3eb36 Restore Ehcache 3 Support
See gh-30002
2022-03-19 09:33:47 +01:00
Stephane Nicoll c322cebe49 Merge branch '2.7.x' 2022-03-19 09:28:43 +01:00
Stephane Nicoll d8bb2ec4e0 Merge branch '2.6.x' into 2.7.x
Closes gh-30331
2022-03-19 09:28:35 +01:00
Stephane Nicoll bce247eafb Merge branch '2.5.x' into 2.6.x
Closes gh-30330
2022-03-19 09:28:24 +01:00
Stephane Nicoll 39339ccb49 Update copyright year of change file
See gh-30329
2022-03-19 09:25:46 +01:00
SangHyun-Park 8536100009 Fix JsonSerializer example in reference guide
See gh-30329
2022-03-19 09:25:12 +01:00
Andy Wilkinson a1e972ebaa Update Spock for Groovy 4.0 compatibility
Closes gh-30318
2022-03-18 12:38:41 +00:00
Andy Wilkinson dd812a3f76 Upgrade to Groovy 4.0.1
Closes gh-30279
2022-03-18 12:38:41 +00:00
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
2022-03-18 12:35:19 +00:00
Stephane Nicoll 3afda66be2 Merge branch '2.7.x' 2022-03-17 16:39:36 +01:00
Stephane Nicoll 2631b0ce01 Merge branch '2.6.x' into 2.7.x
Closes gh-30275
2022-03-17 16:39:20 +01:00
Stephane Nicoll be34ad36b5 Restore WebSockets section in the reference guide
Closes gh-30231
2022-03-17 16:35:04 +01:00
Andy Wilkinson 05130d9eb0 Merge branch '2.7.x' 2022-03-15 19:18:11 +00:00
Andy Wilkinson e97fa0ae52 Merge branch '2.6.x' into 2.7.x
See gh-30167
2022-03-15 19:15:03 +00:00
Andy Wilkinson 05c12737fe Merge branch '2.5.x' into 2.6.x
See gh-30166
2022-03-15 19:14:42 +00:00
Andy Wilkinson 3ab688ef82 Add missing task dependencies
See gh-29406
2022-03-15 19:14:25 +00:00
Andy Wilkinson 1dadc77346 Document that the minimum supported version of Kotlin is now 1.6
Closes gh-30197
2022-03-15 18:04:36 +00:00
Andy Wilkinson 5736f5401b Merge branch '2.7.x' 2022-03-11 08:23:27 +00:00
Andy Wilkinson c0a72bf5ea Merge branch '2.6.x' into 2.7.x
Closes gh-30167
2022-03-11 08:21:13 +00:00
Andy Wilkinson 4c1d1a6a69 Merge branch '2.5.x' into 2.6.x
Closes gh-30166
2022-03-11 08:17:59 +00:00
Andy Wilkinson cced7edd9c Document Devtools' property defaults directly in reference docs
Closes gh-29406
2022-03-11 08:15:40 +00:00
Madhura Bhave 44f71a46aa Merge branch '2.7.x' into main 2022-03-09 15:55:18 -08:00
Madhura Bhave 24c48f0b43 Merge branch '2.6.x' into 2.7.x
Closes gh-30150
2022-03-09 15:54:49 -08:00
Madhura Bhave bdcc2509f5 Merge branch '2.5.x' into 2.6.x
Closes gh-30149
2022-03-09 15:52:56 -08:00
Madhura Bhave d0883ba6ef Document the WebSocket-related exclusions that are required to use Jetty 10
Closes gh-29275
2022-03-09 15:40:01 -08:00
Stephane Nicoll e5cdcdadd5 Merge branch '2.7.x' 2022-03-09 08:29:23 +01:00
Stephane Nicoll a71d9f5088 Merge branch '2.6.x' into 2.7.x
Closes gh-30121
2022-03-09 08:29:16 +01:00
Stephane Nicoll 069c328075 Merge branch '2.5.x' into 2.6.x
Closes gh-30120
2022-03-09 08:29:07 +01:00
fml2 80b90ed386 Fix typo
See gh-30118
2022-03-09 08:28:44 +01:00
Stephane Nicoll 06321d4e55 Merge branch '2.7.x' 2022-03-09 08:26:30 +01:00
Stephane Nicoll b66bf393e4 Merge branch '2.6.x' into 2.7.x
Closes gh-30119
2022-03-09 08:26:20 +01:00
Stephane Nicoll be85f317d3 Fix anchor tag for Spring HATEOAS section
Closes gh-30106
2022-03-09 08:25:10 +01:00
Madhura Bhave 5368ed98ef Merge branch '2.7.x' into main 2022-03-08 22:03:08 -08:00
Madhura Bhave 06496d85cd Merge branch '2.6.x' into 2.7.x
Closes gh-30115
Closes gh-30116
2022-03-08 22:02:27 -08:00
Madhura Bhave 09dc4e5ce3 Merge branch '2.5.x' into 2.6.x
Closes gh-30113
Closes gh-30114
2022-03-08 22:01:26 -08:00
Madhura Bhave ef7d7487fa Document when config data properties are invalid
This commit also reinstates documentation for
`spring.profiles.include`

Closes gh-25849
Closes gh-28451
2022-03-08 21:58:43 -08:00
Madhura Bhave 70efe7d384 Fix javax import 2022-03-08 19:02:20 -08:00
Madhura Bhave 7846fb09be Merge branch '2.7.x' into main 2022-03-08 18:13:30 -08:00
Madhura Bhave ee291dc36f Merge branch '2.6.x' into 2.7.x
Closes gh-30112
2022-03-08 18:13:14 -08:00
Madhura Bhave b86ad89523 Merge branch '2.5.x' into 2.6.x
Closes gh-30111
2022-03-08 18:13:01 -08:00
Madhura Bhave 7d63faac7c Document the scalar types supported by MapBinder
Closes gh-27581
2022-03-08 18:12:21 -08:00
Madhura Bhave f10f27c3d4 Merge branch '2.7.x' into main 2022-03-08 17:41:28 -08:00
Madhura Bhave ba7ba08811 Merge branch '2.6.x' into 2.7.x
Closes gh-30110
2022-03-08 17:41:12 -08:00
Madhura Bhave 9c437c6cd9 Merge branch '2.5.x' into 2.6.x
Closes gh-30109
2022-03-08 17:40:52 -08:00
Madhura Bhave d240e293db Document how to obtain ServletContext with an embedded container setup
Closes gh-24561
2022-03-08 17:34:35 -08:00
Gautham Mohan 4388910435 Consider DataFetcherExceptionResolver in GraphQTest
Prior to this commit, `@GraphQlTest` slice tests would only consider
JsonComponent, RuntimeWiringConfigurer, Converter and
GenericConverter beans. But DataFetcherExceptionResolver,
Instrumentation and GraphQlSourceBuilderCustomizer are used in
setting up the GraphQL source.

This commit ensures that the `GraphQlTypeExcludeFilter` considers
those bean types.

Closes gh-30078
2022-03-08 17:54:55 +01:00
Brian Clozel 81754c8bc4 Upgrade to Spring GraphQL 1.0.0-SNAPSHOT
This commit switches to 1.0.0-SNAPSHOT for Spring GraphQL, before its
upcoming 1.0.0-M6 version.

This commit adapts to the changes introduced in
spring-projects/spring-graphql#317 : now that `GraphQlClient` has been
introduced, `GraphQlTester` has been aligned with the new
infrastructure. The `@GraphQlTest` and `@SpringBootTest` testing support
is now using different variants for each.

All samples have been updated to use the proper GraphQL terminology, see
and spring-projects/spring-graphql#310 .

See gh-29637
2022-03-08 17:54:54 +01:00
Stephane Nicoll 37ccc52b8a Merge branch '2.7.x' 2022-03-08 12:34:30 +01:00
Stephane Nicoll d67aa3c054 Fix null safety in Kotlin examples
Closes gh-30097
2022-03-08 12:34:02 +01:00
Madhura Bhave 5960d2dba1 Merge branch '2.7.x' into main 2022-03-07 21:54:10 -08:00
Madhura Bhave 9628507756 Merge branch '2.6.x' into 2.7.x
Closes gh-30094
2022-03-07 21:53:59 -08:00
Madhura Bhave d131003456 Merge branch '2.5.x' into 2.6.x
Closes gh-30093
2022-03-07 21:53:44 -08:00
Madhura Bhave 480ccc6175 Clarify devtools documentation when using with build plugins
Closes gh-17851
2022-03-07 21:52:43 -08:00
Madhura Bhave 0e71d80590 Merge branch '2.7.x' into main 2022-03-07 20:23:07 -08:00
Madhura Bhave 88bd0fa794 Merge branch '2.6.x' into 2.7.x 2022-03-07 20:22:57 -08:00
Madhura Bhave 27bf068091 Merge branch '2.5.x' into 2.6.x 2022-03-07 20:22:42 -08:00
Madhura Bhave 9b073c825b Fix checkstyle 2022-03-07 20:22:27 -08:00
Madhura Bhave 524c0e1474 Merge branch '2.7.x' into main 2022-03-07 18:23:50 -08:00
Madhura Bhave b80047c451 Merge branch '2.6.x' into 2.7.x
Closes gh-30092
2022-03-07 18:23:36 -08:00
Madhura Bhave ac04be75f8 Merge branch '2.5.x' into 2.6.x
Closes gh-30091
2022-03-07 18:23:19 -08:00
Madhura Bhave ed8f8d59ef Document how to structure configurations for efficient slice tests
Closes gh-16088
2022-03-07 18:21:12 -08:00
Stephane Nicoll e6f6b2068b Start building against Spring Kafka 3.0.0-M3 snapshots
See gh-30089
2022-03-07 21:09:41 +01:00
Andy Wilkinson c755e0d1f8 Merge branch '2.7.x' 2022-03-04 17:56:40 +00:00
Andy Wilkinson f44e7d9391 Merge branch '2.6.x' into 2.7.x
Closes gh-30071
2022-03-04 17:56:29 +00:00
Andy Wilkinson 2ef055a823 Merge branch '2.5.x' into 2.6.x
Closes gh-30070
2022-03-04 17:56:14 +00:00
Andy Wilkinson 1872af056e Make it clearer that the generated password is not for production use
Closes gh-30061
2022-03-04 17:55:54 +00:00
Andy Wilkinson 68a2f557c7 Merge branch '2.7.x' 2022-03-04 17:27:29 +00:00
Andy Wilkinson bc62775116 Merge branch '2.6.x' into 2.7.x
Closes gh-30069
2022-03-04 17:27:17 +00:00
Andy Wilkinson c872539dea Polish "Clarify actuator security documentation"
See gh-30065
2022-03-04 17:20:25 +00:00
Khan, C M Abdullah 5b7c21e780 Clarify actuator security documentation
See gh-30065
2022-03-04 17:20:17 +00:00
Andy Wilkinson 5ee3fdab77 Polish "Allow @DefaultValue to be used on record components"
See gh-29010
2022-03-04 14:52:20 +00:00
Moritz Halbritter 1793cee00f Start building against Micrometer 2.0.0-M3
See gh-29753
2022-03-04 11:03:22 +01:00
Andy Wilkinson d79fb60398 Merge branch '2.7.x' 2022-03-03 20:39:33 +00:00
Andy Wilkinson d47b56a40e Merge branch '2.6.x' into 2.7.x
Closes gh-30060
2022-03-03 20:39:21 +00:00
Andy Wilkinson fd3248b629 Merge branch '2.5.x' into 2.6.x
Closes gh-30059
2022-03-03 20:39:10 +00:00
Lars Grefer 99a8374249 Use Gradle's configuration avoidance APIs in the reference docs
See gh-30000
2022-03-03 20:38:35 +00:00
Andy Wilkinson bd0829a382 Merge branch '2.7.x' 2022-03-03 14:48:03 +00:00
Andy Wilkinson ff7321cc5a Polish "Support overriding the default SanitizingFunction"
See gh-30006
2022-03-03 14:24:51 +00:00
Andy Wilkinson dd372a6a93 Merge branch '2.7.x' 2022-03-03 14:18:45 +00:00
Andy Wilkinson a5d900d0af Merge branch '2.6.x' into 2.7.x
Closes gh-30054
2022-03-03 14:18:30 +00:00
Andy Wilkinson 1f2da6a341 Document SanitizingFunction
Closes gh-29950
2022-03-03 14:17:28 +00:00
Andy Wilkinson a8a70ecc06 Merge branch '2.7.x' 2022-03-03 12:08:38 +00:00
Andy Wilkinson f4e2d7669b Merge branch '2.6.x' into 2.7.x
Closes gh-30051
2022-03-03 12:08:26 +00:00
Andy Wilkinson d63e609fda Merge branch '2.5.x' into 2.6.x
Closes gh-30050
2022-03-03 12:08:11 +00:00
Andy Wilkinson 7dce772d67 Polish "Update placeholder docs to mention env vars and default values"
See gh-30012
2022-03-03 12:07:38 +00:00
Kirill Marchuk 2644a2b897 Update placeholder docs to mention env vars and default values
See gh-30012
2022-03-03 11:48:50 +00:00
Andy Wilkinson c10a6b7b3e Merge branch '2.7.x' 2022-03-03 11:36:49 +00:00
Andy Wilkinson 1910a3b33e Merge branch '2.6.x' into 2.7.x
Closes gh-30049
2022-03-03 11:31:51 +00:00
Andy Wilkinson d11c5d3bd2 Merge branch '2.5.x' into 2.6.x
Closes gh-30048
2022-03-03 11:27:18 +00:00
wonwoo c2bf0d551b Polish RestController examples
See gh-30027
2022-03-03 11:26:11 +00:00
Andy Wilkinson 3eb61c3203 Merge branch '2.7.x' 2022-03-01 12:37:36 +00:00
Andy Wilkinson 97c47123d5 Merge branch '2.6.x' into 2.7.x
Closes gh-30019
2022-03-01 12:35:57 +00:00
Andy Wilkinson c8b849e2f6 Merge branch '2.5.x' into 2.6.x
Closes gh-30018
2022-03-01 12:32:07 +00:00
Andy Wilkinson 355f80ab98 Add links to Spring Boot for Apache Geode and its documentation
Closes gh-29697
2022-03-01 12:13:58 +00:00
Moritz Halbritter 7897a913a7 Start building against Micrometer 1.9.0-M4 snapshots
Micrometer duplicated the binders in a separate module named
micrometer-binders, and marked the binders in the core module as
deprecated. This commit changes the imports to use the new binders in
the micrometer-binders module. Additionally, the auto-configurations
honor user-supplied beans which use the old binders in the
micrometer-core module.

See gh-30014
2022-03-01 09:20:07 +01:00
Andy Wilkinson 7dc40e95d2 Merge branch '2.7.x' 2022-02-24 12:06:21 +00:00
Andy Wilkinson 664ecbdcc1 Polish "Add DataCouchbaseTest annotation"
See gh-29912
2022-02-24 12:05:36 +00:00
Eddú Meléndez 36e52758a7 Add DataCouchbaseTest annotation
See gh-29912
2022-02-24 11:45:09 +00:00
Andy Wilkinson 4093fff225 Merge branch '2.7.x' 2022-02-24 11:24:23 +00:00
Andy Wilkinson 53292a1f94 Polish "Add DataElasticsearchTest annotation"
See gh-29911
2022-02-24 11:21:24 +00:00
Eddú Meléndez e22f78bc6a Add DataElasticsearchTest annotation
See gh-29911
2022-02-24 10:27:20 +00:00
Phillip Webb 5454e2e26a Merge branch '2.7.x' 2022-02-23 23:02:59 -08:00
Phillip Webb 9f00c3acf5 Polish 2022-02-23 21:44:43 -08:00
Madhura Bhave f9d33ec1e2 Merge branch '2.7.x' into main 2022-02-23 15:10:48 -08:00