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
Moritz Halbritter
42e8f65b80
Move @ConditionalOnClass from methods to inner classes
...
Closes gh-31353
2022-06-13 13:41:58 +02:00
Henning Poettker
9fdd471adf
Use Lambda-based API in Spring Security examples
...
See gh-31143
2022-06-13 13:15:56 +02:00
Stephane Nicoll
b3601643af
Add hints for web resource default locations
...
Closes gh-31278
2022-06-13 11:09:48 +02:00
Stephane Nicoll
063e56dbff
Polish
2022-06-13 09:44:02 +02:00
Phillip Webb
380776a9b2
Merge branch '2.7.x'
2022-06-10 16:13:50 -07:00
Phillip Webb
7bf82b5349
Merge branch '2.6.x' into 2.7.x
2022-06-10 16:13:35 -07:00
Phillip Webb
63fdd729f5
Refine conversion service type check
...
Update fix to account for primitive types.
See gh-28592
2022-06-10 16:12:38 -07:00
Phillip Webb
8937924508
Merge branch '2.7.x'
...
Closes gh-31342
2022-06-10 14:30:28 -07:00
Phillip Webb
beb1c15219
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31341
2022-06-10 14:30:02 -07:00
Phillip Webb
31b0264d94
Ensure conversion service actually converts to the correct type
...
Update `BindConverter` with a guard to ensure that the resulting object
is the correct type.
Fixes gh-28592
2022-06-10 14:29:25 -07:00
Phillip Webb
cb745b4259
Merge branch '2.7.x'
...
Closes gh-31340
2022-06-10 12:43:38 -07:00
Anthony Vanelverdinghe
ed1e7382ab
Fix typo in ImportCandidates javadoc
...
See gh-31277
2022-06-10 12:42:43 -07: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
Andy Wilkinson
2155aac464
Upgrade to REST Assured 5.1.1
...
Closes gh-31333
2022-06-10 13:44:22 +01:00
Andy Wilkinson
9ff411e6af
Upgrade to Mockito 4.6.1
...
Closes gh-31332
2022-06-10 13:44:21 +01:00
Andy Wilkinson
d4be484d27
Upgrade to AssertJ 3.23.1
...
Closes gh-31331
2022-06-10 13:44:21 +01:00
Moritz Halbritter
3799170c4d
Disable metrics and tracing in web endpoints integration tests
...
See gh-31308
2022-06-10 14:25:12 +02: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
8fab9f290c
Back off tracing auto-configurations if tracing is disabled
...
See gh-31308
2022-06-10 14:25:12 +02:00
Moritz Halbritter
b019ff6102
Wavefront sender configuration is no longer an auto-configuration
...
It's now a regular configuration class which is imported from
the Wavefront metrics and tracing auto-configurations
2022-06-10 14:25:12 +02:00
Moritz Halbritter
943e9033c0
Add @ConditionalOnEnabledTracing condition
...
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
36f01eb40b
Fix compilation error with Tomcat 10
...
There's no setter for the max header size in Tomcat 10 as it's now
inherited from the underlying HTTP 1.1 protocol. The test that
was merged forwards from 2.7.x is retained to verify that this is
the case.
See gh-31330
2022-06-10 12:40:40 +01:00
Andy Wilkinson
b6ebf4a7db
Merge branch '2.7.x'
...
Closes gh-31330
2022-06-10 11:36:11 +01:00
Andy Wilkinson
7f584a95a6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31329
2022-06-10 11:35:54 +01:00
Andy Wilkinson
e02803d341
Configure max HTTP header size when using HTTP2 with Tomcat
...
Closes gh-31322
2022-06-10 11:32:57 +01:00
Moritz Halbritter
41e9867bc4
Register all ObservationHandler, regardless which context they use
...
Closes #31272
2022-06-10 10:12:35 +02:00
Andy Wilkinson
29cd148e05
Start building against Spring Framework 5.3.1 snapshots
...
See gh-31319
2022-06-09 20:55:14 +01:00
Andy Wilkinson
ed897fc922
Start building against Spring Framework 5.3.21 snapshots
...
See gh-31318
2022-06-09 19:37:50 +01:00
Moritz Halbritter
d1647cf68c
Don't back off on user-supplied SpanHandlers
...
Instead the auto-configuration now backs off only on ZipkinSpanHandler.
Closes gh-31273
2022-06-09 15:17:14 +02:00
Andy Wilkinson
91bb5aa222
Move auto-config of ReactiveElasticClient to elasticsearch pkg
...
Closes gh-28068
2022-06-09 11:42:09 +01:00
Phillip Webb
c56783064d
Support management contexts with AOT
...
Refactor child management configuration and add AOT generation support.
A new `ChildManagementContextInitializer` class now performs the child
context initialization and also handles AOT processing concerns.
Closes gh-31163
2022-06-08 19:24:46 -07:00
Phillip Webb
a729f71cba
Polish LogbackRuntimeHintsRegistrar
2022-06-08 19:24:45 -07:00
Phillip Webb
e8f9386594
Add Runnable variant of TestPropertyValues.applyToSystemProperties
...
Closes gh-31303
2022-06-08 19:24:45 -07:00
Phillip Webb
11184aae8d
Allow ApplicationContextRunner to return non-refreshed context
...
Add `AbstractApplicationContextRunner.prepare` which can be used to
test an `ApplicationContext` that has been prepared but not refreshed.
Closes gh-31302
2022-06-08 19:02:12 -07:00
Andy Wilkinson
46c262d3cc
Merge branch '2.7.x'
...
Closes gh-31283
2022-06-08 19:24:49 +01:00
Andy Wilkinson
12eb7a8795
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31282
2022-06-08 19:24:07 +01:00
Andy Wilkinson
a651061e2c
Remove SpringApplicationHierarchyTests
...
Closes gh-31281
2022-06-08 19:23:26 +01:00