Commit Graph

37611 Commits

Author SHA1 Message Date
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
5b05fd9fb2 Merge branch '2.7.x' 2022-04-04 14:27:24 +02:00
Moritz Halbritter
eedb8573b7 Polish documentation 2022-04-04 14:27:18 +02:00
Moritz Halbritter
6fa696f13d Merge branch '2.7.x' 2022-04-04 14:23:24 +02:00
Moritz Halbritter
bd1424b004 Merge branch '2.6.x' into 2.7.x
Closes gh-30528
2022-04-04 14:22:49 +02:00
Moritz Halbritter
bf3c2d713d Merge branch '2.5.x' into 2.6.x
Closes gh-30526
2022-04-04 14:18:45 +02:00
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
9791318e55 Merge branch '2.7.x' 2022-04-04 13:49:05 +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
714418e17a Merge branch '2.7.x' 2022-04-04 11:10:00 +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
ac93dc3252 Remove reference to spring.datasource.initialization-mode in tests
Closes gh-30511
2022-04-03 10:17:28 +02:00
Stephane Nicoll
535a9b7be0 Remove outdated reference to spring.datasource.initialization-mode
Closes gh-30435
2022-04-03 10:10:21 +02:00
Stephane Nicoll
f44e9d472f Merge branch '2.7.x' 2022-04-03 09:33:38 +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
3129f197c3 Merge branch '2.7.x' 2022-04-03 09:28:55 +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
f538995f07 Merge pull request #30507 from izeye
* pr/30507:
  Upgrade to Gradle 7.4.2

Closes gh-30507
2022-04-03 09:26:45 +02:00
izeye
9e1120617d Upgrade to Gradle 7.4.2
See gh-30507
2022-04-03 09:24:38 +02:00
Stephane Nicoll
5f66019706 Remove the ability to run an application in the Maven process
Closes gh-30501
2022-04-01 15:26:21 +02:00
Stephane Nicoll
6d7b14a5a2 Revert test assertion until we switch to framework snapshots 2022-04-01 12:14:17 +02:00
Stephane Nicoll
13c9c1adb5 Merge branch '2.7.x' 2022-04-01 11:58:27 +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
c21b4a5280 Merge branch '2.7.x' 2022-04-01 11:35:48 +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
25d8888aff Merge branch '2.7.x' 2022-03-31 12:45:13 +02: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
5a18234fe6 Merge branch '2.7.x' 2022-03-31 12:03:18 +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
47eb63028f Merge branch '2.7.x' 2022-03-31 09:14:15 +02:00
Stephane Nicoll
7b0d0bf3cc Upgrade CI to Docker 20.10.14
Closes gh-30487
2022-03-31 09:13:59 +02:00
Stephane Nicoll
3e5953c0a0 Upgrade Java 18 version in CI image
Closes gh-30483
2022-03-31 09:13:25 +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