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
Stephane Nicoll
68bd6f91cf Merge branch '2.7.x' 2022-01-29 15:34:16 +01:00
Stephane Nicoll
a94b176c39 Merge branch '2.6.x' into 2.7.x 
Closes gh-29595
 2022-01-29 15:34:08 +01:00
izeye
118eb5f74a Polish AbstractHealthEndpointAdditionalPathIntegrationTests 
See gh-29593
 2022-01-29 15:33:25 +01:00
Madhura Bhave
8125b46ed5 Merge branch '2.7.x' into main 2022-01-27 12:09:51 -08:00
Madhura Bhave
81bbd295e9 Merge branch '2.6.x' into 2.7.x 
Closes gh-29584
 2022-01-27 12:04:26 -08:00
Madhura Bhave
0597c6831e Configure health on additional path only when health exposed 
Prior to this commit, limiting the exposure to a specific
technology in `ConditionalOnAvailableEndpoint` would not have
any effect because all endpoints would be considered to be available
if the app was running on Cloud Foundry. This caused issues in cases
where beans were meant to be exposed only if the endpoint was actually
exposed.

This commit adds CLOUD_FOUNDRY to the `EndpointExposure`
enum. This allows `ConditionalOnAvailableEndpoint` to limit
by exposure even when the Cloud Foundry platform is active.

Fixes gh-29532
 2022-01-27 11:44:54 -08:00
Andy Wilkinson
de3b9a4910 Remove code deprecated for removal in 2.x 
Closes gh-29482
 2022-01-19 17:25:14 +00:00
Stephane Nicoll
4d03f89a55 Harmonize dependency upgrades with Spring Boot 2.7.0-M1 
Closes gh-29476
 2022-01-19 10:39:18 +01:00
Stephane Nicoll
90b8d2190f Adapt to latest change in Spring Data Elasticsearch 2022-01-12 10:04:44 +01:00
Stephane Nicoll
8ec8268a77 Merge branch '2.7.x' 2022-01-10 12:07:19 +01:00
Stephane Nicoll
c02faea9c9 Allow WebMvcFilter to be overridden by user configuration 
Closes gh-28428
 2022-01-10 12:02:08 +01:00
Stephane Nicoll
5f67546534 Adapt to latest API change in SD Elasticsearch 
See gh-29292
 2022-01-09 22:24:05 +01:00
Stephane Nicoll
9e27bddfc7 Start building against Spring Data 2021.2.0-M1 snapshots 
This commit also upgrades to Elasticsearch 7.16.2

See gh-29223
See gh-29292
 2022-01-08 19:57:50 +01:00
Andy Wilkinson
894f83fb13 Upgrade to Artemis 2.20.0 and switch to Jakarta EE 9 JMS API 
Closes gh-29203
 2022-01-07 15:26:39 +00:00
Andy Wilkinson
89e79e826e Reinstate support for Apache Artemis 
See gh-29203
 2022-01-07 15:26:29 +00:00
Andy Wilkinson
9a05eb63c4 Use built-in basic auth support as it no longer requires JAX-B 
Closes gh-28829
 2022-01-06 18:12:14 +00:00
Stephane Nicoll
025fe4fd43 Merge branch '2.7.x' 2022-01-06 17:50:15 +01:00
Stephane Nicoll
a780e87e9c Upgrade to Hazelcast 5.0.2 
See gh-29265
 2022-01-06 17:38:06 +01:00
Phillip Webb
760dcffd8b Merge branch '2.7.x' 2022-01-04 12:22:54 -08:00
Phillip Webb
f09bde2b60 Merge branch '2.6.x' into 2.7.x 2022-01-04 12:20:31 -08:00
Phillip Webb
dc054943bf Merge branch '2.7.x' 
Closes gh-29262
 2022-01-04 12:14:18 -08:00
Phillip Webb
c839ebbce4 Merge branch '2.6.x' into 2.7.x 
Closes gh-29261
 2022-01-04 12:13:55 -08:00
Phillip Webb
8e583f6f73 Apply exclusion rules to child contributors 
Update `IncludeExcludeGroupMemberPredicate` so that exclusion rules are
also applied to child contributors. The restores the behavior of Spring
Boot 2.5.x where `management.endpoint.health.group.mygroup.exclude=db`
would exclude 'db/one', 'db/two' etc.

Fixes gh-29251
 2022-01-04 12:12:03 -08:00
Andy Wilkinson
1dbfcf8b57 Reinstate support for Spring Data Couchbase 
Closes gh-28976
 2022-01-04 16:38:16 +00:00
Stephane Nicoll
abb622023d Merge branch '2.7.x' 2022-01-04 14:23:48 +01:00
Stephane Nicoll
d24720d958 Polish "Expose OS information as an InfoContributor" 
See gh-28907
 2022-01-04 14:08:24 +01:00
Jonatan Ivanov
c700f686c6 Expose OS information as an InfoContributor 
See gh-28907
 2022-01-04 13:58:39 +01:00
Stephane Nicoll
b94fcd1ad7 Merge branch '2.7.x' 2021-12-30 07:33:36 +01:00
Stephane Nicoll
de947e0800 Merge branch '2.6.x' into 2.7.x 
Closes gh-29190
 2021-12-30 07:33:26 +01:00
izeye
d234681348 Fix default value for management.info.env.enabled in metadata 
See gh-29187
 2021-12-30 07:32:58 +01:00
Stephane Nicoll
09486b8fc7 Merge branch '2.7.x' 2021-12-27 12:03:11 +01:00
Stephane Nicoll
2b140950e3 Merge branch '2.6.x' into 2.7.x 
Closes gh-29176
 2021-12-27 12:02:57 +01:00
izeye
7fbb5749d1 Polish 
See gh-29157
 2021-12-27 12:01:50 +01:00
Brian Clozel
f61c87c3a7 Revert "Merge branch '2.7.x'" 
This reverts commit f0677a119c54113f87f2d3bca7d5a4e34356234c, reversing
changes made to 938d58f32ce22e0256d63e7df5931ee3d8082050.
 2021-12-21 09:05:06 +01:00
Brian Clozel
f0677a119c Merge branch '2.7.x' 2021-12-21 09:04:10 +01:00
Brian Clozel
8e29eac887 Auto-configure GraphQL metrics 
This commit auto-configures the metrics infrastructure for Spring
GraphQL.

See gh-29140
 2021-12-21 08:34:32 +01:00
Brian Clozel
a7839bc9b9 Add Metrics support for Spring GraphQL 
This commit adds the required infrastructure for instrumenting the
GraphQL engine and datafetchers in order to collect metrics.

With this infrastructure, we can collect metrics such as:

* "graphql.request", a timer for GraphQL query
* "graphql.datafetcher", a timer for GraphQL datafetcher calls
* "graphql.request.datafetch.count", a distribution summary of
  datafetcher count per query
* "graphql.error", an error counter

See gh-29140
 2021-12-21 08:34:24 +01:00
Phillip Webb
003fb229fd Merge branch '2.7.x' 2021-12-16 13:07:22 -08:00
Phillip Webb
f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08:00
Andy Wilkinson
3c8d4d33e1 Upgrade to Spring Data Elasticsearch 7.16.0 
Closes gh-28987
 2021-12-10 21:43:29 +00:00
Stephane Nicoll
c83ab9bbc5 Merge branch '2.7.x' 2021-12-09 15:51:29 +01:00
Stefano Cordio
a5c56043b9 Simplify AssertJ usage 
See gh-28862
 2021-12-09 15:39:02 +01:00
Stephane Nicoll
fcea05a4b8 Merge branch '2.7.x' 2021-12-09 15:09:53 +01:00
izeye
0364353204 Add public accessor for StackdriverProperties.useSemanticMetricTypes 
See gh-28944
 2021-12-09 15:09:13 +01:00
Scott Frederick
33953823fc Replace usage of deprecated Spring Framework methods 
See gh-28642
 2021-12-06 16:12:34 -06:00
Andy Wilkinson
fe7b13ec46 Upgrade to Spring Framework 6 and Jakarta EE 9 
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872

See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
 2021-11-30 20:32:16 +00:00
Andy Wilkinson
85f9949513 Remove support for Jolokia 
Closes gh-28704
 2021-11-30 15:55:47 +00:00
Andy Wilkinson
79b53e3562 Drop support for auto-configuring Hibernate metrics 
Closes gh-28703
 2021-11-30 15:55:20 +00:00
Madhura Bhave
c8fd5f0080 Remove support for Artemis 
Closes gh-28593
 2021-11-30 15:39:56 +00:00
Andy Wilkinson
8bf2ffd93c Drop support for Jersey until jersey-spring6 is available 
Closes gh-28808
 2021-11-30 15:39:39 +00:00