Phillip Webb
0be5078a73
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31369
2022-06-13 18:20:07 -07:00
Phillip Webb
b3a46fc50e
Document that placeholders should us the canonical property name form
...
Closes gh-31309
2022-06-13 18:19:47 -07:00
Phillip Webb
378e56f1d3
Add Order annotation to GraphQL RouterFunction beans
...
Update GraphQL auto-configuration so that `RouterFunction` beans have
and `@Order` of 0.
Fixes gh-31314
2022-06-13 16:44:20 -07:00
Stephane Nicoll
cc4965ee8a
Merge branch '2.7.x'
...
Closes gh-31367
2022-06-13 16:04:07 +02:00
Stephane Nicoll
961b979d6e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31366
2022-06-13 16:04:00 +02:00
Anthony Vanelverdinghe
1fffdbae2a
Fix typos in the reference documentation
...
See gh-31328
2022-06-13 16:02:48 +02:00
Stephane Nicoll
59f6661166
Merge branch '2.7.x'
...
Closes gh-31361
2022-06-13 14:54:09 +02:00
Stephane Nicoll
56913a08b8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31360
2022-06-13 14:54:00 +02:00
Anthony Vanelverdinghe
b1ccb600f3
Remove reference to outdated location
...
See gh-31276
2022-06-13 14:52:38 +02:00
Stephane Nicoll
41d327df51
Merge branch '2.7.x'
...
Closes gh-31359
2022-06-13 14:50:41 +02:00
Stephane Nicoll
06d7e67e79
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31358
2022-06-13 14:50:35 +02:00
Stern, Ittay (is9613)
e05363f9b0
Restore Custom Favicon section in the reference guide
...
The section about favicon was mistakenly removed in 5fceb9d and this
commit reinstates it.
See gh-31224
2022-06-13 14:50:18 +02:00
Stephane Nicoll
ed7ff31d01
Merge branch '2.7.x'
...
Closes gh-31357
2022-06-13 14:46:04 +02:00
Stephane Nicoll
4b0fe63bdf
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31356
2022-06-13 14:45:54 +02:00
Stephane Nicoll
d896d995d1
Polish contribution
...
See gh-31190
2022-06-13 14:39:58 +02:00
tudormarc
e313aa5f6c
Document that Lombok must be configured before our annotation processor
...
See gh-31190
2022-06-13 14:33:21 +02:00
Stephane Nicoll
365d96daf6
Merge branch '2.7.x'
...
Closes gh-31355
2022-06-13 14:29:40 +02:00
Stephane Nicoll
72dd51ae0b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31354
2022-06-13 14:29:18 +02:00
Henning Poettker
9fdd471adf
Use Lambda-based API in Spring Security examples
...
See gh-31143
2022-06-13 13:15:56 +02:00
Phillip Webb
ff4e6f7639
Merge branch '2.7.x'
...
Closes gh-31339
2022-06-10 12:38:48 -07:00
Phillip Webb
0f7fa84214
Polish 'Update Dynatrace documentation for Micrometer 1.9.0'
...
See gh-31132
2022-06-10 12:36:45 -07:00
Georg Pirklbauer
6df9f50642
Update Dynatrace documentation for Micrometer 1.9.0
...
Update the actuator documentation for Dynatrace to reflect the
updates and improvements that were made in Micrometer 1.9.0.
See gh-31132
2022-06-10 12:34:05 -07:00
Moritz Halbritter
486b3073ce
Add tracing in integration tests paragraph to the documentation
...
See gh-31308
2022-06-10 14:25:12 +02:00
Moritz Halbritter
b250d8a1e4
Add @AutoConfigureObservability annotation
...
This annotation is read by ObservabilityContextCustomizerFactory, which
then sets test properties depending on the annotation attributes.
@AutoConfigureMetrics is deprecated, to support backwards compatability
it's now meta-annotated with @AutoConfigureObservability
See gh-31308
2022-06-10 14:25:12 +02:00
Andy Wilkinson
85ad4fd4b4
Merge branch '2.7.x'
...
Closes gh-31212
2022-05-30 17:17:26 +01:00
Andy Wilkinson
70bcade232
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31211
2022-05-30 17:16:53 +01:00
Andy Wilkinson
419ac26e0d
Use conventions for source and encoding of aggregatedJavadoc
...
Closes gh-31210
2022-05-30 17:15:45 +01:00
Stephane Nicoll
a27427b977
Merge branch '2.7.x'
...
Closes gh-31207
2022-05-30 14:57:57 +02:00
Stephane Nicoll
95dad34482
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31206
2022-05-30 14:57:45 +02:00
Matei Cernăianu
eb8b9e17c5
Fix "spring.factories" typos in database initialization documentation
...
See gh-31203
2022-05-30 14:55:15 +02:00
Andy Wilkinson
90752e559a
Polish "Auto-configure JvmCompilationMetrics"
...
See gh-31151
2022-05-27 10:18:31 +01:00
Andy Wilkinson
4bb5ba2bd0
Merge branch '2.7.x'
2022-05-26 18:26:52 +01:00
Andy Wilkinson
935d1264e0
Merge branch '2.6.x' into 2.7.x
2022-05-26 18:13:08 +01:00
Andy Wilkinson
3d203d0215
Polish
2022-05-26 17:30:39 +01:00
Andy Wilkinson
5dfa5adb75
Merge branch '2.7.x'
...
Closes gh-31178
2022-05-26 15:54:58 +01:00
Andy Wilkinson
455ee0ce22
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31177
2022-05-26 15:53:38 +01:00
Andy Wilkinson
ee45fd2fc8
Remove redundant throws declarations from internal APIs
...
Closes gh-31176
2022-05-26 15:47:35 +01:00
Andy Wilkinson
96c2d08fc4
Remove support for Solr as it is not compatible with Jetty 11
...
Closes gh-31054
2022-05-18 11:33:55 +01:00
Phillip Webb
f8a41d34aa
Merge branch '2.7.x'
2022-05-17 22:22:08 -07:00
Phillip Webb
23eceb0d8a
Merge branch '2.6.x' into 2.7.x
2022-05-17 22:21:41 -07:00
Phillip Webb
ea41e89c6c
Merge branch '2.5.x' into 2.6.x
2022-05-17 22:21:10 -07:00
Phillip Webb
7d2f1bafc0
Update copyright year of changed files
2022-05-17 22:20:05 -07:00
Madhura Bhave
c730ab7d0c
Merge branch '2.7.x' into main
2022-05-17 14:29:36 -07:00
Scott Frederick
7d459a13c2
Add properties for SAML relying party single logout
...
Closes gh-30128
Co-authored-by: Madhura Bhave <bhavem@vmware.com>
2022-05-17 14:07:48 -07:00
Andy Wilkinson
a496cb9298
Merge branch '2.7.x'
2022-05-12 12:52:46 +01:00
Andy Wilkinson
2669f8c343
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30997
2022-05-12 12:47:52 +01:00
Andy Wilkinson
655ceefead
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30996
2022-05-12 12:47:38 +01:00
Andy Wilkinson
3f6fcac683
Polish "Extend documentation on Datadog metrics"
...
See gh-30879
2022-05-12 12:36:50 +01:00
Denis Washington
09db7e4001
Extend documentation on Datadog metrics
...
- Document that an application key must be set to publish metadata
for the exported metrics.
- Point out that using a non-US Datadog site (e.g., EU) requires
changing the `uri` property.
See gh-30879
2022-05-12 12:36:18 +01:00
Andy Wilkinson
c12171f2e9
Merge branch '2.7.x'
2022-05-12 12:28:20 +01:00