Commit Graph

17173 Commits

Author SHA1 Message Date
Andy Wilkinson 685d2d4391 Polish
See gh-30152
2022-03-25 15:15:02 +00:00
Guirong Hu df417bf317 Simplify registration of Jackson mixin types
See gh-30152
2022-03-25 15:15:02 +00:00
Moritz Halbritter e431842668 Merge branch '2.7.x' 2022-03-25 14:56:49 +01:00
Moritz Halbritter 45f393b76b Merge branch '2.6.x' into 2.7.x
Closes gh-30437
2022-03-25 14:56:01 +01:00
Moritz Halbritter c003d5b533 Merge branch '2.5.x' into 2.6.x
Closes gh-30436
2022-03-25 14:55:31 +01:00
Moritz Halbritter 0ff8119a1b Sort entries in additional-spring-configuration metadata alphabetically
Closes gh-30434
2022-03-25 14:54:39 +01: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 3de024594f Merge branch '2.7.x' 2022-03-25 12:06:16 +00:00
Andy Wilkinson 64888b0deb Merge branch '2.6.x' into 2.7.x
Closes gh-30433
2022-03-25 12:03:24 +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 c7bf816cf7 Start building against Spring REST Docs 3.0.0-M3 snapshots
See gh-30424
2022-03-25 10:06:33 +00:00
Phillip Webb 7e98ee8cf6 Upgrade to SendGrid 4.9.1
Closes gh-30420
2022-03-24 13:38:27 -07:00
Phillip Webb aac5afebf3 Upgrade to MongoDB 4.5.1
Closes gh-30419
2022-03-24 13:38:25 -07:00
Phillip Webb fd0fce6e3a Upgrade to AspectJ 1.9.9
Closes gh-30418
2022-03-24 13:38:22 -07:00
Phillip Webb dcfaadfb88 Upgrade to SendGrid 4.9.1
Closes gh-30417
2022-03-24 11:04:45 -07:00
Phillip Webb 123e22afb0 Upgrade to MongoDB 4.5.1
Closes gh-30416
2022-03-24 11:04:39 -07:00
Moritz Halbritter 47bf218bd2 Add prohibit clauses to shut up bomr 2022-03-24 15:18:19 +01:00
Andy Wilkinson 5702f9ebc3 Merge branch '2.7.x' 2022-03-23 20:16:51 +00:00
Andy Wilkinson 5d55c663ba Allow spring.data.mongodb.uri to take precedence over separate props
Closes gh-30067
2022-03-23 20:15:04 +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 038428cb1a Merge branch '2.7.x' 2022-03-23 15:29:23 +00:00
Andy Wilkinson b911530c31 Merge branch '2.6.x' into 2.7.x
Closes gh-30393
2022-03-23 15:29:09 +00:00
Andy Wilkinson 9c128f1acc Merge branch '2.5.x' into 2.6.x
Closes gh-30392
2022-03-23 15:28:56 +00:00
Andy Wilkinson 73d9e0e0ed Fix equals when adapt removes trailing characters from element
Closes gh-30317
2022-03-23 14:55:00 +00:00
Stephane Nicoll 1f0025b7df Merge branch '2.7.x' 2022-03-23 15:50:33 +01:00
Stephane Nicoll b70c409178 Upgrade to Selenium HtmlUnit 3.60.0
Closes gh-30391
2022-03-23 15:32:00 +01:00
Stephane Nicoll d7ca7763da Upgrade to HtmlUnit 2.60.0
Closes gh-30390
2022-03-23 15:31:57 +01:00
Stephane Nicoll c96b1caab0 Upgrade to Spring Batch 5.0.0-M2
Closes gh-30232
2022-03-23 14:54:12 +01:00
Andy Wilkinson 77e6279d03 Merge branch '2.7.x' 2022-03-23 12:11:24 +00:00
Andy Wilkinson 3255da23a2 Merge branch '2.6.x' into 2.7.x
Closes gh-30388
2022-03-23 12:11:13 +00:00
Andy Wilkinson c739831087 Merge branch '2.5.x' into 2.6.x
Closes gh-30387
2022-03-23 12:11:02 +00:00
Andy Wilkinson d8cf332c2e Document default value of spring.thymeleaf.reactive.media-types
Closes gh-30280
2022-03-23 12:09:48 +00:00
Andy Wilkinson 3ee44ca0b0 Merge branch '2.6.x' into 2.7.x
Closes gh-30386
2022-03-23 11:47:53 +00:00
Andy Wilkinson f378627f94 Merge branch '2.5.x' into 2.6.x
Closes gh-30385
2022-03-23 11:45:31 +00:00
Andy Wilkinson 8d882fa09b Fix possible duplicate templateEngine bean in Thymeleaf auto-config
Closes gh-30384
2022-03-23 11:44:59 +00:00
Andy Wilkinson e3b2fb5deb Merge branch '2.7.x' 2022-03-23 11:18:28 +00:00
Andy Wilkinson bcb71dfd1b Merge branch '2.6.x' into 2.7.x
Closes gh-30383
2022-03-23 11:18:04 +00:00
Andy Wilkinson 1244c429a6 Merge branch '2.5.x' into 2.6.x
Closes gh-30382
2022-03-23 11:17:36 +00:00
Andy Wilkinson e927cd71dd Clarify type matching performed by MockBean and SpyBean
Closes gh-28656
2022-03-23 11:17:07 +00:00
Andy Wilkinson 3410dd67d0 Merge branch '2.7.x' 2022-03-23 09:58:56 +00:00
Andy Wilkinson 47540eec61 Align default indices options with Spring Data Elasticsearch
Closes gh-30378
2022-03-23 09:39:05 +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
Andy Wilkinson 24aa4070c9 Merge pull request #30349 from hpoettker
* gh-30349:
  Fix links to Spring Security Reference Guide

Closes gh-30349
2022-03-23 09:35:58 +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 724ba69a6d Upgrade to Spring Integration 6.0.0-M2
Closes gh-30204
2022-03-23 08:08:01 +01:00
Stephane Nicoll dc7c1f246f Upgrade to Spring Integration 5.5.10
Closes gh-30193
2022-03-23 08:07:11 +01:00
Stephane Nicoll 589804000b Upgrade to Spring Integration 5.5.10
Closes gh-30183
2022-03-23 08:06:25 +01:00
Stephane Nicoll acdfa31f5a Upgrade to Spring Integration 5.5.10
Closes gh-30175
2022-03-23 08:05:45 +01:00
Andy Wilkinson 48f8dd28ac Upgrade to Spring AMQP 3.0.0-M2
Closes gh-30201
2022-03-22 20:34:40 +00:00
Andy Wilkinson c4425598cf Merge branch '2.7.x' 2022-03-22 20:13:16 +00:00
Andy Wilkinson 79ee53a587 Merge branch '2.6.x' into 2.7.x
Closes gh-30377
2022-03-22 20:13:04 +00:00
Andy Wilkinson f063da30d2 Merge branch '2.5.x' into 2.6.x
Closes gh-30376
2022-03-22 20:12:48 +00:00
Andy Wilkinson a8bddeb9cf Remove redundant setting of refresh policy
Closes gh-30375
2022-03-22 20:12:09 +00:00
Andy Wilkinson a9b6ab77ea Upgrade to Spring Security 6.0.0-M3
Closes gh-30202
2022-03-22 19:22:22 +00:00
Andy Wilkinson 219d946e33 Upgrade to Spring for GraphQL 1.0.0-M6
Closes gh-29637
2022-03-22 17:30:21 +00:00
Andy Wilkinson 38e3c777b7 Upgrade to Spring Kafka 3.0.0-M3
Closes gh-30089
2022-03-22 17:18:05 +00:00
Andy Wilkinson 0817a46be3 Upgrade to Spring REST Docs 3.0.0-M2
Closes gh-29544
2022-03-22 17:14:58 +00:00
Stephane Nicoll c92cf8eda0 Upgrade to Spring HATEOAS 2.0.0-M2
Closes gh-30371
2022-03-22 16:38:06 +01:00
Stephane Nicoll 9dfc2131b9 Upgrade to RxJava3 3.1.4
Closes gh-30370
2022-03-22 16:38:04 +01:00
Stephane Nicoll f30b747138 Upgrade to jOOQ 3.16.5
Closes gh-30368
2022-03-22 16:37:58 +01:00
Stephane Nicoll 6a5a2f6356 Upgrade to Jetty 11.0.8
Closes gh-30367
2022-03-22 16:37:56 +01:00
Stephane Nicoll c063210447 Upgrade to Jetty Reactive HTTPClient 3.0.5
Closes gh-30366
2022-03-22 16:37:54 +01:00
Stephane Nicoll a3b365baba Upgrade to Jetty EL 10.0.14
Closes gh-30365
2022-03-22 16:37:52 +01:00
Stephane Nicoll 0848d6953f Upgrade to Hibernate Validator 7.0.4.Final
Closes gh-30364
2022-03-22 16:37:49 +01:00
Stephane Nicoll 32411f2b11 Upgrade to Caffeine 3.0.6
Closes gh-30363
2022-03-22 16:37:47 +01:00
Stephane Nicoll bafeacf3d8 Upgrade to AspectJ 1.9.8
Closes gh-30362
2022-03-22 16:37:45 +01:00
Stephane Nicoll 041371895c Upgrade to Spring Data 2022.0.0-M3
Closes gh-30361
2022-03-22 16:21:01 +01:00
Andy Wilkinson 91fe362e94 Merge branch '2.6.x' into 2.7.x
Closes gh-30352
2022-03-21 20:44:51 +00:00
Andy Wilkinson f53c5178c3 Upgrade to Spring Kafka 2.8.4
Closes gh-30181
2022-03-21 20:44:19 +00:00
Andy Wilkinson b2c52d632a Upgrade to Spring Kafka 2.7.12
Closes gh-30351
2022-03-21 20:23:37 +00:00
Andy Wilkinson 1185f2f58b Merge branch '2.6.x' into 2.7.x
Closes gh-30189
2022-03-21 20:22:05 +00:00
Andy Wilkinson b2e8087f3c Upgrade to Spring AMQP 2.4.3
Closes gh-30180
2022-03-21 20:21:42 +00:00
Andy Wilkinson 95f561afc0 Upgrade to Spring AMQP 2.5.11
Closes gh-30173
2022-03-21 20:20:23 +00:00
Andy Wilkinson bb969384fc Merge branch '2.6.x' into 2.7.x
Closes gh-30192
2022-03-21 20:18:50 +00:00
Andy Wilkinson 72f6565863 Merge branch '2.5.x' into 2.6.x
Closes gh-30182
2022-03-21 20:18:31 +00:00
Andy Wilkinson 4b17214e21 Upgrade to Spring WS 3.1.3
Closes gh-30174
2022-03-21 20:18:05 +00:00
Andy Wilkinson 0e1b64dda1 Upgrade to Spring WS 4.0.0-M2
Closes gh-30203
2022-03-21 20:16:23 +00:00
Andy Wilkinson 24cea36f1b Upgrade to Spring Security 5.7.0-M3
Closes gh-30191
2022-03-21 20:13:09 +00:00
Andy Wilkinson 670b498190 Upgrade to Spring Data 2022.0.0-M2
Closes gh-30200
2022-03-21 18:20:18 +00:00
Andy Wilkinson 9aaa5bca7a Upgrade to Spring Data 2021.2.0-M4
Closes gh-30185
2022-03-21 18:19:12 +00:00
Andy Wilkinson 4bc1463439 Upgrade to Spring Data 2021.1.3
Closes gh-30179
2022-03-21 18:17:14 +00:00
Andy Wilkinson 19b9a0adb6 Upgrade to Spring Data 2021.0.10
Closes gh-30172
2022-03-21 18:15:31 +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 7da035b12d Merge branch '2.7.x' 2022-03-21 13:35:21 +01:00
Stephane Nicoll 7f52820e17 Update copyright year of changed files
See gh-30236
2022-03-21 13:30:46 +01:00
izeye 455e0bfa08 Polish StandardAnnotationCustomizableTypeExcludeFilters
See gh-30236
2022-03-21 13:30:07 +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
Brian Clozel bae62c39a9 Adapt to latest Spring GraphQL changes
This commit adapts to the latest Spring GraphQL changes, renaming
`GraphQlService` to `ExecutionGraphQlService` as well as the
`WebInterceptor` contract to `WebGraphQlHandlerInterceptor`.

See spring-projects/spring-graphql#332
2022-03-21 11:12:59 +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
Jens Wilke 774f61fcb5 Add support for cache2k in memory caching
See gh-28498
2022-03-21 08:22:19 +01:00
Stephane Nicoll 5db1547da7 Merge branch '2.7.x' 2022-03-21 07:42:00 +01:00
Stephane Nicoll da4adcd7b0 Upgrade to Micrometer 1.9.0-M4
Closes gh-30014
2022-03-21 07:38:57 +01:00
Stephane Nicoll a6dfaeecb9 Upgrade to Lettuce 6.1.8.RELEASE
Closes gh-30342
2022-03-21 07:37:23 +01:00
Stephane Nicoll 11dc4e0787 Upgrade to Embedded Mongo 3.4.3
Closes gh-30341
2022-03-21 07:37:21 +01:00
Stephane Nicoll 118964893d Upgrade to R2DBC Bom Arabba-SR13
Closes gh-30340
2022-03-21 07:33:12 +01:00
Stephane Nicoll 3109a18698 Upgrade to Lettuce 6.1.8.RELEASE
Closes gh-30339
2022-03-21 07:33:10 +01:00
Stephane Nicoll dfa95a238d Upgrade to Hibernate 5.6.7.Final
Closes gh-30338
2022-03-21 07:33:08 +01:00
Stephane Nicoll 10ffd01205 Upgrade to R2DBC Bom Arabba-SR13
Closes gh-30337
2022-03-21 07:30:33 +01:00
Stephane Nicoll 1eb8bcaa49 Upgrade to Lettuce 6.1.8.RELEASE
Closes gh-30336
2022-03-21 07:30:31 +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
Yixiang Zhao effd70ea21 Add reference to Casdoor Spring Boot Starter
See gh-30220
2022-03-19 09:30:06 +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
Scott Frederick cabfb98a89 Merge branch '2.7.x' 2022-03-18 16:52:47 -05:00
Scott Frederick a14f3ed200 Use a ConfigurationProperties class for JMX properties
Closes gh-30327
2022-03-18 16:32:13 -05:00
Scott Frederick e5a09b3b31 Apply unique-names consistently in JmxAutoConfiguration
Ensure that the `spring.jmx.unique-names` property is applied to the
auto-configured `MBeanExporter` as well as the `ObjectNamingStrategy`.

Fixes gh-29968
2022-03-18 16:32:13 -05:00
Stephane Nicoll e49de1f2fb Upgrade to Jackson Bom 2.13.2
Closes gh-30242
2022-03-18 18:34:09 +01:00
Stephane Nicoll 1169c6df16 Upgrade to Neo4j Java Driver 4.4.5
Closes gh-30326
2022-03-18 18:34:09 +01:00
Stephane Nicoll 704a2b7795 Add additional bomr checks 2022-03-18 18:28:01 +01:00
Stephane Nicoll af15a18e02 Upgrade to Tomcat 10.0.18
Closes gh-30320
2022-03-18 17:06:51 +01:00
Andy Wilkinson 12d9127d3b Merge branch '2.7.x' 2022-03-18 15:56:29 +00:00
Andy Wilkinson c2d7e21312 Merge branch '2.6.x' into 2.7.x
Closes gh-30322
2022-03-18 15:56:13 +00:00
Andy Wilkinson 26719a211b Merge branch '2.5.x' into 2.6.x
Closes gh-30321
2022-03-18 15:55:39 +00:00
Andy Wilkinson 1669062231 Apply server.tomcat.keep-alive-timeout to HTTP/2
Closes gh-30267
2022-03-18 15:38:27 +00:00
Stephane Nicoll 39b6f2bd7d Merge branch '2.7.x' 2022-03-18 15:08:28 +01:00
Stephane Nicoll 2ab0ce3ea7 Upgrade to Neo4j Java Driver 4.4.5
Closes gh-30303
2022-03-18 14:52:46 +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 f3b312f0b4 Upgrade to Thymeleaf Layout Dialect 3.1.0
Closes gh-30312
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
Andy Wilkinson e60001fb16 Adapt to deprecations in Spring Data Redis
See gh-30200
2022-03-18 11:16:55 +00:00
Stephane Nicoll 2fbb36bd04 fixup! Upgrade to Flyway 8.5.4 2022-03-18 10:57:07 +01:00
Stephane Nicoll 1e55ef2f97 Upgrade to Versions Maven Plugin 2.10.0
Closes gh-30315
2022-03-18 09:49:28 +01:00
Stephane Nicoll e79073bee3 Upgrade to UnboundID LDAPSDK 6.0.4
Closes gh-30314
2022-03-18 09:49:28 +01:00
Stephane Nicoll 3d011fc2e6 Upgrade to Tomcat 9.0.60
Closes gh-30313
2022-03-18 09:49:28 +01:00
Stephane Nicoll 426f239d2c Upgrade to Spring Retry 1.3.2
Closes gh-30311
2022-03-18 09:49:28 +01:00
Stephane Nicoll 0946f28dcd Upgrade to SendGrid 4.9.0
Closes gh-30310
2022-03-18 09:49:28 +01:00
Stephane Nicoll c70be97fc4 Upgrade to Selenium HtmlUnit 3.59.0
Closes gh-30309
2022-03-18 09:49:28 +01:00
Stephane Nicoll 6487b809fe Upgrade to Rabbit Stream Client 0.5.0
Closes gh-30308
2022-03-18 09:49:27 +01:00
Stephane Nicoll 8b27263eee Upgrade to R2DBC Bom Borca-SR1
Closes gh-30307
2022-03-18 09:49:27 +01:00
Stephane Nicoll f129a733a4 Upgrade to Netty 4.1.75.Final
Closes gh-30306
2022-03-18 09:49:27 +01:00
Stephane Nicoll b0f6166e5e Upgrade to Logback 1.2.11
Closes gh-30305
2022-03-18 09:49:27 +01:00
Stephane Nicoll d8c231a1d1 Upgrade to Mockito 4.4.0
Closes gh-30302
2022-03-18 09:18:01 +01:00
Stephane Nicoll 717f8739c5 Upgrade to Maven Dependency Plugin 3.3.0
Closes gh-30301
2022-03-18 09:17:59 +01:00
Stephane Nicoll 0b20b99f6e Upgrade to Maven Compiler Plugin 3.10.1
Closes gh-30300
2022-03-18 09:17:57 +01:00
Stephane Nicoll f8a6efb15e Upgrade to Log4j2 2.17.2
Closes gh-30299
2022-03-18 09:17:55 +01:00
Stephane Nicoll 154195d9a2 Upgrade to Liquibase 4.9.0
Closes gh-30298
2022-03-18 09:17:53 +01:00
Stephane Nicoll aa39c5a012 Upgrade to Jackson Bom 2.13.2
Closes gh-30297
2022-03-18 09:17:50 +01:00
Stephane Nicoll 20dd6463a3 Upgrade to Infinispan 13.0.8.Final
Closes gh-30296
2022-03-18 09:17:48 +01:00
Stephane Nicoll fa6bcd5d6c Upgrade to HtmlUnit 2.59.0
Closes gh-30295
2022-03-18 09:17:46 +01:00
Stephane Nicoll d40465260d Upgrade to Hibernate Validator 6.2.3.Final
Closes gh-30294
2022-03-18 09:17:42 +01:00
Stephane Nicoll 3075794175 Upgrade to Hibernate 5.6.7.Final
Closes gh-30293
2022-03-18 09:17:39 +01:00
Stephane Nicoll 00cba28390 Upgrade to Hazelcast 5.1.1
Closes gh-30292
2022-03-18 09:17:36 +01:00
Stephane Nicoll 1c11ae8a7d Upgrade to Groovy 3.0.10
Closes gh-30291
2022-03-18 09:17:33 +01:00
Stephane Nicoll ca89dd58f4 Upgrade to Flyway 8.5.4
Closes gh-30290
2022-03-18 09:17:31 +01:00
Stephane Nicoll 41150f1ef4 Upgrade to Elasticsearch 7.17.1
Closes gh-30289
2022-03-18 09:17:28 +01:00
Stephane Nicoll bf477700f6 Upgrade to Ehcache3 3.10.0
Closes gh-30288
2022-03-18 09:17:26 +01:00
Stephane Nicoll d521a7bb1b Upgrade to Dropwizard Metrics 4.2.9
Closes gh-30287
2022-03-18 09:17:24 +01:00
Stephane Nicoll 046afae1aa Upgrade to Couchbase Client 3.2.6
Closes gh-30286
2022-03-18 09:17:22 +01:00
Stephane Nicoll 5b44ad15f7 Upgrade to Cassandra Driver 4.14.0
Closes gh-30285
2022-03-18 09:17:20 +01:00
Stephane Nicoll 8732ac708d Upgrade to Awaitility 4.2.0
Closes gh-30284
2022-03-18 09:17:18 +01:00
Andy Wilkinson f693d7dfad Merge branch '2.7.x' 2022-03-17 20:12:12 +00:00
Andy Wilkinson b787ea4802 Add property for media types of reactive Mustache views
Closes gh-28858
2022-03-17 20:10:37 +00:00
Andy Wilkinson 36f24cf6bb Merge branch '2.7.x' 2022-03-17 19:31:59 +00:00
Andy Wilkinson 3a5a748ec0 Rework Mustache properties to show which are Servlet-specific
Closes gh-30273
2022-03-17 19:25:07 +00:00
Andy Wilkinson 6625a77f64 Merge branch '2.7.x' 2022-03-17 17:51:43 +00:00
Andy Wilkinson 2ba064c855 Merge branch '2.6.x' into 2.7.x
Closes gh-30277
2022-03-17 17:51:28 +00:00
Andy Wilkinson 3c117ca2d4 Merge branch '2.5.x' into 2.6.x
Closes gh-30276
2022-03-17 17:50:58 +00:00
Andy Wilkinson 2b75ea5fb8 Improve testing of spring.mustache.* properties
Closes gh-30274
2022-03-17 17:40:22 +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
Stephane Nicoll 92e5e91623 Start building against Spring Batch 5.0.0-M2 snapshots
See gh-30232
2022-03-17 15:41:18 +01:00
Stephane Nicoll 5c944bf5b8 Upgrade to Spring Framework 6.0.0-M3
Closes gh-29957
2022-03-17 14:40:02 +01:00
Moritz Halbritter 29746e1029 Upgrade to Micrometer 2.0.0-M3
Closes gh-29753
2022-03-17 14:36:02 +01:00
Stephane Nicoll 5c197ceae0 Upgrade to Spring Framework 5.3.17
Closes gh-30188
2022-03-17 14:33:26 +01:00
Stephane Nicoll c7e788bd91 Upgrade to Micrometer 1.8.4
Closes gh-30178
2022-03-17 14:32:46 +01:00
Stephane Nicoll 947fee1663 Upgrade to Spring Framework 5.3.17
Closes gh-30177
2022-03-17 14:32:08 +01:00
Stephane Nicoll 9824d40b14 Upgrade to Micrometer 1.7.10
Closes gh-30171
2022-03-17 14:26:09 +01:00
Stephane Nicoll 0bd50fedbc Upgrade to Spring Framework 5.3.17
Closes gh-30170
2022-03-17 14:25:23 +01:00
Andy Wilkinson 625ccc7c11 Merge branch '2.7.x' 2022-03-17 12:38:09 +00:00
Andy Wilkinson 4b318a76fa Merge branch '2.6.x' into 2.7.x
Closes gh-30271
2022-03-17 12:37:41 +00:00
Andy Wilkinson 0facba1f88 Merge branch '2.5.x' into 2.6.x
Closes gh-30270
2022-03-17 12:37:23 +00:00
Andy Wilkinson f342cec5cd Relocate ConnectorStartFailureAnalyzer to remove package tangle
Closes gh-30268
2022-03-17 11:48:49 +00:00
Stephane Nicoll 1784fc19bb Adapt mock to API change 2022-03-17 10:34:22 +01:00
Andy Wilkinson f3f5a87af4 Merge branch '2.7.x' 2022-03-16 19:42:36 +00:00
Andy Wilkinson fee3b89b1b Merge branch '2.6.x' into 2.7.x
Closes gh-30257
2022-03-16 19:42:14 +00:00
Andy Wilkinson cdaafce614 Merge branch '2.5.x' into 2.6.x
Closes gh-30256
2022-03-16 19:41:14 +00:00
Andy Wilkinson 7f036e35fd Make MustacheViewResolvers conditional onspring.mustache.enabled
Closes gh-30250
2022-03-16 19:09:13 +00:00
Stephane Nicoll 626cfff940 Merge branch '2.6.x' into 2.7.x 2022-03-16 18:17:27 +01:00
Stephane Nicoll 8e7f7d3c76 Merge branch '2.5.x' into 2.6.x 2022-03-16 18:17:17 +01:00
Stephane Nicoll b97a3ae07a Revert unnecessary suppress warnings
See https://github.com/spring-projects/spring-framework/issues/28079
2022-03-16 18:10:58 +01:00
Andy Wilkinson 09510db630 Merge branch '2.7.x' 2022-03-16 17:07:29 +00:00
Andy Wilkinson 81383e552a Merge branch '2.6.x' into 2.7.x
Closes gh-30254
2022-03-16 17:06:43 +00:00
Andy Wilkinson 6bc000565d Merge branch '2.5.x' into 2.6.x
Closes gh-30253
2022-03-16 17:06:17 +00:00
Andy Wilkinson 0accc3d67d Convert MustacheAutoConfigurationTests to application context runner
Closes gh-30252
2022-03-16 15:28:48 +00:00
Andy Wilkinson 23b5a3f70e Merge branch '2.7.x' 2022-03-16 14:14:35 +00:00
Andy Wilkinson 2282f9cc88 Upgrade to Embedded Mongo 3.4.2
As part of the upgrade, the property for configuring features has
been removed as support for feature-aware versions has been removed
from Embedded Mongo. For advanced configuration where features were
specified, users should provide a MongodConfig bean instead.

Closes gh-29985
Closes gh-30219
2022-03-16 14:13:10 +00:00
Stephane Nicoll 9ccbfe52f8 Upgrade to Tomcat 9.0.60
Closes gh-30249
2022-03-16 14:45:30 +01:00
Stephane Nicoll 82bc28d530 Upgrade to Spring Retry 1.3.2
Closes gh-30248
2022-03-16 14:45:30 +01:00
Stephane Nicoll 82f4092cd4 Upgrade to Netty tcNative 2.0.51.Final
Closes gh-30247
2022-03-16 14:45:30 +01:00
Stephane Nicoll 28c8f16b78 Upgrade to Netty 4.1.75.Final
Closes gh-30246
2022-03-16 14:45:29 +01:00
Stephane Nicoll 7cf5dcd3f9 Upgrade to Logback 1.2.11
Closes gh-30245
2022-03-16 14:45:29 +01:00
Stephane Nicoll 8deab79cac Upgrade to Log4j2 2.17.2
Closes gh-30244
2022-03-16 14:45:29 +01:00
Stephane Nicoll 57d3a52301 Upgrade to Kafka 3.0.1
Closes gh-30243
2022-03-16 14:45:28 +01:00
Stephane Nicoll 1385c6af90 Upgrade to Hibernate Validator 6.2.3.Final
Closes gh-30241
2022-03-16 13:56:57 +01:00
Stephane Nicoll 230ebcbe88 Upgrade to Hibernate 5.6.6.Final
Closes gh-30240
2022-03-16 13:56:55 +01:00
Stephane Nicoll 8e016e8922 Upgrade to Groovy 3.0.10
Closes gh-30239
2022-03-16 13:56:52 +01:00
Stephane Nicoll 9a1f60131e Upgrade to Dropwizard Metrics 4.2.9
Closes gh-30238
2022-03-16 13:56:50 +01:00
Stephane Nicoll 8be87b19cf Upgrade to Couchbase Client 3.2.6
Closes gh-30237
2022-03-16 13:56:47 +01:00
Stephane Nicoll 59f4004fa6 Upgrade to Tomcat 9.0.60
Closes gh-30230
2022-03-16 08:43:17 +01:00
Stephane Nicoll 417a6792a0 Upgrade to Spring Retry 1.3.2
Closes gh-30229
2022-03-16 08:28:05 +01:00
Stephane Nicoll 58e0665ac8 Upgrade to Netty tcNative 2.0.51.Final
Closes gh-30228
2022-03-16 08:28:03 +01:00
Stephane Nicoll fc72be112c Upgrade to Netty 4.1.75.Final
Closes gh-30227
2022-03-16 08:28:01 +01:00
Stephane Nicoll a98f7f273c Upgrade to Logback 1.2.11
Closes gh-30226
2022-03-16 08:27:59 +01:00
Stephane Nicoll 5c7a43e9d3 Upgrade to Log4j2 2.17.2
Closes gh-30225
2022-03-16 08:27:56 +01:00
Stephane Nicoll 0229706440 Upgrade to Hibernate Validator 6.2.3.Final
Closes gh-30224
2022-03-16 08:27:54 +01:00
Stephane Nicoll 17e07c22ca Upgrade to Groovy 3.0.10
Closes gh-30223
2022-03-16 08:27:52 +01:00
Stephane Nicoll 9bf18ead23 Upgrade to Dropwizard Metrics 4.1.31
Closes gh-30222
2022-03-16 08:27:50 +01:00
Stephane Nicoll 4d4d5348ab Upgrade to Couchbase Client 3.1.8
Closes gh-30221
2022-03-16 08:27:47 +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 98678ed415 Merge branch '2.7.x' 2022-03-15 17:36:23 +00:00
Andy Wilkinson b4cbcd797e Merge branch '2.6.x' into 2.7.x
Closes gh-30218
2022-03-15 17:36:08 +00:00
Andy Wilkinson c4d2602a3e Merge branch '2.5.x' into 2.6.x
Closes gh-30217
2022-03-15 17:34:53 +00:00
Octavia Togami 264a6888a9 Refactor code to avoid using internal LazyPublishArtifact
See gh-30209
2022-03-15 17:09:15 +00:00
Stephane Nicoll 0e07eb2393 Remove deprecated Spring Kafka's only-log-record-metadata property
See gh-30089
2022-03-15 17:57:45 +01:00
Andy Wilkinson 9bf77b1a06 Merge branch '2.7.x' 2022-03-15 15:31:03 +00:00
Andy Wilkinson 4935c11a07 Merge branch '2.6.x' into 2.7.x
Closes gh-30215
2022-03-15 15:30:40 +00:00
Andy Wilkinson 464fce621d Merge branch '2.5.x' into 2.6.x
Closes gh-30213
2022-03-15 15:30:06 +00:00
Andy Wilkinson f11ddb4bd7 Prevent eager creation of bootWar task
Previously, querying the artifact's extension in
SinglePublishedArtifact would result in eager creation of the task
that creates the artifact. Typically, this is the bootWar task.

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

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

Closes gh-30211
2022-03-15 15:28:59 +00:00
Stephane Nicoll d757328ce3 Merge branch '2.7.x' 2022-03-15 16:09:53 +01:00
Stephane Nicoll 4ac2309d9f Upgrade to Reactor 2020.0.17
Closes gh-30187
2022-03-15 16:09:23 +01:00
Stephane Nicoll 8158ce7d8b Upgrade to Reactor 2020.0.17
Closes gh-30176
2022-03-15 16:08:52 +01:00
Stephane Nicoll 75693c1a00 Upgrade to Reactor 2020.0.17
Closes gh-30169
2022-03-15 16:07:59 +01:00
Stephane Nicoll 253e6976d5 Start building against Spring Integration 6.0.0-M2 snapshots
See gh-30204
2022-03-14 11:11:32 +01:00
Stephane Nicoll 22d7f536b5 Start building against Spring Ws 4.0.0-M2 snapshots
See gh-30203
2022-03-14 11:11:06 +01:00
Stephane Nicoll acfd50fce9 Start building against Spring Security 6.0.0-M2 snapshots
See gh-30202
2022-03-14 11:10:42 +01:00
Stephane Nicoll b48fae696a Start building against Spring AMQP 3.0.0-M2 snapshots
See gh-30201
2022-03-14 11:10:10 +01:00
Stephane Nicoll 24158a7ab0 Start building against Spring Data 2022.0.0-M2 snapshots
See gh-30200
2022-03-14 11:09:32 +01:00
Stephane Nicoll 7c8b4b6914 Restore Kafka tests 2022-03-13 18:53:05 +01:00
Stephane Nicoll bb92019ac1 Merge branch '2.7.x' 2022-03-13 18:42:19 +01:00
Stephane Nicoll 01a7cfa979 Start building against Spring Integration 5.5.10 snapshots
See gh-30193
2022-03-12 18:26:04 +01:00
Stephane Nicoll ddf778e1cc Start building against Spring WS 3.1.3 snapshots
See gh-30192
2022-03-12 18:26:04 +01:00
Stephane Nicoll 85d4a07038 Start building against Spring Security 5.7.0-M3 snapshots
See gh-30191
2022-03-12 18:26:03 +01:00
Stephane Nicoll 695685996a Start building against Spring Kafka 2.8.4 snapshots
See gh-30190
2022-03-12 18:26:03 +01:00
Stephane Nicoll 2da206d2b9 Start building against Spring Integration 5.5.10 snapshots
See gh-30183
2022-03-12 12:50:27 +01:00
Stephane Nicoll 15c2eb9c9c Start building against Spring WS 3.1.3 snapshots
See gh-30182
2022-03-12 12:50:27 +01:00
Stephane Nicoll 3717c4c883 Start building against Spring Kafka 2.8.4 snapshots
See gh-30181
2022-03-12 12:50:26 +01:00
Stephane Nicoll 4ca6cffd87 Start building against Spring AMQP 2.4.3 snapshots
See gh-30189
2022-03-12 12:02:54 +01:00
Stephane Nicoll 6c1e194dd4 Start building against Spring Data 2021.2.0-M4 snapshots
See gh-30185
2022-03-12 12:02:24 +01:00
Stephane Nicoll 6baa248228 Start building against Spring Framework 5.3.17 snapshots
See gh-30188
2022-03-12 12:01:44 +01:00
Stephane Nicoll 001bc04c8c Start building against Reactor 2020.0.17 snapshots
See gh-30187
2022-03-12 12:00:10 +01:00
Stephane Nicoll 31fb515d16 Start building against Spring AMQP 2.4.3 snapshots
See gh-30180
2022-03-12 11:51:33 +01:00
Stephane Nicoll 64d706026d Start building against Spring Data 2021.1.3 snapshots
See gh-30179
2022-03-12 11:50:59 +01:00
Stephane Nicoll 33ec810b2e Start building against Micrometer 1.8.4 snapshots
See gh-30178
2022-03-12 11:50:33 +01:00
Stephane Nicoll 71e6a836a6 Start building against Spring Framework 5.3.17 snapshots
See gh-30177
2022-03-12 11:50:03 +01:00
Stephane Nicoll 2d1f5d3bc1 Start building against Reactor 2020.0.17 snapshots
See gh-30176
2022-03-12 11:48:40 +01:00
Scott Frederick 377b13c048 Merge branch '2.7.x' 2022-03-11 16:39:49 -06:00
Scott Frederick de321b00b7 Support podman for building images
Closes gh-30196
2022-03-11 16:39:07 -06:00
Scott Frederick 5e07db7d21 Merge branch '2.7.x' 2022-03-11 15:59:16 -06:00
Scott Frederick 7ad538cd84 Add option to use configured Docker host in builder
This commit adds support for a `docker.bindHostToBuilder` option in
the Maven and Gradle image building goal and task.

Fixes gh-29384
2022-03-11 15:27:22 -06:00
Scott Frederick 040afdeafe Merge branch '2.7.x' 2022-03-11 15:20:38 -06:00
Scott Frederick 93622d18eb Merge branch '2.6.x' into 2.7.x
Closes gh-30195
2022-03-11 15:20:15 -06:00
Scott Frederick 35a9a7fee2 Ignore deprecation warnings in Paketo system tests
Closes gh-30194
2022-03-11 15:19:53 -06:00
Stephane Nicoll 43ba80d431 Start building against Spring Integration 5.5.10 snapshots
See gh-30175
2022-03-11 21:22:49 +01:00
Stephane Nicoll 9ed4086ac2 Start building against Spring WS 3.1.3 snapshots
See gh-30174
2022-03-11 21:22:49 +01:00
Stephane Nicoll 07b6269a69 Start building against Spring AMQP 2.3.15 snapshots
See gh-30173
2022-03-11 21:22:49 +01:00
Stephane Nicoll e391215643 Start building against Spring Data 2021.0.10 snapshots
See gh-30172
2022-03-11 21:22:49 +01:00
Stephane Nicoll c55f0a1eac Start building against Micrometer 1.7.10 snapshots
See gh-30171
2022-03-11 21:22:48 +01:00
Stephane Nicoll 2620710480 Start building against Spring Framework 5.3.17 snapshots
See gh-30170
2022-03-11 21:22:48 +01:00
Stephane Nicoll d14d0c3f04 Start building against Reactor 2020.0.17 snapshots
See gh-30169
2022-03-11 17:08:52 +01:00
Andy Wilkinson a2ecd600f8 Merge branch '2.7.x' 2022-03-11 11:03:46 +00:00
Andy Wilkinson 1c19995db7 Merge branch '2.6.x' into 2.7.x
Closes gh-30165
2022-03-11 11:03:20 +00:00
Andy Wilkinson 6bbf3aff0e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
2022-03-11 11:03:01 +00:00
Andy Wilkinson eef89c6c35 Increase tests' Cassandra timeouts to 60s
Closes gh-30163
2022-03-11 11:02:18 +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
Andy Wilkinson f97bf544bf Polish 2022-03-10 17:11:50 +00:00
Andy Wilkinson faf7a35425 Merge branch '2.7.x' 2022-03-10 16:51:56 +00:00
Andy Wilkinson 6494a9f08a Merge branch '2.6.x' into 2.7.x
Closes gh-30165
2022-03-10 16:51:43 +00:00
Andy Wilkinson 7c3c5d3d3e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
2022-03-10 16:51:33 +00:00
Andy Wilkinson bbdef2b026 Increase timeouts in tests that use Cassandra
Closes gh-30163
2022-03-10 16:50:39 +00:00
Andy Wilkinson 14128ffc27 Merge branch '2.7.x' 2022-03-10 16:31:52 +00:00
Andy Wilkinson 085fb0766f Merge branch '2.6.x' into 2.7.x
Closes gh-30162
2022-03-10 16:31:21 +00:00
Andy Wilkinson 0958498a47 Merge branch '2.5.x' into 2.6.x
Closes gh-30161
2022-03-10 16:31:09 +00:00
Andy Wilkinson 6eacc07de0 Fix handling of Flux responses from Actuator endpoints
Closes gh-30095
2022-03-10 16:10:39 +00:00
Andy Wilkinson ab74bfcf65 Merge branch '2.7.x' 2022-03-10 13:26:01 +00:00
Andy Wilkinson 9075849143 Upgrade to Hazelcast 5.1
Closes gh-30154
2022-03-10 12:34:26 +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
Andy Wilkinson 2600bf4719 Merge branch '2.6.x' into 2.7.x
Closes gh-30142
2022-03-09 18:39:45 +00:00
Andy Wilkinson 382c6972ec Merge branch '2.5.x' into 2.6.x
Closes gh-30141
2022-03-09 18:39:32 +00:00
Andy Wilkinson 5264fb3d1e Test our Gradle Plugin against Gradle 7.4.1
Closes gh-30139
2022-03-09 18:09:07 +00:00
Andy Wilkinson abcc246a38 Polish 2022-03-09 15:22:24 +00:00
Andy Wilkinson e9d2ec507e Merge branch '2.7.x' 2022-03-09 15:17:25 +00:00
Andy Wilkinson f5ca568014 Remove versions less than 17 from JavaVersion enum
Closes gh-29503
2022-03-09 15:16:59 +00:00
Andy Wilkinson 813c2a5b1e Merge branch '2.6.x' into 2.7.x
Closes gh-30135
2022-03-09 14:45:55 +00:00
Andy Wilkinson 3cb1629f45 Merge branch '2.5.x' into 2.6.x
Closes gh-30134
2022-03-09 14:44:51 +00:00
Andy Wilkinson da1eb25e4b Remove redundant JRE-based enabled and disabled annotations from tests
Closes gh-29693
2022-03-09 14:41:13 +00:00
Andy Wilkinson a031c0c659 Merge branch '2.7.x' 2022-03-09 14:28:44 +00:00
Andy Wilkinson 881f2788ae Merge branch '2.6.x' into 2.7.x
Closes gh-30133
2022-03-09 14:28:31 +00:00
Andy Wilkinson b1be6ac271 Merge branch '2.5.x' into 2.6.x
Closes gh-30132
2022-03-09 14:28:01 +00:00
Andy Wilkinson 314acd3407 Add EIGHTEEN to JavaVersion
Closes gh-29524
2022-03-09 14:26:19 +00:00
Andy Wilkinson d552f49128 Merge branch '2.7.x' 2022-03-09 12:53:15 +00:00
Andy Wilkinson 83de1995c7 Merge branch '2.6.x' into 2.7.x
Closes gh-30130
2022-03-09 12:44:53 +00:00
Andy Wilkinson b0e4cabdd8 Merge branch '2.5.x' into 2.6.x
Closes gh-30123
2022-03-09 12:37:45 +00:00
Andy Wilkinson 20d21d4e58 Set up CI with JDK 18
Closes gh-30104
2022-03-09 12:28:34 +00:00
Moritz Halbritter 16f069ef47 Merge branch '2.5.x' into 2.6.x
Closes gh-30125
2022-03-09 12:10:05 +01:00
Moritz Halbritter d14980ed5e Polish "Tweak performance for Prometheus scraping endpoint"
See gh-30085
2022-03-09 12:08:55 +01:00
Peter Paul Bakker fb3f3c52cf Tweak performance for Prometheus scraping endpoint
Reduce the number of times capacity growth is needed inside the StringWriter.
A typical default SpringBoot Prometheus page has more than 11k characters.
Best performance results when no capacity growth is needed at all, so base
it on previous metrics page size plus some room for possible extra metric info.

See gh-30085
2022-03-09 12:08:26 +01:00
Moritz Halbritter 2816fc37a8 Merge branch '2.7.x' 2022-03-09 11:32:58 +01:00
Moritz Halbritter 93f31ee063 Polish "Tweak performance for Prometheus scraping endpoint"\n\nSee gh-30085 2022-03-09 11:31:23 +01:00
Peter Paul Bakker e2ebb56911 Tweak performance for Prometheus scraping endpoint
Reduce the number of times capacity growth is needed inside the StringWriter.
A typical default SpringBoot Prometheus page has more than 11k characters.
Best performance results when no capacity growth is needed at all, so base
it on previous metrics page size plus some room for possible extra metric info.

See gh-30085
2022-03-09 11:22:20 +01: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 087e853c5d Refine GraphQL server auto-configuration
Prior to this commit, launching a GraphQL application without any schema
file or customizer bean would result in an exception caught by a
FailureAnalyzer telling the developer about configured locations.

Since then, a new client has been introduced in Spring GraphQL and the
mere presence of the GraphQL starter does not mean anymore that the
intent is to create a GraphQL API in the app: we could instead just
consume an existing, remote API.

This commit refines the GraphQL server auto-configuration so that it is
enabled only if:

* there is at least one schema file in the configured locations
* or a `GraphQlSourceCustomizer` bean has been defined in the app

These changes make the custom FailureAnalyzer useless and is also
removed as part of this commit.

Closes gh-30035
2022-03-08 17:54:55 +01:00
Brian Clozel bf79d6baef Auto-configure ConversionService for GraphQL
Prior to this commit, we would configure a default conversion service
for GraphQL annotated controllers, without registering any additional
formatters.

This commit aligns the GraphQL auto-configuration with MVC and WebFlux,
since we now use the `ApplicationConversionService` to register all
application formatters for the GraphQL infrastructure.

Closes gh-29638
2022-03-08 17:54:55 +01:00
rstoyanchev ef4add27f0 Do not set ConversionService on AnnotatedControllerConfigurer
After 0b449d89e1,
the ConversionService on AnnotatedControllerConfigurer is an internally
managed instance that is customized with FormatterRegistrar rather than
set.

Closes gh-29636
2022-03-08 17:54:54 +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
Andy Wilkinson 997f7cbfce Merge branch '2.7.x' 2022-03-08 14:09:59 +00:00
Andy Wilkinson dfd4097436 Merge branch '2.6.x' into 2.7.x
Closes gh-30101
2022-03-08 14:09:47 +00:00
Andy Wilkinson 5b2cc74f71 Merge branch '2.5.x' into 2.6.x
Closes gh-30100
2022-03-08 14:09:35 +00:00
Andy Wilkinson 708e57eafb Register metrics for wrapped R2DBC ConnectionPools
Closes gh-30090
2022-03-08 13:55:34 +00:00
Andy Wilkinson d92dcf9452 Merge branch '2.7.x' 2022-03-08 13:53:11 +00:00
Andy Wilkinson dcaca38154 Merge branch '2.6.x' into 2.7.x
Closes gh-30099
2022-03-08 13:52:46 +00:00
Andy Wilkinson 119a713f09 Merge branch '2.5.x' into 2.6.x
Closes gh-30098
2022-03-08 13:52:25 +00:00
Andy Wilkinson e7705f4f71 Improve condition message produced by @ConditionalOnSingleCandidate
Closes gh-30073
2022-03-08 13:51:38 +00:00
Stephane Nicoll cc3021d2df Start building against Spring Framework 6.0.0-M3 snapshots
See gh-29957
2022-03-08 12:49:37 +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 6f8ce3deb5 Avoid use of instance supplier for core infrastructure bean
Closes gh-30021
2022-03-07 21:09:41 +01: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
Moritz Halbritter 24a68fc595 Merge branch '2.7.x' 2022-03-07 14:12:19 +01:00
Moritz Halbritter d95dc75de9 Merge branch '2.6.x' into 2.7.x 2022-03-07 14:11:22 +01:00
Moritz Halbritter e980a53399 Merge branch '2.5.x' into 2.6.x 2022-03-07 14:11:11 +01:00
Moritz Halbritter f3eb90046f Remove @Repeatable support for @DisabledOnOs
We'll add it back again when we need it, and delay the naming issue.

See gh-30082
2022-03-07 14:10:13 +01:00
Moritz Halbritter 74fe5735d9 Polish 2022-03-07 13:28:41 +01:00
Moritz Halbritter a1b1377733 Merge branch '2.7.x' 2022-03-07 13:23:06 +01:00
Moritz Halbritter 50d766020c Merge branch '2.6.x' into 2.7.x
Closes gh-30084
2022-03-07 13:22:53 +01:00
Moritz Halbritter 564555347f Merge branch '2.5.x' into 2.6.x
Closes gh-30083
2022-03-07 13:22:34 +01:00
Moritz Halbritter be38311c5d Disable incompatible tests on Linux AArch64
- Adds a new @DisableOnOs annotation, which is inspired from JUnit5s
  @DisableOnOs annotation. This new annotation supports the architecture
  and is repeatable

Closes gh-30082
2022-03-07 13:22:17 +01:00
Stephane Nicoll f869c490f4 Merge branch '2.7.x' 2022-03-07 09:49:21 +01:00
Stephane Nicoll ce4f7ded8a Merge branch '2.6.x' into 2.7.x
Closes gh-30081
2022-03-07 09:49:10 +01:00
Stephane Nicoll c6a9e138e5 Merge branch '2.5.x' into 2.6.x
Closes gh-30080
2022-03-07 09:49:00 +01:00
Stephane Nicoll cf9cc82025 Update copyright year of change file
See gh-30074
2022-03-07 09:47:12 +01:00
hak7a3 0a035c7fa6 Fix references to spring.data.cassandra.connection.connect-timeout
See gh-30074
2022-03-07 09:42:43 +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
Pavel Anisimov 976ed90cd7 Allow @DefaultValue to be used on record components
See gh-29010
2022-03-04 12:12:08 +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 e2d0b348e3 Merge branch '2.7.x' 2022-03-03 20:36:13 +00:00
Andy Wilkinson 4459fb46be Merge branch '2.6.x' into 2.7.x
Closes gh-30058
2022-03-03 20:34:46 +00:00
Andy Wilkinson 2ba8b490a0 Merge branch '2.5.x' into 2.6.x
Closes gh-30057
2022-03-03 20:34:34 +00:00
Andy Wilkinson e7566e968e Use configuration avoidance APIs in Gradle plugin's docs
Closes gh-30056
2022-03-03 20:27:46 +00:00
Andy Wilkinson 4846be9506 Align with latest repackaging of CacheMeterBinder in Micrometer
See gh-30014
2022-03-03 15:44:12 +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
Guirong Hu fb9112c891 Support overriding the default SanitizingFunction
See gh-30006
2022-03-03 14:19:14 +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 dd25696eb1 Merge branch '2.7.x' 2022-03-03 10:34:08 +00:00
Andy Wilkinson 79fe503616 Merge branch '2.6.x' into 2.7.x
Closes gh-30044
2022-03-03 10:33:52 +00:00
Andy Wilkinson 71dd607623 Merge branch '2.5.x' into 2.6.x
Closes gh-30043
2022-03-03 10:33:40 +00:00
Andy Wilkinson 34e436ef6e Accommodate SocketException when reading from stopped TunnelClient
TunnelClientTests stopTriggersTunnelClose expects that stopping the
client will cause an attempt to read from a connected channel to
return -1. With Java 17 on Windows the connection has been reset and
a SocketException is thrown instead. This seems reasonable as
stopping the client closes the ServerSocketChannel to which the test
was connected.

This commit updates test to expect a SocketException or a return
value of -1.

Closes gh-30042
2022-03-03 10:30:54 +00:00
Andy Wilkinson bfe9dede5b Merge branch '2.7.x' 2022-03-02 20:30:30 +00:00
Andy Wilkinson 936998647e Work around Gradle changing line endings during property expansion
There's a known issue [1] where property expansion changes the input
files line endings to the operating system's default. This causes
problems for us on Windows as the line endings become \r\n which
breaks our formatting checks.

This commit tunes the checkFormatMain task to exclude the generated
source files from checking. In their place, the original templates
are added. This ensures that the inputs are correctly formatted and,
therefore, that the output should be too (other than the line endings
on Windows).

Closes gh-30039

[1] https://github.com/gradle/gradle/issues/1151
2022-03-02 20:26:15 +00:00
Andy Wilkinson 0ca64d3b64 Merge branch '2.5.x' into 2.6.x
Closes gh-30038
2022-03-02 15:56:04 +00:00
Andy Wilkinson 35e5b4329e Provide complete dependency management for Netty tcNative
Closes gh-30010
2022-03-02 15:55:15 +00:00
Andy Wilkinson a5ec85bede Merge branch '2.7.x' 2022-03-02 15:24:23 +00:00
Andy Wilkinson b89c29f29c Merge branch '2.6.x' into 2.7.x
Closes gh-30037
2022-03-02 15:24:10 +00:00
Andy Wilkinson ea729fc1c6 Merge branch '2.5.x' into 2.6.x
Closes gh-30036
2022-03-02 15:21:43 +00:00
Andy Wilkinson 4073cf8334 Only apply special handling of META-INF to jar files
The changes for gh-28562 attempted to align the Gradle plugin's
handling of META-INF with the Maven plugin's behavior. Unfortunately,
they want too far, applying the handling to both jar and war files
when the Maven plugin only applies it to jar files.

This commit reworks the changes so that they only apply to jar files.

Closes gh-30026
2022-03-02 15:19:09 +00:00
Andy Wilkinson f95e5b9b8a Merge branch '2.7.x' 2022-03-02 12:21:39 +00:00
Andy Wilkinson 324c4310a4 Merge branch '2.6.x' into 2.7.x
Closes gh-30034
2022-03-02 12:21:29 +00:00
Andy Wilkinson 8a4a639734 Merge branch '2.5.x' into 2.6.x
Closes gh-30033
2022-03-02 12:21:20 +00:00
izeye 140d24d567 Remove redundant ConditionalOnMissingFilterBean
See gh-29983
2022-03-02 11:40:44 +00:00
Andy Wilkinson 81b8b6a24c Merge branch '2.7.x' 2022-03-02 11:22:57 +00:00
Andy Wilkinson a33dd254c8 Merge branch '2.6.x' into 2.7.x
Closes gh-30032
2022-03-02 11:22:12 +00:00
Andy Wilkinson 1ac1782e21 Merge branch '2.5.x' into 2.6.x
Closes gh-30031
2022-03-02 11:21:56 +00:00
Andy Wilkinson 35f9358eb2 Manage more of Kafka's modules
Closes gh-29023
2022-03-02 11:06:25 +00:00
Andy Wilkinson 89b2015adf Merge branch '2.7.x' 2022-03-01 17:49:48 +00:00