Commit Graph

37332 Commits

Author SHA1 Message Date
Moritz Halbritter 41ab46d0c7 Fix wrong replacement hint for 'spring.data.neo4j.username'
Closes gh-30550
2022-04-06 08:56:23 +02:00
Andy Wilkinson d6f111ce59 Merge branch '2.7.x'
Closes gh-30547
2022-04-05 16:00:34 +01:00
Andy Wilkinson 71e52a475b Upgrade to Embedded Mongo 3.4.5
Closes gh-30546
2022-04-05 15:32:52 +01:00
Andy Wilkinson a70249e368 Merge branch '2.7.x' 2022-04-05 15:11:41 +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 43c647e898 Merge branch '2.7.x' 2022-04-05 14:17:14 +02: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
Moritz Halbritter 5ab9112bbc Add auto-configuration for Micrometer 2.0.0 Observation API
- Adds a ObservationRegistry bean
- Add support for ObservationRegistryCustomizers
- Enables timer creation for observations if micrometer-core is on
  the classpath
- Registers ObservationPredicate, GlobalTagsProvider and
  ObservationHandler on the MeterRegistry
- Applies grouping to the ObservationHandlers: MeterObservationHandler
  are added to a FirstMatchingCompositeObservationHandler
- If micrometer-tracing is on the classpath, the
  TracingObservationHandler are added to a
  FirstMatchingCompositeObservationHandler

Closes gh-29666
2022-04-05 13:57:31 +02:00
Moritz Halbritter 4a8901b94c Start building against Spring Batch 5.0.0-SNAPSHOT
See gh-30459
2022-04-05 13:57:00 +02:00
Scott Frederick e32511516e Merge branch '2.7.x' 2022-04-04 16:29:52 -05: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 92936c6ed3 Merge branch '2.7.x' 2022-04-04 15:27:11 -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 0f229e79e3 Merge branch '2.7.x' 2022-04-04 16:47:28 +02: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 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