Commit Graph

36573 Commits

Author SHA1 Message Date
Andy Wilkinson
71e52a475b Upgrade to Embedded Mongo 3.4.5
Closes gh-30546
2022-04-05 15:32:52 +01:00
Andy Wilkinson
ffc0fafe1a Merge branch '2.6.x' into 2.7.x
Closes gh-30545
2022-04-05 15:11:25 +01:00
Andy Wilkinson
05d4093381 Merge branch '2.5.x' into 2.6.x
Closes gh-30544
2022-04-05 15:11:01 +01:00
Andy Wilkinson
bc81ae81fc Merge pull request #30461 from dalbani
* gh-30461:
  Polish "Refer to list of internal proxies in reference documentation"
  Refer to list of internal proxies in reference documentation

Closes gh-30461
2022-04-05 15:10:49 +01:00
Andy Wilkinson
83cfc951f8 Polish "Refer to list of internal proxies in reference documentation"
See gh-30461
2022-04-05 14:37:08 +01:00
Damiano Albani
91306b58d5 Refer to list of internal proxies in reference documentation
See gh-30461
2022-04-05 14:34:37 +01:00
Moritz Halbritter
f8c54655f6 Merge branch '2.6.x' into 2.7.x
Closes gh-30542
2022-04-05 14:17:00 +02:00
Moritz Halbritter
53b2c85df0 Merge branch '2.5.x' into 2.6.x
Closes gh-30541
2022-04-05 14:16:38 +02:00
Moritz Halbritter
18c62e2bf3 Merge pull request #30535 from chrisrhut
* gh-30535:
  Add Tomcat locale mapping for Japanese to preserve UTF-8 charset

Closes gh-30535
2022-04-05 14:16:17 +02:00
Chris Hut
65d8c76ac3 Add Tomcat locale mapping for Japanese to preserve UTF-8 charset
See gh-30535
2022-04-05 14:15:40 +02:00
Scott Frederick
ef79a18514 Use provided scope for Maven core dependencies in Maven plugin
Fixes gh-29520
2022-04-04 16:00:15 -05:00
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