fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,323 Commits 22 Branches 339 Tags
Commit Graph

2217 Commits

Author SHA1 Message Date
Johnny Lim
b17cb9b92b Polish gh-31231 
See gh-31540
 2022-07-13 13:49:13 +02:00
Madhura Bhave
d66e108703 Revert actuator changes related to path pattern parsing 
See gh-31547
 2022-07-12 15:25:41 -07:00
Madhura Bhave
7954f5e566 Adapt to change in default strategy for URL path matching in Spring MVC 
Closes gh-31547
 2022-07-12 09:59:44 -07:00
Andy Wilkinson
08d37b7fb6 Merge branch '2.7.x' 
Closes gh-31694
 2022-07-12 14:29:49 +01:00
Andy Wilkinson
1c2b0ae705 Merge branch '2.6.x' into 2.7.x 
Closes gh-31693
 2022-07-12 14:28:10 +01:00
Andy Wilkinson
7c55639167 Depend on log4j-api directly rather than via Elastic's transitives 
Closes gh-31692
 2022-07-12 14:27:56 +01:00
Andy Wilkinson
99fabfa934 Revert "Remove spring-aspects dependency following fix in Data JPA" 
This reverts commit cd6c7cd6c94ac95bf8f55f9746edb42ad0f51c8f.

The fix in Spring Data JPA is incomplete so we need to reinstate the
workaround.
 2022-07-12 10:46:06 +01:00
Andy Wilkinson
cd6c7cd6c9 Remove spring-aspects dependency following fix in Data JPA 
The recent changes in Spring Data JPA [1] mean that we no longer need
a dependency on spring-aspects for Data JPA's hint registration to
succeed.

5821272112
 2022-07-12 10:08:32 +01:00
Andy Wilkinson
9b113272d1 Reinstate support for Hibernate Metrics 
Closes gh-31675
 2022-07-12 09:36:54 +01:00
Oliver Drotbohm
b10c57551c Upgrade to Hibernate 6.1.1.Final 
This commit makes the following potentially breaking changes:

- Dependency management for modules that do not exist in Hibernate
  6.1 has been removed.
- Hibernate's modules are now in the org.hibernate.orm group. Users
  not using the starter or using modules that are not in the starter
  will have to update their build configuration accordingly.
- spring.jpa.hibernate.use-new-id-generator-mappings has been removed
  as Hibernate no longer supports switching back to the old ID
  generator mappings.

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>

Closes gh-31674
 2022-07-12 09:36:34 +01:00
Andy Wilkinson
acd8d05315 Update copyright date of changed file 2022-07-08 18:13:45 +01:00
Andy Wilkinson
efc5391496 Adapt to deprecations in Framework's scheduling APIs 
See gh-31241
 2022-07-08 17:53:55 +01:00
Moritz Halbritter
8639552405 Start building against Micrometer Tracing 1.0.0-M6 snapshots 
See gh-31657
 2022-07-08 14:01:13 +02:00
Andy Wilkinson
2821629d54 Remove unchecked raw casts that are now redundant 
Closes gh-31326
 2022-07-08 12:52:59 +01:00
Andy Wilkinson
7f00378eaf Polish "Start building against Spring Data 2022.0.0-M5 snapshots" 
See gh-31582
 2022-07-07 16:32:13 +01:00
Andy Wilkinson
19b7e012f3 Upgrade to Prometheus Client 0.16.0 
Closes gh-31597
 2022-07-07 14:34:17 +01:00
Andy Wilkinson
e9136e023b Adapt to trailing slashes no longer being matched by default 
See gh-31563
 2022-07-07 14:16:20 +01:00
Moritz Halbritter
04391275c1 Make MeterRegistry lazy in TimerObservationHandlerObservationRegistryCustomizer 
Closes gh-31580
 2022-07-06 14:18:53 +02:00
dreis2211
458f989cf3 Use switch expressions where appropriate 
See gh-31527
 2022-06-24 16:19:28 +01:00
Andy Wilkinson
631b1e0d76 Merge branch '2.7.x' 
Closes gh-31526
 2022-06-24 13:10:10 +01:00
Andy Wilkinson
1e08f545d0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31525
 2022-06-24 13:05:06 +01:00
Andy Wilkinson
f49b16c645 Upgrade to Spring Java Format 0.0.34 
Closes gh-31524
 2022-06-24 12:57:52 +01:00
Stephane Nicoll
fe39598e81 Adapt to latest API change in Spring Framework 
See https://github.com/spring-projects/spring-framework/issues/28585
 2022-06-23 16:30:34 +02:00
Phillip Webb
b85469a5a5 Merge branch '2.7.x' 
Closes gh-31502
 2022-06-22 16:33:42 -07:00
Phillip Webb
d64f601dfd Merge branch '2.6.x' into 2.7.x 
Closes gh-31501
 2022-06-22 16:31:52 -07:00
Phillip Webb
aed4c47adb Polish CompositeHandlerExceptionResolver 
See gh-31495
 2022-06-22 16:23:38 -07:00
Guirong Hu
3592292e4b Use ExceptionHandler when Spring MVC uses a different management port 
Update `CompositeHandlerExceptionResolver` to search for beans in
all contexts. Note that `BeanFactoryUtils.beansOfTypeIncludingAncestors`
cannot not be used since we need to pick up all beans, even if they
have the same name.

See gh-31495
 2022-06-22 16:13:26 -07:00
Moritz Halbritter
bb6c56e5f0 Polish "Add WebClient based sender for Zipkin" 
See gh-30792
 2022-06-22 10:25:18 +02:00
StefanBratanov
12037bd131 Add WebClient based sender for Zipkin 
See gh-30792
 2022-06-22 09:58:05 +02:00
Moritz Halbritter
bc931cb32c Revert "Polish EndpointRequest" 
This reverts commit 35997a30a31c65aab612aba969cb789021d8441c.
 2022-06-21 15:43:57 +02:00
Moritz Halbritter
35997a30a3 Polish EndpointRequest 
- Remove redundant cast
 2022-06-21 14:30:05 +02:00
Moritz Halbritter
c8c552d95b Polish ObservationAutoConfiguration 
- Use a better name for the "only metrics, no tracing" case
 2022-06-21 11:32:27 +02:00
Moritz Halbritter
06cdc91c85 Polish ObservationAutoConfiguration 
- Use a better name for the "only metrics, no tracing" case
- Use more concrete return types
 2022-06-21 11:31:11 +02:00
dreis2211
5db04da275 Use pattern matching for instanceof where appropriate 
See gh-31475
 2022-06-20 17:55:36 +01:00
Johnny Lim
43c2f1c03c Polish AutoConfigureObservability changes 
See gh-31457
 2022-06-20 07:38:22 +02:00
Johnny Lim
aab59c5f2e Static-import Mockito.mock() 
See gh-31443
 2022-06-19 10:31:28 +02:00
Phillip Webb
657fa3e64e Merge branch '2.7.x' 
Closes gh-31409
 2022-06-16 15:36:29 -07:00
Phillip Webb
7c91ebb1b0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31408
 2022-06-16 15:36:00 -07:00
Phillip Webb
ae6311ddda Prevent Logback from accidentally being used in Log4J2LoggingSystemTests 
Update `Log4J2LoggingSystemTests` to exclude Logback and include
'log4j-slf4j-impl'. The `ModifiedClassPathClassLoader` has also been
updated so that it no longer automatically excludes `log4j` artifacts,
instead we now use `@ClassPathExclusions` on the relevant tests.

Fixes gh-19365
 2022-06-16 15:35:32 -07:00
Phillip Webb
85dcbf6100 Merge branch '2.7.x' 
Closes gh-31385
 2022-06-14 09:38:36 -07:00
Phillip Webb
e0947459b6 Merge branch '2.6.x' into 2.7.x 
Closes gh-31384
 2022-06-14 09:38:05 -07:00
Phillip Webb
9f8a262e6b Log a warning when a health indicator takes too long to run 
Update `HealthEndpointSupport` so that it logs a warning if a health
indicator takes too long to respond.

Fixes gh-31231
 2022-06-14 09:32:07 -07:00
Stephane Nicoll
b536b209ab Refine assertions on exception messages 2022-06-14 18:20:27 +02:00
Moritz Halbritter
42e8f65b80 Move @ConditionalOnClass from methods to inner classes 
Closes gh-31353
 2022-06-13 13:41:58 +02:00
Stephane Nicoll
063e56dbff Polish 2022-06-13 09:44:02 +02: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
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