Commit Graph

16311 Commits

Author SHA1 Message Date
Stephane Nicoll cf3935073f Upgrade to Byte Buddy 1.12.7
Closes gh-29414
2022-01-15 17:50:02 +01:00
Stephane Nicoll 998a74bf97 Upgrade to Build Helper Maven Plugin 3.3.0
Closes gh-29413
2022-01-15 17:50:02 +01:00
Stephane Nicoll 388b12a048 Upgrade to Spring LDAP 2.4.0-M1
Closes gh-29222
2022-01-15 17:50:02 +01:00
Stephane Nicoll 7c85d2bc07 Upgrade to Spring HATEOAS 1.5.0-M1
Closes gh-29353
2022-01-15 15:07:27 +01:00
Phillip Webb 3146465d25 Merge branch '2.7.x' 2022-01-14 22:56:52 -08:00
Phillip Webb a2e473ec31 Merge branch '2.6.x' into 2.7.x 2022-01-14 22:56:43 -08:00
Phillip Webb 6afd9b665d Merge branch '2.5.x' into 2.6.x 2022-01-14 22:56:30 -08:00
Phillip Webb bccc9c1861 Refine ConfigurationPropertySources attach logic
Refine `ConfigurationPropertySources.attach` logic to endure that
the attached or reattached source is always first.

See gh-29409
2022-01-14 22:55:26 -08:00
Phillip Webb d0e7ab3b70 Merge branch '2.7.x'
Closes gh-29412
2022-01-14 20:33:42 -08:00
Phillip Webb e4e16f81ec Merge branch '2.6.x' into 2.7.x
Closes gh-29411
2022-01-14 20:33:19 -08:00
Phillip Webb 28cf6f5c59 Merge branch '2.5.x' into 2.6.x
Closes gh-29410
2022-01-14 20:33:05 -08:00
Phillip Webb 79d9549805 Fix ConfigurationPropertySources attach logic
Fix `ConfigurationPropertySources.attach` so that repeated calls to the
same source no longer create a new instance.

Fixes gh-29409
2022-01-14 20:32:34 -08:00
Phillip Webb 0367e13d90 Merge branch '2.7.x' 2022-01-14 17:38:49 -08:00
Phillip Webb 9c481952d8 Remove deprecated convertEnvironment method 2022-01-14 17:38:23 -08:00
Phillip Webb 32e8b30c36 Merge branch '2.7.x'
Closes gh-29408
2022-01-14 17:36:20 -08:00
Phillip Webb 9764b3eba0 Change getEnvironment() to return null by default
Update the `SpringBootContextLoader.getEnvironment()` method so that it
returns `null` rather than a new `StandardEnvironment`.

Closes gh-29405
2022-01-14 17:35:58 -08:00
Phillip Webb 05a1ef233a Merge branch '2.7.x'
Closes gh-29407
2022-01-14 16:33:20 -08:00
Phillip Webb c84d3c14fb Allow test property sources to override command line args
Refine `SpringBootContextLoader` logic so that inline test properties
are always added above command line arguments.

Closes gh-29404
2022-01-14 16:30:28 -08:00
Phillip Webb cb97aff1e7 Merge branch '2.7.x' 2022-01-14 13:57:35 -08:00
Phillip Webb 9278a502c7 Merge branch '2.6.x' into 2.7.x 2022-01-14 13:57:25 -08:00
Phillip Webb 14fe9347b5 Merge branch '2.5.x' into 2.6.x 2022-01-14 13:56:47 -08:00
Phillip Webb 3f7bf7d34f Modify SpringApplication Environment rather than setting it
Update `SpringBootContextLoader` so that when possible the
`SpringApplication` remains in control of creating the `Environment`
instance.

Prior to this commit, we would always create the `Environment` in the
`SpringBootContextLoader` and then call `setEnvironment` on the
`SpringApplication`. This meant that the `ApplicationEnvironment`
classes were not used and that `isCustomEnvironment` was set to `true`
so no conversion was applied.

With the updated code, an `ApplicationListener` is used to mutate the
`Environment` instance and add the required test property sources.

Fixes gh-29169
2022-01-14 13:47:22 -08:00
Brian Clozel fe82098d7d Merge branch '2.7.x' 2022-01-14 21:07:45 +01:00
Brian Clozel cdee953252 Polish 2022-01-14 21:07:29 +01:00
Brian Clozel 68806bfef8 Fix build after Spring for GraphQL changes
See spring-projects/spring-graphql#244
2022-01-14 21:05:15 +01:00
Andy Wilkinson d60da1cc59 Merge branch '2.7.x' 2022-01-14 15:56:03 +00:00
Andy Wilkinson b67cc62c37 Merge branch '2.6.x' into 2.7.x
Closes gh-29402
2022-01-14 15:55:54 +00:00
Andy Wilkinson d29a5a2f43 Merge branch '2.5.x' into 2.6.x
Closes gh-29401
2022-01-14 15:55:41 +00:00
Andy Wilkinson e8cbec0836 Clarify documentation of RestTemplate customization
Closes gh-29394
2022-01-14 15:51:08 +00:00
Andy Wilkinson 16447e1bce Merge branch '2.7.x' 2022-01-14 15:50:12 +00:00
Andy Wilkinson ece4c8ad93 Merge branch '2.6.x' into 2.7.x
Closes gh-29400
2022-01-14 15:49:39 +00:00
Andy Wilkinson 8868d34c24 Merge branch '2.5.x' into 2.6.x
Closes gh-29399
2022-01-14 15:48:57 +00:00
Andy Wilkinson d051146eb4 Use Testcontainers instead on Embedded Mongo
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.

Closes gh-28843
2022-01-14 15:48:31 +00:00
Stephane Nicoll 1666b1c284 Upgrade to Neo4j Java Driver 4.4.2
Closes gh-29398
2022-01-14 15:54:48 +01:00
Stephane Nicoll c2fa4ffd7e Upgrade to SLF4J 1.7.33
Closes gh-29397
2022-01-14 15:49:56 +01:00
Stephane Nicoll afcba76c3c Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29396
2022-01-14 15:49:55 +01:00
Stephane Nicoll dac4888137 Upgrade to Netty tcNative 2.0.47.Final
Closes gh-29395
2022-01-14 15:49:54 +01:00
Stephane Nicoll af79829cab Upgrade to Spring Data 2021.1.1
Closes gh-29317
2022-01-14 15:44:45 +01:00
Stephane Nicoll 1e44e4e52e Upgrade to Spring HATEOAS 1.4.1
Closes gh-29283
2022-01-14 15:44:16 +01:00
Andy Wilkinson 15dafebe0d Polish "Avoid split java.xml packages that cause JDT compile errors"
See gh-29389
2022-01-14 12:43:16 +00:00
Dave Syer 32a6c7df49 Avoid split java.xml packages that cause JDT compile errors
Without this change I get compiler errors from JDT in the IDE
(VSCode). It seems to be harmless from the point of view of the
command line build with the JDK.

See gh-29389
2022-01-14 12:42:02 +00:00
Stephane Nicoll 5883b22e01 Upgrade to SLF4J 1.7.33
Closes gh-29392
2022-01-14 12:21:04 +01:00
Stephane Nicoll 1e22504d21 Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29391
2022-01-14 12:21:02 +01:00
Stephane Nicoll 251f4e8a3f Upgrade to Spring AMQP 2.3.14
Closes gh-29312
2022-01-14 12:12:00 +01:00
Stephane Nicoll 777361421c Upgrade to Spring Data 2021.0.8
Closes gh-29311
2022-01-14 12:11:30 +01:00
Stephane Nicoll 37a44f45a0 Upgrade to Spring HATEOAS 1.3.7
Closes gh-29352
2022-01-14 12:10:46 +01:00
Stephane Nicoll abb88b9aeb Upgrade to Micrometer 2.0.0-M1
Closes gh-29279
2022-01-14 09:09:17 +01:00
Andy Wilkinson a79cba129f Remove faulty javadoc styling
The styling does not work with Java 17-generated javadoc. Following
Spring Framework's lead, this commit removes the custom styling.

See gh-28101
2022-01-13 15:39:34 +00:00
Stephane Nicoll 9a9cfa78c8 Merge branch '2.7.x' 2022-01-13 15:31:38 +01:00
Stephane Nicoll 77a9d0b6f1 Merge branch '2.6.x' into 2.7.x
Closes gh-29381
2022-01-13 15:31:31 +01:00
Omkar Shetkar c19e192acd Fix duplicate "Logging" link
See gh-29380
2022-01-13 15:30:21 +01:00
Stephane Nicoll 5161e5a5f2 Upgrade to Spring Framework 6.0.0-M2
Closes gh-28642
2022-01-13 14:41:50 +01:00
Stephane Nicoll d82fbcb43b Upgrade to Micrometer 1.9.0-M2
Closes gh-29282
2022-01-13 14:40:27 +01:00
Stephane Nicoll 7a0f7c498f Upgrade to Spring Framework 5.3.15
Closes gh-29328
2022-01-13 14:39:51 +01:00
Stephane Nicoll 832d8845df Upgrade to Micrometer 1.8.2
Closes gh-29316
2022-01-13 14:38:40 +01:00
Stephane Nicoll f65d766fbe Upgrade to Spring Framework 5.3.15
Closes gh-29327
2022-01-13 14:38:07 +01:00
Stephane Nicoll aa0a788800 Upgrade to Micrometer 1.7.8
Closes gh-29310
2022-01-13 14:36:51 +01:00
Stephane Nicoll 5428106925 Upgrade to Spring Framework 5.3.15
Closes gh-29326
2022-01-13 14:36:10 +01:00
Stephane Nicoll 4dac38cb63 Merge branch '2.7.x' 2022-01-13 08:46:08 +01:00
Stephane Nicoll 1bf13371c4 Merge branch '2.6.x' into 2.7.x
Closes gh-29378
2022-01-13 08:45:59 +01:00
Stephane Nicoll 8384019a41 Merge branch '2.5.x' into 2.6.x
Closes gh-29377
2022-01-13 08:45:48 +01:00
Stephane Nicoll 5f03ace40f Update copyright year of changed file
See gh-29112
2022-01-13 08:43:03 +01:00
izeye 74c522c745 Polish SpringBootContextLoaderTests
See gh-29112
2022-01-13 08:42:36 +01:00
Phillip Webb 13f257a706 Merge branch '2.7.x' 2022-01-12 15:44:47 -08:00
Phillip Webb 8147eb6d6d Merge branch '2.6.x' into 2.7.x 2022-01-12 15:43:44 -08:00
Phillip Webb e7fe371927 Merge branch '2.5.x' into 2.6.x 2022-01-12 15:43:11 -08:00
Phillip Webb 27ad0804f5 Update copyright year of changed files 2022-01-12 15:42:25 -08:00
Phillip Webb 3d6840e715 Merge branch '2.7.x'
Closes gh-29376
2022-01-12 15:32:51 -08:00
Phillip Webb fee45e056a Merge branch '2.6.x' into 2.7.x
Closes gh-29375
2022-01-12 15:32:34 -08:00
Phillip Webb 91d2b1b988 Merge branch '2.5.x' into 2.6.x
Closes gh-29374
2022-01-12 15:32:00 -08:00
Phillip Webb eb6b48fff0 Use side-effect free environment with tests rather than converting
Refine the logic introduced in 64270eca to use a side-effect free
Environment implementation rather than converting the Environment early.

Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.

Fixes gh-29169
2022-01-12 14:21:52 -08:00
Phillip Webb 1b7db2750d Merge branch '2.7.x'
Closes gh-29373
2022-01-12 14:08:04 -08:00
Phillip Webb e1c84e2972 Merge branch '2.6.x' into 2.7.x
Closes gh-29372
2022-01-12 14:07:48 -08:00
Phillip Webb 72696cdb0f Merge branch '2.5.x' into 2.6.x
Closes gh-29371
2022-01-12 14:07:31 -08:00
Phillip Webb 9cf55808fb Ensure run user actually exists
Update `launch.script` so that the `run_user` variable is only set when
the user actually exists. Prior to this commit, if the jar file was
owned by a non-existing user the startup script could fail.

Fixes gh-29370
2022-01-12 14:05:30 -08:00
Phillip Webb ef9a258174 Merge branch '2.7.x'
Closes gh-29369
2022-01-12 13:54:52 -08:00
Phillip Webb ae4d9ccb2d Merge branch '2.6.x' into 2.7.x
Closes gh-29368
2022-01-12 13:54:39 -08:00
Phillip Webb 3ae7c45900 Merge branch '2.5.x' into 2.6.x
Closes gh-29367
2022-01-12 13:54:23 -08:00
Phillip Webb 827309f36f Upgrade to Testcontainers 1.16.2
Closes gh-29366
2022-01-12 13:52:43 -08:00
Stephane Nicoll ee938cf822 Upgrade to Netty 4.1.73.Final
Closes gh-29351
2022-01-12 14:33:55 +01:00
Stephane Nicoll d8739c463b Upgrade to MongoDB 4.4.1
Closes gh-29350
2022-01-12 14:33:54 +01:00
Stephane Nicoll e14c13c75f Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29349
2022-01-12 14:33:52 +01:00
Stephane Nicoll 8cdccb6cb3 Upgrade to Logback 1.2.10
Closes gh-29348
2022-01-12 14:33:51 +01:00
Stephane Nicoll 61e08e3510 Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29347
2022-01-12 14:33:50 +01:00
Stephane Nicoll b19593ee47 Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29346
2022-01-12 14:33:49 +01:00
Stephane Nicoll 98118bc480 Upgrade to Jaybird 4.0.5.java8
Closes gh-29345
2022-01-12 14:33:47 +01:00
Stephane Nicoll 838cded308 Upgrade to Infinispan 12.1.11.Final
Closes gh-29344
2022-01-12 14:33:46 +01:00
Stephane Nicoll 4309b78f02 Upgrade to HttpCore5 5.1.3
Closes gh-29343
2022-01-12 14:33:45 +01:00
Stephane Nicoll ca39780ff3 Upgrade to Netty 4.1.73.Final
Closes gh-29341
2022-01-12 13:51:24 +01:00
Stephane Nicoll cb1db78c37 Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29340
2022-01-12 13:51:23 +01:00
Stephane Nicoll db9097b0d6 Upgrade to Logback 1.2.10
Closes gh-29339
2022-01-12 13:51:21 +01:00
Stephane Nicoll d23a665bdc Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29338
2022-01-12 13:51:20 +01:00
Stephane Nicoll 36811f9e1e Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29337
2022-01-12 13:51:19 +01:00
Stephane Nicoll 7125bd3779 Upgrade to Jaybird 4.0.5.java8
Closes gh-29336
2022-01-12 13:51:18 +01:00
Stephane Nicoll 404fb521ec Upgrade to Infinispan 12.1.11.Final
Closes gh-29335
2022-01-12 13:51:17 +01:00
Stephane Nicoll 33da06cff0 Upgrade to HttpCore5 5.1.3
Closes gh-29334
2022-01-12 13:51:15 +01:00
Stephane Nicoll 315fa45f46 Start building against Spring Security 5.7.0-M1 snapshots
See gh-29225
2022-01-12 13:43:22 +01:00
Stephane Nicoll 90b8d2190f Adapt to latest change in Spring Data Elasticsearch 2022-01-12 10:04:44 +01:00
Stephane Nicoll be55ea9c29 Start building against Spring Framework 5.3.15 snapshots
See gh-29328
2022-01-12 09:31:04 +01:00
Stephane Nicoll c32912f05f Start building against Spring Framework 5.3.15 snapshots
See gh-29327
2022-01-12 09:30:17 +01:00
Stephane Nicoll b5407e6e8e Start building against Spring Framework 5.3.15 snapshots
See gh-29326
2022-01-12 09:29:36 +01:00
Andy Wilkinson 2a95bfed5c Start building against Spring REST Docs 2.0.6 snapshots
See gh-29323
2022-01-11 20:28:10 +00:00
Andy Wilkinson c211aa0ac2 Start building against Spring REST Docs 2.0.6 snapshots
See gh-29322
2022-01-11 20:27:19 +00:00
Andy Wilkinson 27eaaa9442 Start building against Spring REST Docs 2.0.6 snapshots
See gh-29321
2022-01-11 20:09:39 +00:00
Stephane Nicoll fb399ec284 Merge branch '2.7.x' 2022-01-11 17:33:18 +01:00
Stephane Nicoll 34576f07d8 Upgrade to Reactor 2020.0.15
Closes gh-29280
2022-01-11 17:27:03 +01:00
Stephane Nicoll b9716ca4ee Start building against Spring Integration 5.5.8 snapshots
See gh-29320
2022-01-11 17:24:50 +01:00
Stephane Nicoll 504421c4a5 Start building against Spring Kafka 2.8.2 snapshots
See gh-29319
2022-01-11 17:24:49 +01:00
Stephane Nicoll ef4915ee55 Start building against Spring AMQP 2.4.2 snapshots
See gh-29318
2022-01-11 17:24:49 +01:00
Stephane Nicoll b05f435b27 Start building against Spring Data 2021.1.1 snapshots
See gh-29317
2022-01-11 17:24:49 +01:00
Stephane Nicoll 2da271a240 Start building against Micrometer 1.8.2 snapshots
See gh-29316
2022-01-11 17:24:48 +01:00
Stephane Nicoll 17b0ac61aa Upgrade to Reactor 2020.0.15
Closes gh-29315
2022-01-11 17:24:46 +01:00
Stephane Nicoll c2925f8e84 Start building against Spring Integration 5.5.8 snapshots
See gh-29314
2022-01-11 17:22:20 +01:00
Stephane Nicoll 116427c78e Start building against Spring Kafka 2.7.10 snapshots
See gh-29313
2022-01-11 17:22:20 +01:00
Stephane Nicoll 53fcf0971e Start building against Spring AMQP 2.3.14 snapshots
See gh-29312
2022-01-11 17:22:20 +01:00
Stephane Nicoll 72e72bda67 Start building against Micrometer 1.7.8 snapshots
See gh-29310
2022-01-11 17:22:19 +01:00
Stephane Nicoll 79fd0ad30a Upgrade to Reactor 2020.0.15
Closes gh-29309
2022-01-11 17:22:18 +01:00
Stephane Nicoll 1c9e7d7c8e Start building against Spring Session 2021.2.0-M1 snapshots
See gh-29226
2022-01-11 11:15:28 +01:00
Stephane Nicoll 88049ff11a Merge branch '2.7.x' 2022-01-11 11:09:11 +01:00
Stephane Nicoll ca432309aa Polish "Add option to allow Spring Batch custom isolation levels"
See gh-28859
2022-01-11 11:07:08 +01:00
stibi a8d1d3104e Add option to allow Spring Batch custom isolation levels
See gh-28859
2022-01-11 10:39:01 +01:00
Brian Clozel fc794f17e1 Update GraphiQlHandler configuration
This commit updates the `GraphiQlHandler` auto-configuration after a
constructor change was done in Spring GraphQL for WebSocket support in
GraphiQL.
2022-01-10 18:27:50 +01:00
Stephane Nicoll 2078a7f3e1 Merge branch '2.7.x' 2022-01-10 16:28:36 +01:00
Stephane Nicoll e92e35d56f Polish "Stop configuring a default user with SAML 2.0 Login"
See gh-29263
2022-01-10 16:25:43 +01:00
Guirong Hu ab49acc782 Stop configuring a default user with SAML 2.0 Login
See gh-29263
2022-01-10 16:22:00 +01:00
Brian Clozel b7de02d908 Fix build after Spring GraphQL changes
See pring-projects/spring-graphql#229
2022-01-10 14:17:31 +01:00
Stephane Nicoll 8ec8268a77 Merge branch '2.7.x' 2022-01-10 12:07:19 +01:00
Stephane Nicoll c02faea9c9 Allow WebMvcFilter to be overridden by user configuration
Closes gh-28428
2022-01-10 12:02:08 +01:00
Stephane Nicoll 0af6761993 Merge branch '2.7.x' 2022-01-10 10:29:58 +01:00
Stephane Nicoll 270e162479 Stop aliasing MariaDB to MySQL
Closes gh-28728
2022-01-10 10:29:49 +01:00
Brian Clozel b17412eb38 Fix Auto-configured Spring GraphQL Tests docs
Prior to this change, the reference docs would point to "spring-webflux"
as the required additional testing dependency to get
`WebGraphQlTester` support in Spring Boot tests.

While this is enough for `WebEnvironment.MOCK` tests, we need an actual
HTTP client for `WebEnvironment.RANDOM_PORT` tests. This commit amends
this part of the documentation to recommend the
"spring-boot-starter-webflux" dependency in all cases.

Fixes gh-29250
2022-01-10 10:10:10 +01:00
Stephane Nicoll 5f67546534 Adapt to latest API change in SD Elasticsearch
See gh-29292
2022-01-09 22:24:05 +01:00
Stephane Nicoll f8aa8a9742 Remove unnecessary exclude
See gh-29292
2022-01-09 15:23:43 +01:00
Stephane Nicoll 0f93c6c475 Start building against Spring Integration 5.5.8 snapshots
See gh-29286
2022-01-09 10:23:22 +01:00
Stephane Nicoll 0412e86a4f Start building against Spring LDAP 2.4.0-M1 snapshots
See gh-29222
2022-01-09 10:08:47 +01:00
Stephane Nicoll 066bfb3635 Start building against Spring Kafka 2.8.2 snapshots
See gh-29224
2022-01-09 10:08:06 +01:00
Stephane Nicoll 6cbc0e7ac5 Start building against Spring AMQP 2.4.2 snapshots
See gh-29284
2022-01-09 10:07:39 +01:00
Stephane Nicoll 6e27448744 Start building against Micrometer 1.9.0-M2 snapshots
See gh-29282
2022-01-09 10:07:06 +01:00
Stephane Nicoll 9e27bddfc7 Start building against Spring Data 2021.2.0-M1 snapshots
This commit also upgrades to Elasticsearch 7.16.2

See gh-29223
See gh-29292
2022-01-08 19:57:50 +01:00
Stephane Nicoll 3d927a093d Start building against Spring HATEOAS 1.4.1 snapshots
See gh-29283
2022-01-08 10:56:21 +01:00
Stephane Nicoll cad11addb2 Merge branch '2.7.x' 2022-01-07 17:58:35 +01:00
Stephane Nicoll 980aa616c8 Fix build failure
See gh-29290
2022-01-07 17:58:15 +01:00
Andy Wilkinson 894f83fb13 Upgrade to Artemis 2.20.0 and switch to Jakarta EE 9 JMS API
Closes gh-29203
2022-01-07 15:26:39 +00:00
Andy Wilkinson 89e79e826e Reinstate support for Apache Artemis
See gh-29203
2022-01-07 15:26:29 +00:00
Stephane Nicoll 9392ff59f7 Merge branch '2.7.x' 2022-01-07 15:40:59 +01:00
Stephane Nicoll 7afae4aad9 Start building against Reactor 2020.0.15 snapshots
See gh-29280
2022-01-07 15:39:34 +01:00
Stephane Nicoll a9d8befe72 Fix build failures
See gh-29290
2022-01-07 15:39:33 +01:00
Andy Wilkinson eba2c8c8fe Merge branch '2.7.x' 2022-01-07 14:04:07 +00:00
Andy Wilkinson 94fa50af1c Polish 2022-01-07 14:03:07 +00:00
Stephane Nicoll 11e604af41 Merge branch '2.7.x' 2022-01-07 14:43:19 +01:00
Stephane Nicoll 9821cdfd8b Remove deprecated code
Closes gh-29290
2022-01-07 14:42:14 +01:00
Stephane Nicoll aec6c1ed92 Merge branch '2.7.x' 2022-01-07 10:23:07 +01:00
Stephane Nicoll c62aa0deab Remove support for Hazelcast 3
Closes gh-29287
2022-01-07 10:22:27 +01:00
Stephane Nicoll 164c2f7164 Polish
See gh-29265
2022-01-07 10:20:11 +01:00
Andy Wilkinson 9a05eb63c4 Use built-in basic auth support as it no longer requires JAX-B
Closes gh-28829
2022-01-06 18:12:14 +00:00
Andy Wilkinson 29c654530c Upgrade to Prometheus Client 0.14.1
Closes gh-29288
2022-01-06 17:38:54 +00:00
Stephane Nicoll 025fe4fd43 Merge branch '2.7.x' 2022-01-06 17:50:15 +01:00
Stephane Nicoll 69d1c3674a Upgrade to latest Hazelcast 3.x in integration tests 2022-01-06 17:41:26 +01:00
Stephane Nicoll a780e87e9c Upgrade to Hazelcast 5.0.2
See gh-29265
2022-01-06 17:38:06 +01:00
Andy Wilkinson 35b32bb3ff Update Javadoc to link to Java SE 17 and Jakarta EE 9
Closes gh-29277
2022-01-06 14:39:33 +00:00
Andy Wilkinson c2e86096cd Reinstate support for jOOQ as it now supports Jakarta EE 9
Closes gh-29271
2022-01-05 15:46:54 +00:00
Andy Wilkinson ccc924b908 Merge branch '2.7.x' 2022-01-05 11:58:50 +00:00
Andy Wilkinson 508d0af453 Merge branch '2.6.x' into 2.7.x
Closes gh-29269
2022-01-05 11:58:33 +00:00
Andy Wilkinson a6d8ff4677 Merge branch '2.5.x' into 2.6.x
Closes gh-29268
2022-01-05 11:58:03 +00:00
Andy Wilkinson 41b01cc289 Only write parent entries when entry is new
Previously, when writing a repackaged jar, an attempt to write all of
an entry's parent directories would always be made, irrespective of
whether or not the entry itself had already been written. This was
inefficient as, due to the way that the jar is written, once an entry
itself has been written, we know that all of its parent directories
will also have been written.

This commit updates the jar writer so that no attempt is made to
write parent directory entries if the entry itself has already been
written.

Fixes gh-29175
2022-01-05 11:49:48 +00:00
Stephane Nicoll bc273d6327 Merge branch '2.7.x' 2022-01-05 09:46:39 +01:00
Stephane Nicoll 8b0ea24ac2 Upgrade to Kotlin Coroutines 1.6.0
Closes gh-29264
2022-01-05 09:45:36 +01:00
Stephane Nicoll fed89f98aa Merge branch '2.7.x' 2022-01-05 09:36:07 +01:00
Stephane Nicoll ce7a3d0ef2 Upgrade to Flyway 8.3.0
Closes gh-29249
2022-01-05 09:18:23 +01:00
Stephane Nicoll 73b7b147a1 Merge branch '2.7.x' 2022-01-05 09:17:25 +01:00
Stephane Nicoll dda46fbe2b Upgrade to Liquibase 4.6.2
Closes gh-29257
2022-01-05 09:14:57 +01:00
Phillip Webb 06398eabed Merge branch '2.7.x' 2022-01-04 12:26:24 -08:00
Phillip Webb b25e92f3e2 Merge branch '2.6.x' into 2.7.x 2022-01-04 12:24:34 -08:00
Phillip Webb 99a683dffb Merge branch '2.5.x' into 2.6.x 2022-01-04 12:24:02 -08:00
Phillip Webb 9a6f35cd8e Update copyright year of changed files 2022-01-04 12:23:53 -08:00
Phillip Webb 760dcffd8b Merge branch '2.7.x' 2022-01-04 12:22:54 -08:00
Phillip Webb f09bde2b60 Merge branch '2.6.x' into 2.7.x 2022-01-04 12:20:31 -08:00
Phillip Webb 81266ca806 Merge branch '2.5.x' into 2.6.x 2022-01-04 12:17:35 -08:00
Phillip Webb 0fcdab3936 Update copyright year of changed files 2022-01-04 12:17:10 -08:00
Phillip Webb dc054943bf Merge branch '2.7.x'
Closes gh-29262
2022-01-04 12:14:18 -08:00
Phillip Webb c839ebbce4 Merge branch '2.6.x' into 2.7.x
Closes gh-29261
2022-01-04 12:13:55 -08:00
Phillip Webb 8e583f6f73 Apply exclusion rules to child contributors
Update `IncludeExcludeGroupMemberPredicate` so that exclusion rules are
also applied to child contributors. The restores the behavior of Spring
Boot 2.5.x where `management.endpoint.health.group.mygroup.exclude=db`
would exclude 'db/one', 'db/two' etc.

Fixes gh-29251
2022-01-04 12:12:03 -08:00
Andy Wilkinson 1dbfcf8b57 Reinstate support for Spring Data Couchbase
Closes gh-28976
2022-01-04 16:38:16 +00:00
Stephane Nicoll e5cab660cb Upgrade to Infinispan 13.0.5.Final
Closes gh-29256
2022-01-04 16:51:58 +01:00
Stephane Nicoll b214841e2c Merge branch '2.7.x' 2022-01-04 16:14:28 +01:00
Stephane Nicoll 605ec2fb0e Polish "Add vendor version to JavaInfo"
See gh-29090
2022-01-04 16:10:02 +01:00
Jonatan Ivanov c6e6d109ad Add vendor version to JavaInfo
See gh-29090
2022-01-04 16:09:45 +01:00
Stephane Nicoll 9bfe3c21e5 Merge branch '2.7.x' 2022-01-04 15:57:21 +01:00
Stephane Nicoll 4799d2a71a Polish "Add transactionIdPrefix Property to KafkaTemplate"
See gh-29089
2022-01-04 15:54:23 +01:00
Gary Russell 33814a4a42 Add transactionIdPrefix Property to KafkaTemplate
See gh-29089
2022-01-04 15:39:31 +01:00
Stephane Nicoll e2f274f01d Merge branch '2.7.x' 2022-01-04 15:36:12 +01:00
Stephane Nicoll 9b34c31916 Polish "Include AbstractJdbcConfiguration beans in @DataJdbcTest"
See gh-29003
2022-01-04 15:32:23 +01:00
raviu 7f8dd81947 Include AbstractJdbcConfiguration beans in @DataJdbcTest
See gh-29003
2022-01-04 15:30:54 +01:00
Stephane Nicoll e87b4cfb5b Merge branch '2.7.x' 2022-01-04 15:04:33 +01:00
Stephane Nicoll c943ef18ca Polish "Add principal resolution in RSocket handler methods"
See gh-28444
2022-01-04 15:02:56 +01:00
Guirong Hu cf05964499 Add principal resolution in RSocket handler methods
See gh-28444
2022-01-04 14:35:12 +01:00
Stephane Nicoll abb622023d Merge branch '2.7.x' 2022-01-04 14:23:48 +01:00
Stephane Nicoll d24720d958 Polish "Expose OS information as an InfoContributor"
See gh-28907
2022-01-04 14:08:24 +01:00
Jonatan Ivanov c700f686c6 Expose OS information as an InfoContributor
See gh-28907
2022-01-04 13:58:39 +01:00
Stephane Nicoll 4442f91f63 Merge branch '2.7.x' 2022-01-04 12:46:33 +01:00
Stephane Nicoll 076ddc8579 Polish "Add server.netty.max-keep-alive-requests"
See gh-28875
2022-01-04 10:42:34 +01:00
Leo Li 0e94b2ce6e Add server.netty.max-keep-alive-requests
See gh-28875
2022-01-04 10:42:34 +01:00
Stephane Nicoll 8cb6a79e60 Merge branch '2.7.x' 2022-01-04 10:41:59 +01:00
Stephane Nicoll 578855f512 Restore support for Hazelcast 3
See gh-28801
2022-01-04 10:39:20 +01:00
Stephane Nicoll 64062adf0d Merge branch '2.7.x' 2022-01-04 09:58:24 +01:00
Stephane Nicoll e1a5be83d2 Polish "Inject SpringManagedContext into Hazelcast configuration"
See gh-28801
2022-01-04 09:57:48 +01:00
Jaromir Hamala b875b55711 Inject SpringManagedContext into Hazelcast configuration
This commit makes it possible to inject Spring managed beans into
objects instantiated by Hazelcast.

See gh-28801
2022-01-04 09:04:49 +01:00
Stephane Nicoll e378705383 Merge branch '2.7.x' 2022-01-04 08:40:15 +01:00
Stephane Nicoll f26bee1196 Polish "Upgrade to Embedded Mongo 3.2.5"
See gh-28543
2022-01-04 08:39:11 +01:00
Julien Herr 679231c120 Upgrade to Embedded Mongo 3.2.5
See gh-28543
2022-01-03 17:59:26 +01:00
Brian Clozel c5817f21eb Add property for disabling GraphQL schema introspection
Prior to this commit, the GraphQL schema assembled by the
auto-configuration would provide no option for disabling the field
introspection.

While this feature is essential for many tools (including GraphiQL),
some prefer disabling it because this allows clients to gather
information about types and schema easily. This commit introduces a new
`spring.graphql.schema.introspection.enabled` configuration property.

Because potential attackers can still gather this information and this
feature is a core concern in the GraphQL spec, introspection is enabled
by default for Spring Boot applications.

Closes gh-29248
2022-01-03 17:36:58 +01:00
izeye 728206dba0 Polish GraphQL changes
See gh-29140
Closes gh-29194
2022-01-03 17:36:57 +01:00
Brian Clozel 0d616b8924 Fix WebGraphQlTester auto-registration for SpringBootTest
Prior to this commit, the `GraphQlTesterContextCustomizer` would
register a `WebGraphQlTester` instance as a `GraphQlTester` bean., only
exposing the `GraphQlTester` type. This is not in line with the
documentation and also does not register the bean definition with the
most specific type.
With this issue, a `@SpringBootTest` integration test will not be
injected with a `WebGraphQlTester` if it asks one.

This commit ensures that the `WebGraphQlTester` is registered as such
and that all related classes are renamed as a result.

Fixes gh-29250
2022-01-03 17:36:57 +01:00
Stephane Nicoll 09a71e5047 Merge branch '2.7.x' 2022-01-03 14:50:36 +01:00
Stephane Nicoll b81c0047f8 Polish "Log the reason that led Devtools to restart the app"
See gh-28495
2022-01-03 14:48:39 +01:00
Artur Signell 0769b33e2e Log the reason that led Devtools to restart the app
See gh-28495
2022-01-03 14:25:12 +01:00
Stephane Nicoll 8b21c71fd6 Merge branch '2.7.x' 2022-01-03 14:22:25 +01:00
Stephane Nicoll 91d7295c62 Polish "Add support for IdlePartitionEventInterval"
See gh-28290
2022-01-03 14:20:56 +01:00
Pascal Ayotte 9274baeb68 Add support for IdlePartitionEventInterval
See gh-28290
2022-01-03 14:16:19 +01:00
Stephane Nicoll 5864c300e0 Merge branch '2.7.x' 2022-01-03 14:11:47 +01:00
Stephane Nicoll 6b6da22f2c Polish "Add support for RabbitStreamTemplate"
See gh-28060
2022-01-03 14:02:27 +01:00
Eddú Meléndez 3952046132 Add support for RabbitStreamTemplate
See gh-28060
2022-01-03 13:30:10 +01:00
Stephane Nicoll cd0bb8e68f Upgrade to XmlUnit2 2.8.4
Closes gh-29247
2022-01-03 11:05:57 +01:00
Stephane Nicoll 67f8b0484d Upgrade to Undertow 2.2.14.Final
Closes gh-29246
2022-01-03 11:05:57 +01:00
Stephane Nicoll 714c1cc642 Upgrade to Thymeleaf 3.0.14.RELEASE
Closes gh-29244
2022-01-03 11:05:57 +01:00
Stephane Nicoll 0d8fc234b5 Upgrade to Spring WS 3.1.2
Closes gh-29243
2022-01-03 11:05:57 +01:00
Stephane Nicoll 0106e35b61 Upgrade to Spring Integration 5.5.7
Closes gh-29242
2022-01-03 11:05:56 +01:00
Stephane Nicoll 7890919958 Upgrade to Spring AMQP 2.4.1
Closes gh-29241
2022-01-03 11:05:56 +01:00
Stephane Nicoll ec0dd5bf33 Upgrade to SnakeYAML 1.30
Closes gh-29240
2022-01-03 11:05:56 +01:00
Stephane Nicoll b76691a4b0 Upgrade to SendGrid 4.8.1
Closes gh-29239
2022-01-03 11:05:56 +01:00
Stephane Nicoll 7a016a68f1 Upgrade to Selenium HtmlUnit 3.56.0
Closes gh-29238
2022-01-03 11:05:56 +01:00
Stephane Nicoll a2bed160f0 Upgrade to Selenium 4.1.1
Closes gh-29237
2022-01-03 11:04:53 +01:00
Stephane Nicoll 017d3dc402 Upgrade to Reactor Bom 2020.0.14
Closes gh-29236
2022-01-03 09:42:40 +01:00
Stephane Nicoll ddc7da7766 Upgrade to Rabbit AMQP Client 5.14.0
Closes gh-29235
2022-01-03 09:42:38 +01:00
Stephane Nicoll 2c322b67f1 Upgrade to Prometheus Client 0.14.1
Closes gh-29234
2022-01-03 09:42:37 +01:00
Stephane Nicoll 86a426035d Upgrade to Oracle Database 21.4.0.0.1
Closes gh-29233
2022-01-03 09:42:36 +01:00
Stephane Nicoll 2c82b18f3f Upgrade to Netty 4.1.72.Final
Closes gh-29232
2022-01-03 09:42:35 +01:00
Stephane Nicoll 61a65c0a93 Upgrade to MSSQL JDBC 9.4.1.jre8
Closes gh-29231
2022-01-03 09:42:34 +01:00
Stephane Nicoll df1a9b848b Upgrade to Mockito 4.2.0
Closes gh-29230
2022-01-03 09:42:33 +01:00
Stephane Nicoll 765c81c2f0 Upgrade to Logback 1.2.10
Closes gh-29229
2022-01-03 09:42:32 +01:00
Stephane Nicoll 179414c7f3 Upgrade to JUnit Jupiter 5.8.2
Closes gh-29227
2022-01-03 09:42:29 +01:00
Stephane Nicoll 78873706cf Upgrade to JDOM2 2.0.6.1
Closes gh-29221
2022-01-03 09:34:40 +01:00
Stephane Nicoll de22f47541 Upgrade to Jaybird 4.0.5.java8
Closes gh-29220
2022-01-03 09:34:40 +01:00
Stephane Nicoll 23a1dc9938 Upgrade to Jackson Bom 2.13.1
Closes gh-29219
2022-01-03 09:34:39 +01:00
Stephane Nicoll 18df80df17 Upgrade to HttpCore5 5.1.3
Closes gh-29218
2022-01-03 09:34:39 +01:00
Stephane Nicoll 46f17d8a50 Upgrade to HttpCore 4.4.15
Closes gh-29217
2022-01-03 09:34:39 +01:00
Stephane Nicoll 5a641fd50e Upgrade to HttpAsyncClient 4.1.5
Closes gh-29216
2022-01-03 09:34:39 +01:00
Stephane Nicoll 8da7be8e32 Upgrade to HtmlUnit 2.56.0
Closes gh-29215
2022-01-03 09:34:39 +01:00
Stephane Nicoll 464ea36ef5 Upgrade to Hibernate 5.6.3.Final
Closes gh-29214
2022-01-03 09:34:39 +01:00
Stephane Nicoll 9e443d772f Upgrade to Hazelcast 4.2.4
Closes gh-29213
2022-01-03 09:34:38 +01:00
Stephane Nicoll f354c4dac4 Upgrade to Ehcache3 3.9.9
Closes gh-29210
2022-01-03 09:34:38 +01:00
Stephane Nicoll a79a497f13 Upgrade to Dropwizard Metrics 4.2.7
Closes gh-29209
2022-01-03 09:34:38 +01:00
Stephane Nicoll 607508945c Upgrade to DB2 JDBC 11.5.7.0
Closes gh-29208
2022-01-03 09:34:38 +01:00
Stephane Nicoll e4c7251d23 Upgrade to Couchbase Client 3.2.4
Closes gh-29207
2022-01-03 09:34:38 +01:00
Stephane Nicoll 91ac6008e0 Upgrade to Caffeine 2.9.3
Closes gh-29206
2022-01-03 09:34:38 +01:00
Stephane Nicoll 2ac9381be4 Upgrade to Byte Buddy 1.12.6
Closes gh-29205
2022-01-03 09:34:37 +01:00
Stephane Nicoll 8a440b02a6 Upgrade to AssertJ 3.22.0
Closes gh-29204
2022-01-03 09:34:37 +01:00
Stephane Nicoll ecf620fb01 Prevent upgrade to Artemis 2.20.0+
See gh-29203
2022-01-03 09:34:37 +01:00
Stephane Nicoll e3b36b4c7e Upgrade to AppEngine SDK 1.9.93
Closes gh-29202
2022-01-03 09:34:37 +01:00
Stephane Nicoll dea7e34699 Switch bomr to any policy 2022-01-03 09:34:37 +01:00
Stephane Nicoll e10b582a09 Merge branch '2.7.x' 2022-01-03 09:33:42 +01:00
Stephane Nicoll a20f959fbc Merge branch '2.6.x' into 2.7.x 2022-01-03 09:33:33 +01:00
Stephane Nicoll c469c41127 Merge branch '2.5.x' into 2.6.x 2022-01-03 09:33:23 +01:00
Stephane Nicoll 04ce0e65cd Polish assertion 2022-01-03 09:26:22 +01:00
Stephane Nicoll 3ef03cddb9 Merge branch '2.7.x' 2022-01-02 11:26:04 +01:00
Stephane Nicoll 9c868751d6 Merge branch '2.6.x' into 2.7.x
Closes gh-29199
2022-01-02 11:25:56 +01:00
Stephane Nicoll f54ea67ed6 Merge branch '2.5.x' into 2.6.x
Closes gh-29198
2022-01-02 11:25:46 +01:00
dreis2211 7a87d18b12 Update copyrights to 2022
See gh-29195
2022-01-02 11:24:58 +01:00
Stephane Nicoll b94fcd1ad7 Merge branch '2.7.x' 2021-12-30 07:33:36 +01:00
Stephane Nicoll de947e0800 Merge branch '2.6.x' into 2.7.x
Closes gh-29190
2021-12-30 07:33:26 +01:00
izeye d234681348 Fix default value for management.info.env.enabled in metadata
See gh-29187
2021-12-30 07:32:58 +01:00
Stephane Nicoll 637924aee1 Upgrade to Log4j2 2.17.1
Closes gh-29186
2021-12-29 11:31:22 +01:00
Stephane Nicoll a85772be3f Upgrade to Log4j2 2.17.1
Closes gh-29185
2021-12-29 11:30:59 +01:00
Stephane Nicoll b345dddec0 Upgrade to Log4j2 2.17.1
Closes gh-29184
2021-12-29 11:30:25 +01:00
Stephane Nicoll 4b6aa81687 Upgrade to Log4j2 2.17.1
Closes gh-29183
2021-12-29 11:29:25 +01:00
Stephane Nicoll 09486b8fc7 Merge branch '2.7.x' 2021-12-27 12:03:11 +01:00
Stephane Nicoll 2b140950e3 Merge branch '2.6.x' into 2.7.x
Closes gh-29176
2021-12-27 12:02:57 +01:00
izeye 7fbb5749d1 Polish
See gh-29157
2021-12-27 12:01:50 +01:00
Stephane Nicoll eb81cbf053 Merge branch '2.6.x' into 2.7.x
Closes gh-29173
2021-12-25 09:55:38 +01:00
Stephane Nicoll 8ee0640cc0 Merge branch '2.5.x' into 2.6.x
Closes gh-29172
2021-12-25 09:55:24 +01:00
izeye 9a6c1c531d Test our Gradle plugin against Gradle 7.3.3
See gh-29161
2021-12-25 09:52:14 +01:00
Stephane Nicoll 61c978e835 Upgrade to Spring Integration 5.5.7
Closes gh-28975
2021-12-21 17:11:43 +01:00
Stephane Nicoll 369046c37d Upgrade to Spring Integration 5.5.7
Closes gh-28966
2021-12-21 17:09:38 +01:00
Stephane Nicoll c7487749de Upgrade to Spring Session 2021.1.1
Closes gh-28974
2021-12-21 16:53:54 +01:00
Stephane Nicoll 2e67645fd5 Upgrade to Hazelcast 4.2.4
Closes gh-29146
2021-12-21 14:55:32 +01:00
Stephane Nicoll f3621702fb Upgrade to Hazelcast 4.1.8
Closes gh-29145
2021-12-21 14:24:50 +01:00
Stephane Nicoll a6350f2307 Upgrade to Spring Session 2021.0.4
Closes gh-28965
2021-12-21 14:00:18 +01:00
Brian Clozel 88ee4fab36 Polish
See gh-29140
2021-12-21 10:33:51 +01:00
Stephane Nicoll b1ab3b8898 Revert "Upgrade to Spring Kafka 2.7.10"
See gh-29114
2021-12-21 09:30:44 +01:00
Stephane Nicoll 669710efe0 Upgrade to Spring Security 5.6.1
Closes gh-28973
2021-12-21 09:06:49 +01:00
Stephane Nicoll af77ee007a Upgrade to Spring Kafka 2.8.1
Closes gh-29017
2021-12-21 09:06:22 +01:00
Stephane Nicoll 66c43685f5 Upgrade to Spring AMQP 2.4.1
Closes gh-28995
2021-12-21 09:05:46 +01:00
Brian Clozel f61c87c3a7 Revert "Merge branch '2.7.x'"
This reverts commit f0677a119c, reversing
changes made to 938d58f32c.
2021-12-21 09:05:06 +01:00
Stephane Nicoll 44a9145bf8 Upgrade to Spring Security 5.5.4
Closes gh-28964
2021-12-21 09:04:47 +01:00
Brian Clozel f0677a119c Merge branch '2.7.x' 2021-12-21 09:04:10 +01:00
Stephane Nicoll 6f8e1166c6 Upgrade to Spring Kafka 2.7.10
Closes gh-29114
2021-12-21 09:04:05 +01:00
Stephane Nicoll b2c2e6d0ca Upgrade to Spring AMQP 2.3.13
Closes gh-28994
2021-12-21 09:03:40 +01:00
Brian Clozel 22706057f0 Document Spring GraphQL support
This commit documents all the features added in the previous commits:
from the main infrastructure support, to testing and metrics.

See gh-29140
2021-12-21 08:34:56 +01:00
Brian Clozel d5603f2c98 Add GraphQL Spring Boot starter
This new starter brings the following dependencies:

* the base starter
* the JSON starter
* the Spring GraphQL dependency

See gh-29140
2021-12-21 08:34:40 +01:00
Brian Clozel 8e29eac887 Auto-configure GraphQL metrics
This commit auto-configures the metrics infrastructure for Spring
GraphQL.

See gh-29140
2021-12-21 08:34:32 +01:00
Brian Clozel a7839bc9b9 Add Metrics support for Spring GraphQL
This commit adds the required infrastructure for instrumenting the
GraphQL engine and datafetchers in order to collect metrics.

With this infrastructure, we can collect metrics such as:

* "graphql.request", a timer for GraphQL query
* "graphql.datafetcher", a timer for GraphQL datafetcher calls
* "graphql.request.datafetch.count", a distribution summary of
  datafetcher count per query
* "graphql.error", an error counter

See gh-29140
2021-12-21 08:34:24 +01:00
Brian Clozel a34308e5f7 Add GraphQlTest slice
This commit adds the `@GraphQlTest` annotation which brings a new type
of sliced test for GraphQL applications. This considers all the required
infrastructure brought by `@AutoConfigureGraphQl`, but also brings
application components like `@Controller` beans and
`RuntimeWiringConfigurer`.

With this type of test, we'll only initialize a minimal setup for
testing a set of Controllers, without involving any transport-related
component.

See gh-29140
2021-12-21 08:34:15 +01:00
Brian Clozel c0707e4f5b Auto-configure GraphQlTester
This commit adds the required infrastructure to auto-configure a
`GraphQlTester` or `WebGraphQlTester` in Spring Boot tests.
Specific annotations like `AutoConfigureGraphQlTester` and
`AutoConfigureWebGraphQlTester` will contribute pre-configured beans for
testing a GraphQL with the tester.

This also ships a `ContextCustomize` for contributing a `GraphQlTester`
in the case of a full `@SpringBootTest` integration test against a live
server.

See gh-29140
2021-12-21 08:34:06 +01:00
Brian Clozel 9a92a9c91d Add AutoConfigureGraphQl test annotation
This commit adds the `@AutoConfigureGraphQl` test annotation. It can be
used to import the relevant auto-configurations when testing a GraphQL
application.
Currently, it will get the main `GraphQlAutoConfiguration`, but also
what's required for configuring codecs and validation support.

See gh-29140
2021-12-21 08:34:00 +01:00
Brian Clozel 6dbcd0e95e Auto-configure security for Spring GraphQL
This commit configures security features for Spring GraphQL.
In the case of both MVC and WebFlux, this contributes
`DataFetcherExceptionResolver` instances to resolve security exceptions
and expose them as proper errors in the GraphQL response.

For MVC only, this also configures a
`SecurityContextThreadLocalAccessor`. This component ensures that the
security context is propagated between `ThreadLocal` and the Reactor
asynchronous execution.

See gh-29140
2021-12-21 08:33:50 +01:00
Brian Clozel 9954b4c63e Auto-configure Query* support for GraphQL
This commit auto-configures Spring Data Querydsl and QueryByExample
support for Spring GraphQL.

See gh-29140
2021-12-21 08:33:43 +01:00
Brian Clozel ce6747ccd6 Enable GraphiQL UI by default with Devtools
GraphiQL is useful when working on a GraphQL API - it allows
developers to craft queries and test newly developed feature. This
is not enabled by default, as this should not be exposed in production
without the developer's knowledge.

This commit flips this value when Spring Boot devtools is active for a
better developer experience.

See gh-29140
2021-12-21 08:33:31 +01:00
Brian Clozel 6ef1ed0dd0 Auto-configure GraphQL WebSocket endpoint
This commit auto-configures a GraphQL WebSocket endpoint for both Spring
MVC and Spring WebFlux. This is only enabled if the required libraries
are on the classpath and if the `"spring.graphql.websocket.path"`
property is defined.

See gh-29140
2021-12-21 08:33:25 +01:00
Brian Clozel 4ef9b9e3e5 Auto-configure CORS options for GraphQL web endpoints
This commit adds `"spring.graphql.cors.*"` configuration properties to
customize the CORS configuration for GraphQL web endpoints.

See gh-29140
2021-12-21 08:33:19 +01:00
Brian Clozel 0099460155 Auto-configure graphiql endpoint
Spring GraphQL ships with a static version of the graphiql IDE for
exploring and querying GraphQL endpoints.
See https://github.com/graphql/graphiql for more information.

This commit auto-configures the GraphiQL handler for both MVC and
WebFlux and points GraphiQL to the GraphQL HTTP endpoint exposed by the
application. This feature is disabled by default and can be switched on
with "spring.graphql.graphiql.enabled=true".

See gh-29140
2021-12-21 08:33:11 +01:00
Brian Clozel ff9a421786 Auto-configure schema printer endpoint
This commit configuresa new endpoint for printing in text format the
resolved GraphQL schema.
This endpoint is exposed by default under "/graphql/schema" and must be
enabled with "spring.graphql.schema.printer=true".

See gh-29140
2021-12-21 08:33:05 +01:00
Brian Clozel b38d04556e Auto-configure HTTP transport for MVC and WebFlux
This commit adds two new auto-configuration classes for Spring GraphQL
support. Once the base GraphQL infrastructure is in place, we can now
expose the `GraphQlService` over an HTTP transport.

Spring GraphQL supports both MVC and WebFlux, so this commit ships with
one auto-configuration for each.
Developers can configure the HTTP path where the GraphQL resource is
exposed using the `spring.graphql.path` configuration property (this
defaults to `"/graphql"`).

See gh-29140
2021-12-21 08:32:56 +01:00
Brian Clozel 5cf0a4db94 Add FailureAnalyzer for InvalidSchemaLocationsException
This commit adds a new `FailureAnalyzer` for exceptions thrown when no
GraphQL schema file could be found.
This lists configured locations (with `"classpath:..."` notation) and
also resolved locations - this helps developers figure out how the
pattern are resolved and why schema files cannot be found.

See gh-29140
2021-12-21 08:32:48 +01:00
Brian Clozel de808834f5 Auto-configure Spring GraphQL base infrastructure
This commit adds the auto-configuration for setting up the base Spring
GraphQL infrastructure. Because GraphQL doesn't depend on any particular
transport, we must have a separate configuration for creating:

* the `GraphQlSource`, which holds the schema and the `GraphQL` instance
* the `GraphQlService` for executing incoming requests
* the `BatchLoaderRegistry` for batch loading support
* the `AnnotatedControllerConfigurer` for supporting the annotated
  controllers programming model

This comes with a starting point for the `"spring.graphql.*"`
configuration properties; we can now configure the locations and file
extensions of GraphQL schema files we should load and configure at
startup.

See gh-29140
2021-12-21 08:32:37 +01:00
Brian Clozel e5e157528b Add dependency management for Spring GraphQL
This commit adds dependency management in Spring Boot for Spring GraphQL
and GraphQL Java.

See gh-29140
2021-12-21 08:32:09 +01:00
Scott Frederick 938d58f32c Merge branch '2.7.x' 2021-12-20 14:00:47 -06:00
Scott Frederick 29ad84714a Merge branch '2.6.x' into 2.7.x
Closes gh-29144
2021-12-20 14:00:24 -06:00
Scott Frederick b3a304fbe7 Merge branch '2.5.x' into 2.6.x
Closes gh-29143
2021-12-20 14:00:06 -06:00
Scott Frederick e4b0575a12 Do not consider bridge methods when binding java bean properties
Fixes gh-28917
2021-12-20 13:57:36 -06:00
Madhura Bhave 9f47c4a7e0 Merge branch '2.7.x' into main 2021-12-20 09:21:38 -08:00
Madhura Bhave ad45e76b1b Merge branch '2.6.x' into 2.7.x
Closes gh-29139
2021-12-20 09:21:23 -08:00
Madhura Bhave 84f1a6ca09 Merge branch '2.5.x' into 2.6.x
Closes gh-29138
2021-12-20 09:21:08 -08:00
Madhura Bhave 99e650bd27 Document devtools remote support not available with WebFlux
Closes gh-28955
2021-12-20 09:19:34 -08:00
Stephane Nicoll d271e76b48 Merge branch '2.7.x' 2021-12-20 18:08:10 +01:00
Stephane Nicoll 83d732823d Merge branch '2.6.x' into 2.7.x
Closes gh-29136
2021-12-20 18:08:00 +01:00
Stephane Nicoll 653fdbd0a4 Configure comment prefixes
Closes gh-29095
2021-12-20 17:47:50 +01:00
Stephane Nicoll 409f4fdbd7 Merge branch '2.7.x' 2021-12-20 12:37:39 +01:00
Stephane Nicoll dea15a1103 Merge branch '2.6.x' into 2.7.x
Closes gh-29134
2021-12-20 12:37:25 +01:00
Stephane Nicoll 53654a0160 Merge branch '2.5.x' into 2.6.x
Closes gh-29133
2021-12-20 12:37:10 +01:00
Pavel Anisimov b704ee0b30 Polish reference doc
See gh-29115
2021-12-20 12:36:33 +01:00
Stephane Nicoll fd32ff3a51 Upgrade to XmlUnit2 2.8.4
Closes gh-29131
2021-12-20 10:48:31 +01:00
Stephane Nicoll fbb7f12f43 Upgrade to XmlUnit2 2.8.4
Closes gh-29123
2021-12-20 10:48:17 +01:00
Stephane Nicoll 64a5415edc Upgrade to Jackson Bom 2.13.1
Closes gh-29129
2021-12-20 10:46:31 +01:00
Stephane Nicoll d9a970a8e2 Upgrade to Infinispan 12.1.10.Final
Closes gh-29128
2021-12-20 10:46:30 +01:00
Stephane Nicoll a8fc4e9351 Upgrade to Hibernate 5.6.3.Final
Closes gh-29127
2021-12-20 10:46:29 +01:00
Stephane Nicoll 07c8ab2236 Upgrade to Ehcache3 3.9.9
Closes gh-29126
2021-12-20 10:46:27 +01:00
Stephane Nicoll 9ec44d80cf Upgrade to Dropwizard Metrics 4.2.7
Closes gh-29125
2021-12-20 10:46:25 +01:00
Stephane Nicoll 177fd6c539 Upgrade to DB2 JDBC 11.5.7.0
Closes gh-29124
2021-12-20 10:46:22 +01:00
Stephane Nicoll 620c6ec275 Upgrade to Infinispan 12.1.10.Final
Closes gh-29121
2021-12-20 09:57:12 +01:00
Stephane Nicoll d0cd7dcf60 Upgrade to Hibernate 5.4.33
Closes gh-29120
2021-12-20 09:57:11 +01:00
Stephane Nicoll cb81801907 Upgrade to Ehcache3 3.9.9
Closes gh-29119
2021-12-20 09:57:10 +01:00
Stephane Nicoll d8d97df34a Upgrade to Dropwizard Metrics 4.1.29
Closes gh-29118
2021-12-20 09:57:08 +01:00
Stephane Nicoll 8306287158 Upgrade to DB2 JDBC 11.5.7.0
Closes gh-29117
2021-12-20 09:57:06 +01:00
Stephane Nicoll bb1a1a0622 Upgrade to Spring LDAP 2.3.5
Closes gh-28972
2021-12-19 18:46:18 +01:00
Stephane Nicoll f619d66244 Upgrade to Spring LDAP 2.3.5
Closes gh-28963
2021-12-19 18:45:23 +01:00
Stephane Nicoll aab30b13b3 Start building against Spring Kafka 2.7.10 snapshots
See gh-29114
2021-12-19 18:30:54 +01:00
Stephane Nicoll 2d7e478a55 Merge branch '2.7.x' 2021-12-18 12:25:01 +01:00
Stephane Nicoll 4fa0e87ba1 Merge branch '2.6.x' into 2.7.x 2021-12-18 12:24:51 +01:00
Stephane Nicoll efa93506e6 Fix checkstyle violations 2021-12-18 12:23:53 +01:00
Stephane Nicoll d728159b32 Upgrade to Log4j2 2.17.0
Closes gh-28986
2021-12-18 08:54:18 +01:00
Stephane Nicoll 84ef1f7c21 Upgrade to Log4j2 2.17.0
Closes gh-28985
2021-12-18 08:53:36 +01:00
Stephane Nicoll 012fbdd43d Upgrade to Log4j2 2.17.0
Closes gh-28984
2021-12-18 08:53:04 +01:00
Stephane Nicoll cb02944c71 Upgrade to Log4j2 2.17.0
Closes gh-28983
2021-12-18 08:52:22 +01:00
Madhura Bhave 1c17a851b7 Merge branch '2.7.x' into main 2021-12-17 17:57:45 -08:00
Madhura Bhave d803c53e02 Merge branch '2.6.x' into 2.7.x
Closes gh-29109
2021-12-17 17:57:33 -08:00
Madhura Bhave 4cc8012bfa Handle WebServerNamespace in CachingOperationInvoker
Fixes gh-28882
2021-12-17 17:55:06 -08:00
Madhura Bhave 48a6470ddb Merge branch '2.7.x' into main 2021-12-17 17:51:48 -08:00
Madhura Bhave 764531c326 Merge branch '2.6.x' into 2.7.x
Closes gh-29108
2021-12-17 17:51:29 -08:00
Madhura Bhave d9d161cd6b Allow previously authorized users to access the error page
Prior to this commit, the `ErrorPageSecurityFilter` verified if
access to the error page was allowed by invoking the
`WebInvocationPrivilegeEvaluator` with the Authentication from the
`SecurityContextHolder`.
This meant that access to the error page was denied for a `null` Authentication
 or `AnonymousAuthenticationToken` in cases where the error page required
authenticated access. This prevented authorized users from accessing the
error page in case the Authentication wasn't retrievable for the error dispatch,
which is the case for `@Transient` authentication or stateless session policy.

This commit updates the `ErrorPageSecurityFilter` to check access to the error page
only if the error is an authn or authz error in cases where an authentication object
is not found in the SecurityContextHolder. This makes the error response consistent
when bad credentials or no credentials are used while also allowing access to previously
authorized users.

Fixes gh-28953
2021-12-17 16:58:58 -08:00
Stephane Nicoll c975fbc286 Merge branch '2.7.x' 2021-12-17 16:38:15 +01:00
Stephane Nicoll 64dd1f86c0 Merge branch '2.6.x' into 2.7.x
Closes gh-29104
2021-12-17 16:38:07 +01:00
Stephane Nicoll c077ebecf7 Merge branch '2.5.x' into 2.6.x
Closes gh-29103
2021-12-17 16:37:53 +01:00
Andy Wilkinson 2fec06ac7e Find annotation without initializing factory beans
Closes gh-28977
2021-12-17 16:08:30 +01:00
Brian Clozel d13441c009 Merge branch '2.7.x'
Closes gh-29014
2021-12-17 12:16:02 +01:00
Brian Clozel b04f7904ff Merge branch '2.6.x' into 2.7.x
Closes gh-29013
2021-12-17 12:15:15 +01:00
Brian Clozel 1c35ec2c3c Merge branch '2.5.x' into 2.6.x
Closes gh-29012
2021-12-17 12:14:31 +01:00
Brian Clozel 5d0206320a Upgrade to Logback 1.2.9
Closes gh-29011
2021-12-17 12:13:02 +01:00
Stephane Nicoll b9057f1957 Merge branch '2.7.x' 2021-12-17 10:50:23 +01:00
Stephane Nicoll de383fcee0 Merge branch '2.6.x' into 2.7.x
Closes gh-29099
2021-12-17 10:50:15 +01:00
Stephane Nicoll bcaa59ce73 Merge branch '2.5.x' into 2.6.x
Closes gh-29098
2021-12-17 10:50:07 +01:00
Pavel Anisimov 415c58e21b Polish CacheManager customization section in reference doc
See gh-29094
2021-12-17 10:48:55 +01:00
Stephane Nicoll a05714ad9f Merge branch '2.6.x' into 2.7.x
Closes gh-29097
2021-12-17 10:30:42 +01:00
Stephane Nicoll 10362a9315 Merge branch '2.5.x' into 2.6.x
Closes gh-29096
2021-12-17 10:30:26 +01:00
Stephane Nicoll 8c9d398422 Test our Gradle plugin against Gradle 7.3.2
Closes gh-29093
2021-12-17 09:11:44 +01:00
Phillip Webb 1015df088d Merge branch '2.6.x' into 2.7.x 2021-12-16 13:55:55 -08:00
Phillip Webb 587d6fa309 Polish 2021-12-16 13:55:42 -08:00
Phillip Webb 003fb229fd Merge branch '2.7.x' 2021-12-16 13:07:22 -08:00
Phillip Webb f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08:00
Scott Frederick b4cdd37e63 Merge branch '2.7.x' 2021-12-16 12:24:25 -06:00
Scott Frederick 4cad4851da Merge branch '2.6.x' into 2.7.x
Closes gh-29088
2021-12-16 12:24:12 -06:00
Scott Frederick 92b096abbf Fix message interpolation when code is used as default message
When `setUseCodeAsDefaultMessage(true)` was set on a message source,
attempting to interpolate the default message returned from the message
source would result in the code being unusable by upstream message
resolvers.

Fixes gh-28930
2021-12-16 12:20:37 -06:00
Stephane Nicoll f2efe56a18 Upgrade to Spring Framework 5.3.14 2021-12-16 17:51:27 +01:00
Stephane Nicoll a7a37f4ad6 Upgrade to Spring Framework 5.3.14
Closes gh-28970
2021-12-16 17:50:53 +01:00
Stephane Nicoll b8bf2cbbc7 Upgrade to Spring Framework 5.3.14
Closes gh-28961
2021-12-16 17:50:18 +01:00
Stephane Nicoll 75d2c36846 Merge branch '2.7.x' 2021-12-16 17:30:45 +01:00
Stephane Nicoll 63427b77d1 Merge branch '2.6.x' into 2.7.x
Closes gh-29086
2021-12-16 17:30:36 +01:00
Stephane Nicoll 55859ea64c Stop accessing the datasource if initialization mode is set to never
Closes gh-28931
2021-12-16 16:50:22 +01:00
Stephane Nicoll 4b1c0e5a03 Start building against Spring Framework 5.3.14 snapshots 2021-12-15 16:52:41 +01:00
Stephane Nicoll 035adf4f05 Merge branch '2.7.x' 2021-12-15 16:41:27 +01:00
Stephane Nicoll 38aeeee381 Merge branch '2.6.x' into 2.7.x 2021-12-15 16:41:19 +01:00
Stephane Nicoll 3b4d27e4d3 Merge branch '2.5.x' into 2.6.x 2021-12-15 16:41:09 +01:00
Stephane Nicoll 30ebb17b2b Polish 2021-12-15 16:38:27 +01:00
Stephane Nicoll a5734ef194 Upgrade to Reactor 2020.0.14
Closes gh-28969
2021-12-15 15:12:20 +01:00
Stephane Nicoll 28214e1e8c Upgrade to Reactor 2020.0.14
Closes gh-28960
2021-12-15 15:11:38 +01:00
Stephane Nicoll 4f14428351 Upgrade to Undertow 2.2.14.Final
Closes gh-29072
2021-12-15 15:11:24 +01:00
Stephane Nicoll a4fbc98667 Upgrade to Thymeleaf 3.0.14.RELEASE
Closes gh-29070
2021-12-15 15:11:21 +01:00
Stephane Nicoll 45e8711b5b Upgrade to Spring WS 3.1.2
Closes gh-29069
2021-12-15 15:11:20 +01:00
Stephane Nicoll 3bbc4649b7 Upgrade to MSSQL JDBC 9.4.1.jre8
Closes gh-29068
2021-12-15 15:11:19 +01:00
Stephane Nicoll 36332d42b8 Upgrade to JUnit Jupiter 5.8.2
Closes gh-29066
2021-12-15 15:11:16 +01:00
Stephane Nicoll 657f6e0010 Upgrade to Jedis 3.7.1
Closes gh-29065
2021-12-15 15:11:15 +01:00
Stephane Nicoll afd254424b Upgrade to JDOM2 2.0.6.1
Closes gh-29064
2021-12-15 15:11:14 +01:00
Stephane Nicoll 7156e3fb23 Upgrade to HttpCore 4.4.15
Closes gh-29063
2021-12-15 15:11:13 +01:00
Stephane Nicoll 0219408b7e Upgrade to HttpAsyncClient 4.1.5
Closes gh-29062
2021-12-15 15:11:11 +01:00
Stephane Nicoll 081d4f6d9c Upgrade to Hibernate 5.6.2.Final
Closes gh-29061
2021-12-15 15:11:10 +01:00
Stephane Nicoll 76b1ec3cac Upgrade to Hazelcast 4.2.3
Closes gh-29060
2021-12-15 15:11:09 +01:00
Stephane Nicoll 84d552f4d2 Upgrade to Flyway 8.0.5
Closes gh-29059
2021-12-15 15:11:08 +01:00
Stephane Nicoll fedf341d65 Upgrade to Ehcache3 3.9.8
Closes gh-29058
2021-12-15 15:11:07 +01:00
Stephane Nicoll 0165c40f02 Upgrade to Dropwizard Metrics 4.2.5
Closes gh-29057
2021-12-15 15:11:05 +01:00
Stephane Nicoll b11aa6d5cd Upgrade to Couchbase Client 3.2.4
Closes gh-29056
2021-12-15 15:11:04 +01:00
Stephane Nicoll d80e68adf0 Upgrade to Caffeine 2.9.3
Closes gh-29055
2021-12-15 15:11:03 +01:00
Stephane Nicoll c45bdd19fd Upgrade to AppEngine SDK 1.9.93
Closes gh-29054
2021-12-15 15:11:01 +01:00
Stephane Nicoll 97ee63b55b Upgrade to Undertow 2.2.14.Final
Closes gh-29051
2021-12-15 14:01:27 +01:00
Stephane Nicoll 74ce8b7516 Upgrade to Thymeleaf 3.0.14.RELEASE
Closes gh-29049
2021-12-15 14:01:25 +01:00
Stephane Nicoll e234ccd457 Upgrade to Spring WS 3.1.2
Closes gh-29048
2021-12-15 14:01:24 +01:00
Stephane Nicoll 272e184259 Upgrade to JDOM2 2.0.6.1
Closes gh-29046
2021-12-15 14:01:21 +01:00
Stephane Nicoll 084eae5124 Upgrade to Jackson Bom 2.12.6
Closes gh-29045
2021-12-15 14:01:20 +01:00
Stephane Nicoll d60c0593f3 Upgrade to HttpCore 4.4.15
Closes gh-29044
2021-12-15 14:01:19 +01:00
Stephane Nicoll 8c10266c62 Upgrade to HttpAsyncClient 4.1.5
Closes gh-29043
2021-12-15 14:01:18 +01:00
Stephane Nicoll 70805793a1 Upgrade to Hazelcast 4.1.7
Closes gh-29042
2021-12-15 14:01:16 +01:00
Stephane Nicoll f0a4ac6154 Upgrade to Ehcache3 3.9.8
Closes gh-29041
2021-12-15 14:01:15 +01:00
Stephane Nicoll 41a9b08049 Upgrade to Dropwizard Metrics 4.1.27
Closes gh-29040
2021-12-15 14:01:14 +01:00
Stephane Nicoll b7e233805f Upgrade to Caffeine 2.9.3
Closes gh-29039
2021-12-15 14:01:12 +01:00
Stephane Nicoll 6dcc289e6b Upgrade to AppEngine SDK 1.9.93
Closes gh-29038
2021-12-15 14:01:11 +01:00
Stephane Nicoll fac6ccdd77 Merge branch '2.7.x' 2021-12-15 09:42:45 +01:00
Stephane Nicoll 61bb068a48 Merge branch '2.6.x' into 2.7.x
Closes gh-29032
2021-12-15 09:42:38 +01:00
Stephane Nicoll da60b96cf5 Merge branch '2.5.x' into 2.6.x
Closes gh-29031
2021-12-15 09:42:30 +01:00
copbint 0a9a6639e5 Remove redundant log4j-to-slf4j
See gh-29019
2021-12-15 09:40:10 +01:00
Stephane Nicoll 1c72330bd9 Upgrade to Log4j2 2.16.0
Closes gh-28986
2021-12-15 09:31:43 +01:00
Stephane Nicoll 894eb83e66 Upgrade to Log4j2 2.16.0
Closes gh-28985
2021-12-15 09:31:04 +01:00
Stephane Nicoll 15ade0b5d3 Upgrade to Log4j2 2.16.0
Closes gh-28984
2021-12-15 09:30:10 +01:00
Stephane Nicoll 4c57d1717d Upgrade to Log4j2 2.16.0
Closes gh-28983
2021-12-15 09:28:44 +01:00
Stephane Nicoll 3124d9e62d Start building against Spring Kafka 2.8.1 snapshots
See gh-29017
2021-12-14 15:39:27 +01:00
Stephane Nicoll cd69781457 Merge branch '2.7.x' 2021-12-14 15:32:22 +01:00
Stephane Nicoll 9ca1cffab7 Merge branch '2.6.x' into 2.7.x
Closes gh-29016
2021-12-14 15:32:13 +01:00
Stephane Nicoll ba60e3d358 Merge branch '2.5.x'
Closes gh-29002
2021-12-14 15:31:45 +01:00
Stephane Nicoll 157b3aa25f Allow platform to be configured in DataSourceInitializers
Closes gh-28932
2021-12-14 15:07:32 +01:00
Stephane Nicoll 4cb54c541c Upgrade to Logback 1.2.8
Closes gh-29014
2021-12-14 14:30:39 +01:00
Stephane Nicoll 2d94fc437c Upgrade to Logback 1.2.8
Closes gh-29013
2021-12-14 14:29:56 +01:00
Stephane Nicoll d8eab45146 Upgrade to Logback 1.2.8
Closes gh-29012
2021-12-14 14:29:26 +01:00
Stephane Nicoll d18eae35e5 Upgrade to Logback 1.2.8
Closes gh-29011
2021-12-14 14:26:12 +01:00
Stephane Nicoll 6adbb50f02 Upgrade to Netty 4.1.72.Final
Closes gh-29005
2021-12-13 18:25:06 +01:00
Stephane Nicoll 1bda928ad3 Upgrade to Netty 4.1.72.Final
Closes gh-29004
2021-12-13 17:55:38 +01:00
Stephane Nicoll 50c15769ff Merge branch '2.7.x' 2021-12-13 09:23:52 +01:00
Stephane Nicoll 5383de4fe1 Merge branch '2.6.x' into 2.7.x 2021-12-13 09:23:44 +01:00
Stephane Nicoll 32ecbb89d6 Merge branch '2.5.x' into 2.6.x 2021-12-13 09:23:33 +01:00
Stephane Nicoll 496cd3d2ba Polish
See gh-28999
2021-12-13 09:23:08 +01:00
Stephane Nicoll b81adecde3 Start building against Spring AMQP 2.4.1 snapshots
See gh-28995
2021-12-11 17:19:42 +01:00
Stephane Nicoll 93f75a7d12 Start building against Spring AMQP 2.3.13 snapshots
See gh-28994
2021-12-11 17:19:08 +01:00
Andy Wilkinson 3c8d4d33e1 Upgrade to Spring Data Elasticsearch 7.16.0
Closes gh-28987
2021-12-10 21:43:29 +00:00
Stephane Nicoll 95a8e5eda5 Upgrade to Log4j2 2.15.0
Closes gh-28986
2021-12-10 14:48:17 +01:00
Stephane Nicoll 87fc7672d8 Upgrade to Log4j2 2.15.0
Closes gh-28985
2021-12-10 14:47:26 +01:00
Stephane Nicoll 4f85d8a4b0 Upgrade to Log4j2 2.15.0
Closes gh-28984
2021-12-10 14:46:11 +01:00
Stephane Nicoll 1d8e3a865e Upgrade to Log4j2 2.15.0
Closes gh-28983
2021-12-10 14:44:50 +01:00
Stephane Nicoll b961b14d0f Merge branch '2.6.x' into 2.7.x
Closes gh-28980
2021-12-10 11:02:02 +01:00
Stephane Nicoll dfab6ee307 Merge branch '2.5.x' into 2.6.x
Closes gh-28979
2021-12-10 11:01:48 +01:00
Stephane Nicoll f6f5aec183 Polish "Check for the presence of Spring Security"
See gh-28967
2021-12-10 10:59:00 +01:00
Guirong Hu 4462f9157e Check for the presence of Spring Security
See gh-28967
2021-12-10 10:58:30 +01:00
Stephane Nicoll c7b606d8b6 Start building against Spring Integration 5.5.7 snapshots
See gh-28975
2021-12-10 08:19:23 +01:00
Stephane Nicoll 018481e381 Start building against Spring Session 2021.1.1 snapshots
See gh-28974
2021-12-10 08:18:55 +01:00
Stephane Nicoll 8792f1a792 Start building against Spring Security 5.6.1 snapshots
See gh-28973
2021-12-10 08:18:26 +01:00
Stephane Nicoll 9dc2450cd7 Start building against Spring LDAP 2.3.5 snapshots
See gh-28972
2021-12-10 08:17:55 +01:00
Stephane Nicoll d471397f47 Upgrade to Micrometer 1.8.1
Closes gh-28971
2021-12-10 08:17:17 +01:00
Stephane Nicoll 84ba9e2a8f Start building against Spring Framework 5.3.14 snapshots
See gh-28970
2021-12-10 08:16:47 +01:00
Stephane Nicoll ec453acf7f Start building against Reactor 2020.0.14 snapshots
See gh-28969
2021-12-10 08:16:21 +01:00
Stephane Nicoll f1f43e8577 Start building against Spring Integration 5.5.7 snapshots
See gh-28966
2021-12-10 06:54:25 +01:00
Stephane Nicoll e53bac272c Start building against Spring Session 2021.0.4 snapshots
See gh-28965
2021-12-10 06:54:01 +01:00
Stephane Nicoll 9894e90567 Start building against Spring Security 5.5.4 snapshots
See gh-28964
2021-12-10 06:53:38 +01:00
Stephane Nicoll a3b31db31d Start building against Spring LDAP 2.3.5 snapshots
See gh-28963
2021-12-10 06:53:13 +01:00
Stephane Nicoll 33ce2ab73b Upgrade to Micrometer 1.7.7
Closes gh-28962
2021-12-10 06:51:25 +01:00
Stephane Nicoll 4a35c7111f Start building against Spring Framework 5.3.14 snapshots
See gh-28961
2021-12-10 06:50:52 +01:00
Stephane Nicoll 7af3bd54a1 Start building against Reactor 2020.0.14 snapshots
See gh-28960
2021-12-10 06:50:21 +01:00
Scott Frederick c78b157e95 Merge branch '2.7.x' 2021-12-09 16:42:33 -06:00
Scott Frederick 8f57f0babb Add classpath index support for exploded war archives
Update the Maven and Gradle packaging for war files so that a
`classpath.idx` file is written into the archive that provides the
original order of the classpath, as was previously done for jar files.
The `WarLauncher` class will use this file when running as an exploded
archive to ensure that the classpath order is the same as when running
from the far war.

Fixes gh-19875
2021-12-09 16:41:49 -06:00
Stephane Nicoll d61d597a96 Merge branch '2.7.x' 2021-12-09 16:00:20 +01:00
Stephane Nicoll a2eeb77e21 Merge branch '2.6.x' into 2.7.x
Closes gh-28951
2021-12-09 16:00:09 +01:00
Vedran Pavic 0af4431db8 Apply SameSite session cookie property to Spring Session
This commit maps the `server.servlet.session.cookie.same-site`
configuration property to the `DefaultCookieSerializer` bean configured
in the Spring Session auto-configuration.

See gh-28784
2021-12-09 15:53:50 +01:00
Stephane Nicoll c83ab9bbc5 Merge branch '2.7.x' 2021-12-09 15:51:29 +01:00
Stephane Nicoll 89635eafa3 Update copyright year of changed files
See gh-28862
2021-12-09 15:48:47 +01:00
Stefano Cordio a5c56043b9 Simplify AssertJ usage
See gh-28862
2021-12-09 15:39:02 +01:00
Stephane Nicoll fcea05a4b8 Merge branch '2.7.x' 2021-12-09 15:09:53 +01:00
Stephane Nicoll 2b3827332f Merge branch '2.6.x' into 2.7.x
Closes gh-28946
2021-12-09 15:09:46 +01:00
izeye 0364353204 Add public accessor for StackdriverProperties.useSemanticMetricTypes
See gh-28944
2021-12-09 15:09:13 +01:00
Stephane Nicoll 377b58f64c Merge branch '2.7.x' 2021-12-09 15:06:36 +01:00
Stephane Nicoll a323ff7136 Merge branch '2.6.x' into 2.7.x
Closes gh-28945
2021-12-09 15:06:26 +01:00
Stephane Nicoll 5599e8d340 Polish "Add consistent quotes in YAML samples of reference doc"
See gh-28911
2021-12-09 15:02:47 +01:00
Viktor Ardelean 0b781d87b1 Add consistent quotes in YAML samples of reference doc
See gh-28911
2021-12-09 15:02:23 +01:00
Andy Wilkinson 51957f18c4 Merge branch '2.6.x' into 2.7.x
Closes gh-28942
2021-12-09 12:52:04 +00:00
Artur Signell ad754abba3 Make ErrorPageSecurityFilter compatible with Servlet 3.1
See gh-28902
2021-12-09 12:36:35 +00:00
dramatist ac2ef33107 Upgrade Java version to 17 in spring-boot-starter-parent's pom
See gh-28928
2021-12-09 11:51:19 +00:00
Stephane Nicoll 77c8303bd0 Merge branch '2.7.x' 2021-12-09 10:46:18 +01:00
Stephane Nicoll 7af589d31a Merge branch '2.6.x' into 2.7.x
Closes gh-28937
2021-12-09 10:46:04 +01:00
Stephane Nicoll 25a2888be5 Fix default value of spring.mvc.pathmatch.matching-strategy property
Closes gh-28936
2021-12-09 10:45:21 +01:00
Andy Wilkinson 756b9b9254 Switch back to using Spring Session's bom
Closes gh-28870
2021-12-08 14:48:13 +00:00
Scott Frederick 2b7a034776 Merge branch '2.7.x' 2021-12-07 14:11:06 -06:00
Scott Frederick 3cb30cb283 Merge branch '2.6.x' into 2.7.x
Closes gh-28923
2021-12-07 14:10:46 -06:00
Scott Frederick 3555837845 Merge branch '2.5.x' into 2.6.x
Closes gh-28922
2021-12-07 14:10:28 -06:00
Scott Frederick b0b2cd79b4 Use latest buildpack image tag when no tag is provided
Fixes gh-28921
2021-12-07 14:10:10 -06:00
Scott Frederick 33953823fc Replace usage of deprecated Spring Framework methods
See gh-28642
2021-12-06 16:12:34 -06:00
Scott Frederick 16f54d2c5c Merge branch '2.7.x' 2021-12-03 11:42:52 -06:00
Scott Frederick 61fb9f83df Merge branch '2.6.x' into 2.7.x
Closes gh-28905
2021-12-03 11:42:28 -06:00
Scott Frederick ab0cc55e20 Merge branch '2.5.x' into 2.6.x
Closes gh-28904
2021-12-03 11:42:03 -06:00
Scott Frederick 467c092fdc Remove classpath index manifest attribute from repackaged war files
Fixes gh-28895
2021-12-03 11:41:28 -06:00
Andy Wilkinson a3ecdcf058 Merge branch '2.6.x' into 2.7.x
Closes gh-28892
2021-12-02 10:31:11 +00:00
Andy Wilkinson 4606e17696 Merge branch '2.5.x' into 2.6.x
Closes gh-28891
2021-12-02 10:30:51 +00:00
Andy Wilkinson af60a8a7cf Test our Gradle plugin against Gradle 7.3.1
Closes gh-28890
2021-12-02 10:29:22 +00:00
Scott Frederick f28eb073b3 Remove unnecessary exclusion from web-services starter
See gh-28648
2021-12-01 15:18:32 -06:00
Scott Frederick 1f838bf2ee Merge branch '2.7.x' 2021-12-01 14:08:26 -06:00
Scott Frederick 5f14cffea3 Add support for CNB platform API 0.5 through 0.8
Fixes gh-28850
2021-12-01 14:05:20 -06:00
Andy Wilkinson fe7b13ec46 Upgrade to Spring Framework 6 and Jakarta EE 9
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872

See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
2021-11-30 20:32:16 +00:00
Andy Wilkinson 91b2eb1a6f Remove dependency management for Atomikos
See gh-28589
2021-11-30 20:30:38 +00:00
Andy Wilkinson 4a8904aaa9 Drop support for jOOQ until its dependencies are Jakarta EE 9 compatible
Closes gh-28821
2021-11-30 15:55:48 +00:00
Andy Wilkinson ba19440f8c Drop support for EhCache 3 until it supports Jakarta EE 9
Closes gh-28800
2021-11-30 15:55:48 +00:00
Andy Wilkinson a17d6f9791 Drop support for Infinispan until it is Jakarta EE 9 compatible
Closes gh-28799
2021-11-30 15:55:48 +00:00
Scott Frederick 015dca1956 Remove support for Thymeleaf
Closes gh-28611
2021-11-30 15:55:47 +00:00
Andy Wilkinson 22cc9ca6fa Drop support for CommonsMultipartResolver
Closes gh-28782
2021-11-30 15:55:47 +00:00
Andy Wilkinson f26995307e Remove support for REST Assured until it supports Jakarta EE 9
Closes gh-28722
2021-11-30 15:55:47 +00:00
Andy Wilkinson 85f9949513 Remove support for Jolokia
Closes gh-28704
2021-11-30 15:55:47 +00:00
Andy Wilkinson 79b53e3562 Drop support for auto-configuring Hibernate metrics
Closes gh-28703
2021-11-30 15:55:20 +00:00
Andy Wilkinson 6e7f2766c8 Remove support for pooled-jms as it is not JMS 3.0 compatible
Closes gh-28701
2021-11-30 15:55:09 +00:00
Madhura Bhave c8fd5f0080 Remove support for Artemis
Closes gh-28593
2021-11-30 15:39:56 +00:00
Andy Wilkinson 8bf2ffd93c Drop support for Jersey until jersey-spring6 is available
Closes gh-28808
2021-11-30 15:39:39 +00:00
Scott Frederick 29a21d4621 Remove support for Spring Data Couchbase and Couchbase caching
Fixes gh-28613
2021-11-30 15:39:28 +00:00
Andy Wilkinson 0024eba816 Remove dependency management for Apache Johnzon
Closes gh-28616
2021-11-30 15:39:17 +00:00
Andy Wilkinson 5944041f2a Switch to Yasson for JSON-B testing
Closes gh-28615
2021-11-30 15:39:08 +00:00
Andy Wilkinson 40fe9ca467 Provide dependency management for Eclipse Yasson
Closes gh-28614
2021-11-30 15:38:56 +00:00
Andy Wilkinson 63492507b4 Remove support for Apache ActiveMQ
Closes gh-28591
2021-11-30 15:38:46 +00:00
Andy Wilkinson a3c4059ee8 Remove support for H2's web console
Closes gh-28590
2021-11-30 15:38:35 +00:00
Andy Wilkinson 64bf33038d Remove support for EhCache 2
Closes gh-28588
2021-11-30 15:38:23 +00:00
Andy Wilkinson ef02cc9bff Remove support for Atomikos
Closes gh-28589
2021-11-30 15:38:01 +00:00
Andy Wilkinson 900085628a Raise the minimum supported version of Java to 17
Closes gh-28101
2021-11-30 15:37:40 +00:00
Andy Wilkinson 99f33ede14 Remove SecurityManager support
Closes gh-28213
2021-11-30 15:37:15 +00:00
Andy Wilkinson 814c86c5e8 Raise the minimum supported version of Gradle to 7.3
Closes gh-28100
2021-11-30 15:36:54 +00:00
Andy Wilkinson e06b0d97f7 Update main branch to start work on 3.0.x 2021-11-30 15:07:24 +00:00
Andy Wilkinson 86a773a8e9 Update main branch to start work on 2.7.x 2021-11-30 11:16:53 +00:00
Stephane Nicoll 46a8673bf8 Merge branch '2.5.x'
Closes gh-28839
2021-11-29 09:44:31 +01:00
Stephane Nicoll 1876b4bcd7 Update copyright year of changed files
See gh-28809
2021-11-29 09:43:44 +01:00
Leo Li f3c93d30a8 Fix reference to matching-strategy property
See gh-28809
2021-11-29 09:39:40 +01:00
izeye c7921468fc Polish
See gh-28836
2021-11-29 09:38:07 +01:00
Stephane Nicoll 88aa849f90 Merge branch '2.5.x' 2021-11-29 09:37:31 +01:00
Stephane Nicoll 1bb3f906a7 Polish
See gh-28836
2021-11-29 09:35:51 +01:00
Stephane Nicoll e4082ee5d9 Merge branch '2.5.x'
Closes gh-28834
2021-11-28 11:18:57 +01:00
fml2 1d786e49e9 Fix typos in the "External Application Properties" section
See gh-28830
2021-11-28 11:17:22 +01:00
Stephane Nicoll 9719930496 Merge branch '2.5.x'
Closes gh-28833
2021-11-28 11:14:52 +01:00
Xavier Bouclet dce979d51f Fix output of "spring --version" in reference documentation
See gh-28831
2021-11-28 11:14:14 +01:00
Andy Wilkinson 4bd86a6e20 Allow spring-boot-image-tests to run without an existing snapshot
Closes gh-28817
2021-11-26 13:01:34 +00:00
Željko Tomić 1c1c85c3f8 Fix MariaDB mapping for Quartz DataSource initialization
See gh-28779
2021-11-25 09:38:44 +01:00
Madhura Bhave 27eb992252 Fix property source ordering in SpringBootTest
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Closes gh-28804
2021-11-24 10:29:35 -08:00
Phillip Webb beb68671bb Update copyright year of changed files 2021-11-24 10:23:32 -08:00
Madhura Bhave e7ff2cf358 Guard ErrorPageSecurityFilter configuration with ConditionalOnClass
Update `ErrorPageSecurityFilterConfiguration` to guard against the case
where `spring-security-core` is on the classpath but
`spring-security-web` is not.

Fixes gh-28774
2021-11-24 10:20:29 -08:00
Madhura Bhave 49e408828c Fix property source ordering in SpringBootTest
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.

Fixes gh-28776
2021-11-24 10:17:02 -08:00
Madhura Bhave e6b5be900a Make ErrorPageSecurityFilter Servlet 3.1 compatible
Restore Servlet 3.1 compatibly by implementing `Filter` rather
than extending the 4.0 `HttpFilter` type.

Fixes gh-28790
2021-11-24 09:59:27 -08:00
Madhura Bhave f621937d3b Skip error page security filter for non-error dispatch type
Update `ErrorPageSecurityFilter` to defensively check that the
`DispatcherType` is `ERROR`. Although this check isn't necessary
for regular applications, it is needed if MockMvc is being used.

Fixes gh-28759
2021-11-24 09:55:59 -08:00
Scott Frederick 4eed637481 Merge branch '2.5.x'
Closes gh-28789
2021-11-23 12:45:46 -06:00
Scott Frederick 12244a8edd Remove use of Thymeleaf from smoke tests
Closes gh-28788
2021-11-23 12:13:05 -06:00
Andy Wilkinson 03e283a2e6 Mention WebProperties in deprecation of ResourceProperties
Closes gh-28762
2021-11-22 10:03:21 +00:00
Yanming Zhou da2dfbe0aa LettuceMetricsAutoConfiguration should not build ClientResources
See gh-28767
2021-11-22 09:49:07 +01:00
Stephane Nicoll 490ec8974d Merge branch '2.5.x'
Closes gh-28761
2021-11-20 17:30:35 +01:00
Stephane Nicoll 667bca05ec Polish "Add package info for Spring Data metrics support"
See gh-28756
2021-11-20 17:29:52 +01:00
charissathomas 42ae5114ef Create package-info.java
Closes #28731
2021-11-20 17:29:22 +01:00
Andy Wilkinson 0074d621d0 Merge branch '2.5.x'
Closes gh-28754
2021-11-19 15:37:32 +00:00
Andy Wilkinson 015cf920da Name custom task inputs
Closes gh-28753
2021-11-19 15:35:39 +00:00
Andy Wilkinson 258222781a Merge branch '2.5.x'
Closes gh-28752
2021-11-19 14:52:03 +00:00
Andy Wilkinson 96d98a0f6f Declare dir task inputs with relative path sensitivity
Closes gh-28751
2021-11-19 14:29:29 +00:00
Andy Wilkinson c0d90dfa8f Merge branch '2.5.x'
Closes gh-28749
2021-11-19 13:36:01 +00:00
Andy Wilkinson c083e0b049 Avoid using temp before @TempDir has initialized it
Closes gh-28748
2021-11-19 13:35:30 +00:00
Andy Wilkinson 4a0fa62d2e Polish "Replace "you're""
See gh-28710
2021-11-19 13:24:17 +00:00
Jay Bryant e629e77b29 Replace "you're"
This commit replaces "you're" with some other structure, often
simplifying the sentence in the process.

Also checked for words that end with "'ll" and "n't" but did not find
any.

See gh-28710
2021-11-19 13:23:10 +00:00
Andy Wilkinson 00fa0fb769 Merge branch '2.5.x'
Closes gh-28746
2021-11-19 10:19:14 +00:00
Andy Wilkinson f2b959b0a5 Add <type>zip</type> to Elasticsearch dist in dependencies bom
Fixes gh-28725
2021-11-19 10:13:14 +00:00
Madhura Bhave dd1d1482dc Deny unauthorized access to the error page
Fixes gh-26356

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
2021-11-18 15:41:38 -08:00
Andy Wilkinson 29725ec68a Update links to Spring Security's reference docs
Closes gh-28618
2021-11-18 11:59:48 +00:00
Madhura Bhave 6b79d2860f Merge branch '2.5.x' into main
Closes gh-28724
2021-11-17 16:41:23 -08:00
Madhura Bhave 64270eca51 Convert environment used by SpringBootTestContextLoader
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.

The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.

Fixes gh-28530
2021-11-17 16:40:53 -08:00
Stephane Nicoll 7fbb9d471b Polish "Upgrade to Neo4j Java Driver 4.2.8"
See gh-28717
2021-11-17 16:14:25 +01:00
Stephane Nicoll a6163f6acf Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28720
2021-11-17 15:03:59 +01:00
Stephane Nicoll fc69be302a Upgrade to HttpClient5 5.1.2
Closes gh-28719
2021-11-17 15:03:57 +01:00
Stephane Nicoll f33c8f6fde Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28718
2021-11-17 15:02:27 +01:00
Stephane Nicoll 9dd599c9e3 Upgrade to Neo4j Java Driver 4.2.8
Closes gh-28717
2021-11-17 15:02:25 +01:00
Stephane Nicoll ba3d0d7771 Upgrade to Spring Session 2021.1.0
Closes gh-28522
2021-11-17 14:14:08 +01:00
Andy Wilkinson ea0613c7d7 Merge branch '2.5.x'
Closes gh-28261
2021-11-17 10:07:18 +00:00
Andy Wilkinson 416a133fd1 Merge branch '2.4.x' into 2.5.x
Closes gh-28250
2021-11-17 10:06:41 +00:00
Andy Wilkinson 838533ef0e Upgrade to Spring Batch 4.3.4
Closes gh-28230
2021-11-17 10:04:51 +00:00
Stephane Nicoll afa006986b Merge branch '2.5.x'
Closes gh-28713
2021-11-17 09:01:53 +01:00
Vedran Pavic c8dd0a584b Fix "Configure Two DataSources" example
With the present example, the `secondDataSource` bean factory method
will use `firstDataSourceProperties` due to it being annotated with
`@Primary`.

This commit adds the `@Qualifier` needed to ensure `secondDataSource`
bean factory method uses `secondDataSourceProperties`.

See gh-28712
2021-11-17 09:00:14 +01:00
Stephane Nicoll d88658d47a Remove dependencies on micrometer-jersey2
Closes gh-28706
2021-11-17 08:56:08 +01:00
Stephane Nicoll 37864f6e66 Upgrade to Spring Integration 5.5.6
Closes gh-28521
2021-11-17 08:51:20 +01:00
Stephane Nicoll 6325df2055 Upgrade to Spring Integration 5.5.6
Closes gh-28513
2021-11-17 08:50:32 +01:00
Stephane Nicoll f1991d8d80 Avoid bean override with CachingMetadataReaderFactoryPostProcessor
Closes gh-28705
2021-11-16 16:24:32 +01:00
Stephane Nicoll dbcd0524a5 Upgrade to Logback 1.2.7
Closes gh-28699
2021-11-16 11:02:02 +01:00
Stephane Nicoll 8356204430 Upgrade to Flyway 8.0.4
Closes gh-28697
2021-11-16 11:02:02 +01:00
Stephane Nicoll 4b64f36356 Upgrade to Spring Security 5.6.0
Closes gh-28520
2021-11-16 09:43:30 +01:00
Stephane Nicoll 4fcb772f37 Upgrade to Logback 1.2.7
Closes gh-28695
2021-11-16 09:08:15 +01:00
Stephane Nicoll c4eea99608 Upgrade to Kafka 2.7.2
Closes gh-28694
2021-11-16 09:08:14 +01:00
Stephane Nicoll 44b644c770 Merge branch '2.5.x'
Closes gh-28693
2021-11-16 08:59:58 +01:00
Stephane Nicoll 9ed7674ab0 Polish "Fix yaml sample format"
See gh-28671
2021-11-16 08:55:52 +01:00
Weix Sun 7f1bd43c84 Fix yaml sample format
See gh-28671
2021-11-16 08:53:42 +01:00
Stephane Nicoll 6d4537b5ae Merge branch '2.5.x'
Closes gh-28692
2021-11-16 08:50:53 +01:00
Stephane Nicoll 6d79599d99 Polish "Fix yaml sample format in reference doc"
See gh-28670
2021-11-16 08:50:24 +01:00
Weix Sun 793a107d27 Fix yaml sample format in reference doc
See gh-28670
2021-11-16 08:45:50 +01:00
Stephane Nicoll cdc14250c4 Merge branch '2.5.x'
Closes gh-28691
2021-11-16 08:34:39 +01:00
izeye e56efc03f6 Update URL for GraphQL Spring Boot starter
See gh-28683
2021-11-16 08:33:56 +01:00
Stephane Nicoll 52ecc1e0dd Polish "Create EndpointWebExtension only if necessary"
See gh-28475
2021-11-16 08:22:35 +01:00
davidh44 b658013a97 Create EndpointWebExtension only if necessary
This commit updates Actuator's EndpointWebExtensions to be created only
if the related endpoint is exposed over HTTP.

See gh-28475
2021-11-16 08:15:19 +01:00
Stephane Nicoll a4c5f07391 Upgrade to Spring Kafka 2.8.0
Closes gh-28519
2021-11-15 19:58:47 +01:00
Stephane Nicoll d058af5be2 Upgrade to Spring AMQP 2.4.0
Closes gh-28518
2021-11-15 19:58:29 +01:00
Stephane Nicoll 882c58b1f1 Upgrade to Spring Kafka 2.7.9
Closes gh-28539
2021-11-15 19:57:41 +01:00
Stephane Nicoll d3c5563e60 Upgrade to Spring AMQP 2.3.12
Closes gh-28600
2021-11-15 19:57:15 +01:00
Scott Frederick 8903c69b19 Avoid exposing time-related task metrics
Fixes gh-28535
2021-11-15 12:24:50 -06:00
Scott Frederick d7f8931dd4 Make TaskExecution and TaskScheduling metrics unique
Fixes gh-28536
2021-11-15 12:23:25 -06:00
Andy Wilkinson a1e7375fc0 Polish 2021-11-15 13:03:10 +00:00
Andy Wilkinson 2d7e0314f3 Merge branch '2.5.x'
# Conflicts:
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
#	spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java
2021-11-15 12:51:43 +00:00
Andy Wilkinson 0aae9c26da Test our Gradle plugin against Gradle 7.3
Closes gh-28679
2021-11-15 12:47:51 +00:00
Andy Wilkinson b1ff60c728 Merge branch '2.5.x'
Closes gh-28681
2021-11-15 12:09:06 +00:00
Andy Wilkinson 4cfbc0db36 Merge branch '2.4.x' into 2.5.x
Closes gh-28680
2021-11-15 12:08:49 +00:00
Leo Li 9de9983e25 Fix @deprecated and @see in Archive's javadoc
See gh-28677
2021-11-15 12:07:22 +00:00
Filip Hrisafov d6bead1a2a Expose RestClientBuilder when RestHighLevelClient is not available
This commits exposes the RestClientBuilder as a bean even when the
RestHighLevelClient is not available. It allows users to create their
own RestClient beans using the Spring Boot configured RestClientBuilder
when they are not using the RestHighLevelClient.

Fixes gh-28655
2021-11-15 09:59:20 +01:00
Stephane Nicoll 6e06e69bba Merge branch '2.5.x'
Closes gh-28673
2021-11-14 08:25:01 +01:00
Stephane Nicoll 4c193a1511 Merge branch '2.4.x' into 2.5.x
Closes gh-28672
2021-11-14 08:24:48 +01:00
Stephane Nicoll d21c48e474 Update copyright year of changed file
See gh-28532
2021-11-14 08:23:32 +01:00
Josh Cummings d817029575 Harmonize @ConditionalOnMissingBean definition
See gh-28532
2021-11-14 08:19:43 +01:00
Stephane Nicoll 854d8723cc Upgrade to Spring Data 2021.1.0
Closes gh-28517
2021-11-13 16:22:40 +01:00
Stephane Nicoll 818abdc70d Upgrade to Spring HATEOAS 1.4.0
Closes gh-28610
2021-11-13 16:22:05 +01:00
Stephane Nicoll 113a7bd525 Upgrade to Neo4j Java Driver 4.3.6
Closes gh-28667
2021-11-13 16:21:43 +01:00
Stephane Nicoll 83151a3a72 Upgrade to MongoDB 4.4.0
Closes gh-28666
2021-11-13 16:21:42 +01:00
Stephane Nicoll 7f3cff062d Upgrade to Elasticsearch 7.15.2
Closes gh-28665
2021-11-13 16:21:40 +01:00
Stephane Nicoll e638ded7e9 Upgrade to Couchbase Client 3.2.3
Closes gh-28664
2021-11-13 16:21:39 +01:00
Stephane Nicoll e396aa310f Upgrade to Spring Data 2021.0.7
Closes gh-28512
2021-11-13 16:17:57 +01:00
Stephane Nicoll 52098229c0 Upgrade to Spring HATEOAS 1.3.6
Closes gh-28609
2021-11-13 16:17:35 +01:00
Stephane Nicoll e7d62ffb01 Upgrade to Spring Data 2020.0.15
Closes gh-28508
2021-11-13 16:16:51 +01:00
Stephane Nicoll f3e2a40424 Upgrade to Spring HATEOAS 1.2.11
Closes gh-28608
2021-11-13 16:16:17 +01:00
Andy Wilkinson 2a342ef416 Merge branch '2.5.x'
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
2021-11-12 20:04:35 +00:00
Andy Wilkinson 3ba8184cb1 Merge branch '2.5.x'
Closes gh-28660
2021-11-12 20:04:09 +00:00
Andy Wilkinson ef02db9ed1 Merge branch '2.4.x' into 2.5.x
Closes gh-28659
2021-11-12 20:03:53 +00:00
Andy Wilkinson 0889cdd516 Add dependency management for Glassfish JSTL
To be used in place of javax.servlet:jstl

Closes gh-28657
2021-11-12 20:03:15 +00:00
Stephane Nicoll 303dd4cfe0 Upgrade to Micrometer 1.8.0
Closes gh-28516
2021-11-12 10:14:04 +01:00
Andy Wilkinson 5f1103f381 Add missing @Deprecated annotation
Closes gh-28602
2021-11-11 12:03:33 +00:00
Andy Wilkinson 925ddd6b09 Merge branch '2.5.x' 2021-11-11 10:34:13 +00:00
Andy Wilkinson 3b180f42b7 Polish 2021-11-11 10:34:04 +00:00
Andy Wilkinson 6fa523ed6f Start building against Spring HATEOAS 1.4.0 snapshots
See gh-28610
2021-11-11 10:01:37 +00:00
Andy Wilkinson 1d1ab21ac3 Start building against Spring HATEOAS 1.3.6 snapshots
See gh-28609
2021-11-11 10:00:37 +00:00
Andy Wilkinson ede3e4e6a0 Start building against Spring HATEOAS 1.2.11 snapshots
See gh-28608
2021-11-11 09:59:05 +00:00
Andy Wilkinson 7a24ee88ae Merge branch '2.5.x'
Closes gh-28607
2021-11-11 09:55:42 +00:00
Andy Wilkinson 23197c34c7 Merge branch '2.4.x' into 2.5.x
Closes gh-28606
2021-11-11 09:55:21 +00:00
Andy Wilkinson c018788846 Test JTA auto-configured from JNDI
Closes gh-28594
2021-11-11 09:54:50 +00:00
Stephane Nicoll 74c57bbefa Upgrade to Spring Framework 5.3.13
Closes gh-28515
2021-11-11 10:00:04 +01:00
Stephane Nicoll 0b808fdd3c Upgrade to Micrometer 1.7.6
Closes gh-28511
2021-11-11 09:59:21 +01:00
Stephane Nicoll f969b60031 Upgrade to Spring Framework 5.3.13
Closes gh-28510
2021-11-11 09:57:53 +01:00
Stephane Nicoll 24c578e3ad Upgrade to Micrometer 1.6.13
Closes gh-28507
2021-11-11 09:57:22 +01:00