Commit Graph

36562 Commits

Author SHA1 Message Date
Scott Frederick 103c2bdd7d Use Tomcat SSLHostConfig API for SSL configuration
Closes gh-30531
2022-04-04 15:22:43 -05:00
Brian Clozel 1c71567c94 Support "application/graphql+json" media type in GraphQL HTTP mapping
As seen in spring-projects/spring-graphql#108, the GraphQL HTTP spec now
requires the "application/graphql+json" media type and accepts
"application/json" for backwards compatibility.

This commit updates the `RouterFunction` definition for the GraphQL HTTP
endpoints so that both types are accepted.

Closes gh-30407
2022-04-04 16:45:11 +02:00
Brian Clozel d476d8e37b Move GraphQL test document files
After changes performed in spring-projects/spring-graphql#338, GraphQL
test documents now have a different test location.
2022-04-04 16:43:47 +02:00
Moritz Halbritter eedb8573b7 Polish documentation 2022-04-04 14:27:18 +02:00
Moritz Halbritter bd1424b004 Merge branch '2.6.x' into 2.7.x
Closes gh-30528
2022-04-04 14:22:49 +02:00
Moritz Halbritter bf3c2d713d Merge branch '2.5.x' into 2.6.x
Closes gh-30526
2022-04-04 14:18:45 +02:00
Moritz Halbritter b5a02d9a66 Merge pull request #30498 from izeye
* gh-30498:
  Polish documentation

Closes gh-30498
2022-04-04 14:09:55 +02:00
izeye 09d6215b65 Polish documentation
See gh-30498
2022-04-04 14:09:28 +02:00
Moritz Halbritter fc2a6554c6 Merge pull request #30472 from jonatan-ivanov
* gh-30472:
  Add support for Prometheus Exemplars

Closes gh-30472
2022-04-04 13:39:53 +02:00
Jonatan Ivanov d0bc31a5e9 Add support for Prometheus Exemplars
See gh-30472
2022-04-04 13:35:38 +02:00
Brian Clozel 51c45d5b10 Switch to Spring Framework 5.3.19-SNAPSHOT
See gh-30518
2022-04-04 11:08:36 +02:00
Stephane Nicoll 2a2c4be809 Merge branch '2.6.x' into 2.7.x
Closes gh-30510
2022-04-03 09:33:02 +02:00
Stephane Nicoll b2a4ae38e8 Merge branch '2.5.x' into 2.6.x
Closes gh-30509
2022-04-03 09:32:39 +02:00
Stephane Nicoll 4faa1a741d Merge pull request #30506 from izeye
* pr/30506:
  Test Spring Boot Gradle Plugin against Gradle 7.4.2

Closes gh-30506
2022-04-03 09:30:06 +02:00
izeye 40d0e38e76 Test Spring Boot Gradle Plugin against Gradle 7.4.2
See gh-30506
2022-04-03 09:29:50 +02:00
Stephane Nicoll 0a9f34b872 Merge branch '2.6.x' into 2.7.x 2022-04-03 09:28:49 +02:00
Stephane Nicoll 062533f5ae Merge branch '2.5.x' into 2.6.x 2022-04-03 09:28:40 +02:00
Stephane Nicoll 2c5398898b Polish "Deprecate running an application in the Maven JVM"
See gh-30479
2022-04-01 11:57:59 +02:00
Stephane Nicoll 09696c90c7 Deprecate running an application in the Maven JVM
This commit deprecates the "fork" property so that the application
always runs in a dedicated process. This aligns with the behaviour of
the Gradle plugin, and simplifies the lifecycle of certain features that
would not work in a non-forked process.

Closes gh-30479
2022-04-01 11:35:34 +02:00
Spring Builds 54fabf473f Next development version (v2.6.7-SNAPSHOT) 2022-03-31 14:16:00 +00:00
Spring Builds 0019243d25 Next development version (v2.5.13-SNAPSHOT) 2022-03-31 12:59:13 +00:00
Stephane Nicoll 1da5a7a600 Merge branch '2.6.x' into 2.7.x 2022-03-31 12:45:05 +02:00
Stephane Nicoll 546a7e5edb Merge branch '2.5.x' into 2.6.x 2022-03-31 12:44:52 +02:00
Stephane Nicoll 17936b855c Polish 2022-03-31 12:42:37 +02:00
Stephane Nicoll d8ab655d4a Merge branch '2.6.x' into 2.7.x 2022-03-31 12:02:56 +02:00
Stephane Nicoll 9168e63e62 Upgrade to Spring Framework 5.3.18
Closes gh-30493
2022-03-31 12:02:46 +02:00
Stephane Nicoll 57f11696eb Merge branch '2.5.x' into 2.6.x 2022-03-31 12:01:14 +02:00
Stephane Nicoll 7ccbdda1e7 Upgrade to Spring Framework 5.3.18
Closes gh-30492
2022-03-31 11:30:14 +02:00
Stephane Nicoll 94c40c7234 Upgrade to Spring Framework 5.3.18
Closes gh-30491
2022-03-31 11:29:49 +02:00
Stephane Nicoll 0ce499441b Merge branch '2.6.x' into 2.7.x 2022-03-31 09:12:43 +02:00
Stephane Nicoll 15041cfbd4 Upgrade CI to Docker 20.10.14
Closes gh-30485
2022-03-31 09:12:26 +02:00
Stephane Nicoll 25e8a4d572 Upgrade Java 18 version in CI image
Closes gh-30486
2022-03-31 09:11:50 +02:00
Stephane Nicoll be716d8765 Merge branch '2.5.x' into 2.6.x 2022-03-31 09:08:26 +02:00
Stephane Nicoll 8409c2f514 Upgrade CI to Docker 20.10.14
Closes gh-30481
2022-03-31 09:08:15 +02:00
Stephane Nicoll a99fcecd48 Upgrade Java 18 version in CI image
Closes gh-30482
2022-03-31 09:07:32 +02:00
Stephane Nicoll 2e90fd2302 Upgrade CI to Docker 20.10.14
Closes gh-30484
2022-03-31 09:06:56 +02:00
Stephane Nicoll 6cded5b928 Upgrade Java 18 version in CI image
Closes gh-30488
2022-03-31 09:06:19 +02:00
Andy Wilkinson be3288cddf Merge branch '2.6.x' into 2.7.x 2022-03-30 15:26:50 +01:00
Andy Wilkinson 2da44a0b4f Upgrade to Jackson Bom 2.13.2.20220328
Closes gh-30478
2022-03-30 14:29:38 +01:00
Andy Wilkinson 1d53e711fe Merge branch '2.5.x' into 2.6.x 2022-03-30 14:24:28 +01:00
Andy Wilkinson 06c5e26f81 Upgrade to Jackson Bom 2.12.6.20220326
Closes gh-30477
2022-03-30 13:30:42 +01:00
Andy Wilkinson b9029fcf9e Merge branch '2.6.x' into 2.7.x
Closes gh-30476
2022-03-30 10:57:10 +01:00
Andy Wilkinson 64beaba99f Merge branch '2.5.x' into 2.6.x
Closes gh-30475
2022-03-30 10:56:56 +01:00
Andy Wilkinson c0c32d89a7 Merge pull request #30456 from candrews
* gh-30456:
  Polish "Make MustacheViewResolver bean back off without Spring MVC"
  Make MustacheViewResolver bean back off without Spring MVC

Closes gh-30456
2022-03-30 10:56:47 +01:00
Andy Wilkinson 8cb11b74cd Polish "Make MustacheViewResolver bean back off without Spring MVC"
See gh-30456
2022-03-30 10:33:35 +01:00
Craig Andrews 7101b5099f Make MustacheViewResolver bean back off without Spring MVC
See gh-30456
2022-03-30 10:31:44 +01:00
Andy Wilkinson 24e6417ddc Adapt to latest changes in Spring for GraphQL snapshots
See gh-30463
2022-03-29 16:50:12 +01:00
Brian Clozel 93817c708e Switch to Spring for GraphQL 1.0.0-SNAPSHOT
See gh-30463
2022-03-29 16:37:21 +02:00
Brian Clozel 4466a0b041 Upgrade to GraphQL Java 18.0
Closes gh-30464
2022-03-29 16:37:21 +02:00
Andy Wilkinson 4722d9d17e Merge branch '2.6.x' into 2.7.x
Closes gh-30470
2022-03-29 15:06:56 +01:00