root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity
40,609 Commits 23 Branches 345 Tags 288 MiB
Commit Graph

3114 Commits

Author SHA1 Message Date
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
Madhura Bhave 0ecf43dbe2 Merge branch '2.6.x' into 2.7.x 
Closes gh-29979
 2022-02-23 15:10:30 -08:00
Madhura Bhave 894860c177 Merge branch '2.5.x' into 2.6.x 
Closes gh-29978
 2022-02-23 15:10:12 -08:00
Madhura Bhave cc95f734d7 Clarify relation of import path to resultant properties in configtree import data 
Closes gh-29606
 2022-02-23 15:09:42 -08:00
Stephane Nicoll c8b7a17545 Upgrade to Spring Kafka 2.8.3 
Closes gh-29722
 2022-02-23 08:27:24 +01:00
Madhura Bhave 060979d987 Merge branch '2.7.x' into main 2022-02-22 15:51:51 -08:00
Madhura Bhave 64b8610c2e Merge branch '2.6.x' into 2.7.x 
Closes gh-29960
 2022-02-22 15:51:35 -08:00
Madhura Bhave 880db30c67 Merge branch '2.5.x' into 2.6.x 
Closes gh-29959
 2022-02-22 15:49:18 -08:00
Madhura Bhave a70fa80571 Rectify incorrect sanitizing regex example provided in how-to docs 
Closes gh-29951
 2022-02-22 15:44:50 -08:00
Stephane Nicoll f85ad61753 Merge branch '2.7.x' 2022-02-22 08:30:57 +01:00
Stephane Nicoll d4db26dcc1 Merge branch '2.6.x' into 2.7.x 
Closes gh-29935
 2022-02-22 08:30:47 +01:00
Stephane Nicoll db26aff792 Merge branch '2.5.x' into 2.6.x 
Closes gh-29934
 2022-02-22 08:30:38 +01:00
UbaidurRehman1 7b48c51689 Clarify that any property of the environment can be used in a banner 
See gh-29931
 2022-02-22 08:30:07 +01:00
Moritz Halbritter d42f675959 Merge branch '2.7.x' 2022-02-21 10:36:05 +01:00
Moritz Halbritter d7b229d3c7 Rename AutoConfigurationLoader to ImportCandidates 
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports

See gh-29872
 2022-02-21 10:34:38 +01:00
Moritz Halbritter 829ff4d03f Merge branch '2.7.x' 2022-02-18 14:49:24 +01:00
Moritz Halbritter 2afa02c856 Fix missing test slice configuration 
Test slices are now longer registered in spring.factories, but
TestSliceMetadata still looked there for them to generate documentation.
Fixed this so that TestSliceMetadata now looks in the right places for
test slices.

See gh-29873
 2022-02-18 14:49:07 +01:00
Moritz Halbritter ec31278f1e Add Moritz to the doc authors list 2022-02-17 14:57:08 +01:00
Moritz Halbritter 303979fb65 Merge branch '2.7.x' 2022-02-17 09:17:35 +01:00
Moritz Halbritter 7d68b58c8f Load auto-configurations from META-INF/spring-boot 
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.

Adapts the AutoConfigurationImportSelector to use the new loader.

Adapts the ImportAutoConfigurationImportSelector to use the new loader.

Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.

Updates the documentation for auto-configurations and test slices.

Closes gh-29872
 2022-02-17 09:17:23 +01:00
Phillip Webb ff4b92a3ba Update copyright year of changed files 2022-02-16 20:44:54 -08:00
Phillip Webb 0bf7cda230 Merge branch '2.7.x' 2022-02-16 20:30:45 -08:00
Phillip Webb a40637cb6d Merge branch '2.6.x' into 2.7.x 2022-02-16 20:30:32 -08:00
Phillip Webb 560d576a02 Polish 2022-02-16 20:30:14 -08:00
Phillip Webb f4b849ec95 Merge branch '2.7.x' 2022-02-16 20:27:18 -08:00
Phillip Webb 26512f8ac6 Merge branch '2.6.x' into 2.7.x 2022-02-16 20:24:59 -08:00
Phillip Webb 5b4ec32645 Merge branch '2.5.x' into 2.6.x 2022-02-16 18:56:12 -08:00
Phillip Webb c86b1330cf Update copyright year of changed files 2022-02-16 17:56:19 -08:00
Phillip Webb 9ab1b669d0 Polish 2022-02-16 17:56:07 -08:00
Madhura Bhave bf1ed5f2f8 Update copyright header on changed files 2022-02-16 14:24:22 -08:00
Madhura Bhave e20ee87b5d Remove explicit @ConstructorBinding on type 
See gh-23216
 2022-02-16 14:23:33 -08:00
Madhura Bhave 44b88cc88c Allow @ConstructorBinding to be optional 
This commit makes @ConstructorBinding optional for a type
that has a single parameterized constructor. An @Autowired annotation
on any of the constructors indicates that the type should not be constructor
bound.

Since @ConstructorBinding is now deduced for a single parameterized constructor,
the annotation is no longer needed at the type level.

Closes gh-23216
 2022-02-16 13:47:26 -08:00
Moritz Halbritter fdb1010cbc Migrate auto-configurations to @AutoConfiguration 
Closes gh-29871
 2022-02-16 15:48:27 +01:00
Moritz Halbritter 8e99788fc8 Migrate auto-configurations to @AutoConfiguration 
Closes gh-29871
 2022-02-16 13:55:16 +01:00
Moritz Halbritter cb08065ece Merge branch '2.7.x' 2022-02-16 11:55:46 +01:00
Moritz Halbritter 100f80d073 Add @AutoConfiguration annotation 
This annotation can be used to mark auto-configurations with a dedicated
annotation. Under the hood, it's a standard @Configuration with
proxyBeanMethods set to false.

Closes gh-29870
 2022-02-16 11:53:46 +01:00
Andy Wilkinson 638b5a9256 Merge branch '2.7.x' 2022-02-14 14:58:21 +00:00
Andy Wilkinson 15f4b6c263 Merge branch '2.6.x' into 2.7.x 
Closes gh-29808
 2022-02-14 14:48:49 +00:00
Andy Wilkinson 64e24a0e11 Merge branch '2.5.x' into 2.6.x 
Closes gh-29807
 2022-02-14 14:48:30 +00:00
dreis2211 39394b9c2b Link to Integration section of the appendix for Kafka properties 
See gh-29758
 2022-02-14 14:25:40 +00:00
Henning Poettker 7d83dfc0c7 Reinstate support for H2 Console 
See gh-29755

Closes gh-29755
 2022-02-14 13:24:57 +00:00
Stephane Nicoll 15e14e23c9 Start building against Spring Kafka 2.8.3 snapshots 
See gh-29759
 2022-02-14 08:22:13 +01:00
Andy Wilkinson 2dcd5e12ce Merge branch '2.7.x' 2022-02-11 15:37:45 +00:00
Andy Wilkinson 76510fae48 Merge branch '2.6.x' into 2.7.x 
Closes gh-29752
 2022-02-11 15:37:32 +00:00
Andy Wilkinson 09f51f38d6 Update docs to reflect use of CamelCaseToUnderscoresNamingStrategy 
Closes gh-29743
 2022-02-11 15:37:10 +00:00
Moritz Halbritter 44beceffaf Merge branch '2.7.x' 2022-02-10 13:39:22 +01:00
Moritz Halbritter 96ce8d842e Merge branch '2.6.x' into 2.7.x 
Closes gh-29729
 2022-02-10 13:38:50 +01:00
Moritz Halbritter 44ff29c4d4 Merge branch '2.5.x' into 2.6.x 
Closes gh-29728
 2022-02-10 13:28:15 +01:00
Moritz Halbritter 096ba72a39 Add documentation for WebMvc.fn 
See gh-29683
 2022-02-10 13:14:34 +01:00
Andy Wilkinson 067a8dd3ec Raise the minimum supported version of Gradle to 7.4 
Closes gh-29674
 2022-02-09 15:02:17 +00:00
Andy Wilkinson 819f40f81e Merge branch '2.7.x' 2022-02-09 13:39:28 +00:00
Andy Wilkinson e4b074f07b Merge branch '2.6.x' into 2.7.x 2022-02-09 13:37:50 +00:00
Andy Wilkinson f672a20f90 Polish appendix cross-references 
See gh-29689
 2022-02-09 13:24:05 +00:00
Andy Wilkinson 3b5e7ee0a8 Merge branch '2.7.x' 2022-02-09 12:19:21 +00:00
Andy Wilkinson 7e8d499333 Merge branch '2.6.x' into 2.7.x 
Closes gh-29690
 2022-02-09 12:18:57 +00:00
Andy Wilkinson 093e8a524d Merge branch '2.5.x' into 2.6.x 
Closes gh-29689
 2022-02-09 12:18:35 +00:00
Moritz Halbritter 52d9ba58d8 Move appendix subsections under appendix section 
This involved a small code change to the generated configuration
properties snippets. The section id has to start with
'appendix.', otherwise the section-id asciidoctor extension
complains. To ensure that the anchors that are derived from the
section IDs remain backwards compatible, the anchor-rewrite
properties have been updated.

See gh-29667
 2022-02-09 12:04:05 +00:00
Phillip Webb ce6b12a024 Merge branch '2.7.x' 2022-02-05 10:16:48 -08:00
Phillip Webb 26dd6b826c Merge branch '2.6.x' into 2.7.x 2022-02-05 10:16:19 -08:00
Phillip Webb b3a82c9de6 Merge branch '2.5.x' into 2.6.x 2022-02-05 10:16:03 -08:00
Phillip Webb 52f1799c20 Polish formatting 2022-02-05 10:15:43 -08:00
Stephane Nicoll 3b4832445b Merge branch '2.7.x' 2022-02-05 14:02:00 +01:00
Stephane Nicoll 098a57affb Upgrade to R2DBC Borca-RELEASE 
See gh-28524
 2022-02-05 13:37:20 +01:00
Andy Wilkinson 977a0a8356 Merge branch '2.7.x' 2022-02-05 10:07:41 +00:00
Andy Wilkinson 2fec7b8562 Only use Kotlin 1.6 API and language versions in docs project 
To preserve our existing Kotlin 1.3 baseline, we should compile our
Kotlin code with Kotlin 1.3 API and language versions. At the same
time, we want our documentation to use modern Kotlin. This commit
restores the 1.3 convention and overrides it to 1.6 in the docs
project. This maintains our Kotlin 1.3 baseline while also allowing
the Kotlin code examples to use 1.6 API and language features.

Closes gh-29654
 2022-02-05 09:54:00 +00:00
Phillip Webb 4f8558f568 Upgrade Kotlin docs samples to Jakarta EE 9 
See gh-29499
 2022-02-04 21:51:21 -08:00
Phillip Webb a3615f4f77 Merge branch '2.7.x' 2022-02-04 20:04:28 -08:00
Phillip Webb d212243eef Polish 'Add Kotlin alternatives to Java documentation samples' 
See gh-29499
 2022-02-04 19:57:21 -08:00
Pavel Semyonov 197afff1d6 Add Kotlin alternatives to Java documentation samples 
See gh-29499
 2022-02-04 19:56:13 -08:00
Phillip Webb a301d8ed5d Merge branch '2.7.x' 2022-02-04 19:50:54 -08:00
Phillip Webb 0e906dc6e2 Use convention based code imports 
Closes gh-29647
 2022-02-04 19:46:44 -08:00
Phillip Webb a6b7ae2110 Merge branch '2.7.x' 2022-02-04 19:45:01 -08:00
Phillip Webb 71695d2162 Merge branch '2.6.x' into 2.7.x 
Closes gh-29658
 2022-02-04 19:44:31 -08:00
Phillip Webb 05c58a18df Merge branch '2.5.x' into 2.6.x 
Closes gh-29657
 2022-02-04 19:44:05 -08:00
Phillip Webb 12a33a2eaf Upgrade to spring-asciidoctor-backends 0.0.3 
Closes gh-29656
 2022-02-04 19:43:47 -08:00
Phillip Webb 50047e6d8c Merge branch '2.7.x' 2022-02-04 16:10:50 -08:00
Phillip Webb 6c74e24147 Update copyright year of changed files 2022-02-04 16:09:35 -08:00
Phillip Webb b9e037b88f Polish 2022-02-04 16:09:22 -08:00
Phillip Webb 0083b767e6 Merge branch '2.7.x' 2022-02-03 22:53:15 -08:00
Phillip Webb 4919683354 Use consistent packages for doc samples 
Closes gh-29646
 2022-02-03 22:50:47 -08:00
Phillip Webb a282f912e6 Organize imports 
Organize imports according to updated checkstyle rules.
 2022-02-02 19:16:13 -08:00
Phillip Webb 501d174db0 Merge branch '2.7.x' 2022-02-02 10:38:46 -08:00
Phillip Webb ce08b519b1 Merge branch '2.6.x' into 2.7.x 2022-02-02 10:37:55 -08:00
Phillip Webb 50e0e28155 Merge branch '2.5.x' into 2.6.x 2022-02-02 10:37:32 -08:00
Phillip Webb 5975cdc5ed Polish formatting 2022-02-02 10:35:10 -08:00
Andy Wilkinson f88b502f7e Remove support for image banners 
Closes gh-28883
 2022-02-02 14:40:24 +00:00
Stephane Nicoll e749f30642 Merge branch '2.7.x' 2022-02-01 16:35:39 +01:00
Stephane Nicoll 9028ab33f2 Merge branch '2.6.x' into 2.7.x 
Closes gh-29617
 2022-02-01 16:35:28 +01:00
Stephane Nicoll d130819fb4 Merge branch '2.5.x' into 2.6.x 
Closes gh-29616
 2022-02-01 16:35:19 +01:00
Stephane Nicoll 5fe6176966 Polish "Add a note on early init with @ConditionalOnExpression" 
See gh-29276
 2022-02-01 16:32:27 +01:00
Mihail Cornescu fce3cd1684 Add a note on early init with @ConditionalOnExpression 
See gh-29276
 2022-02-01 16:24:13 +01:00
Stephane Nicoll 3a65d7b01e Merge branch '2.7.x' 2022-01-31 16:45:11 +01:00
Stephane Nicoll 19e671dd7b Merge branch '2.6.x' into 2.7.x 2022-01-31 16:45:04 +01:00
Stephane Nicoll 787a2f3d9b Merge branch '2.5.x' into 2.6.x 2022-01-31 16:44:39 +01:00
Stephane Nicoll ab0b29cb53 Polish "Make classloader customization easier to discover" 
See gh-29438
 2022-01-31 16:38:38 +01:00
Andreas Ahlenstorf 96f48db2ab Make classloader customization easier to discover 
See gh-29438
 2022-01-31 16:28:28 +01:00
Andy Wilkinson 191333773f Restore support for REST Assured 
Closes gh-29543
 2022-01-24 13:46:48 +00:00
Stephane Nicoll 5c78c2288c Merge branch '2.7.x' 2022-01-24 09:42:06 +01:00
Stephane Nicoll f9029a3584 Merge branch '2.6.x' into 2.7.x 
Closes gh-29540
 2022-01-24 09:41:56 +01:00
Stephane Nicoll e36a56f014 Merge branch '2.5.x' into 2.6.x 
Closes gh-29539
 2022-01-24 09:41:35 +01:00
Axel Fontaine 48817587e6 Rename Boxfuse to CloudCaptain 
See gh-29523
 2022-01-24 09:35:44 +01:00