root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
37,090 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

16759 Commits

Author SHA1 Message Date
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