Commit Graph

1879 Commits

Author SHA1 Message Date
Jonatan Ivanov 13a2ea9194 Build against Micrometer 1.10.0-M5 and Tracing 1.0.0-M8 snapshots
See gh-32048

Co-authored-by: Marcin Grzejszczak <mgrzejszczak@vmware.com>
2022-09-06 20:15:51 +01:00
Stephane Nicoll e5d0e34268 Adapt to recent changes in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/29082
See https://github.com/spring-projects/spring-framework/issues/28877
2022-09-05 18:23:05 +02:00
Scott Frederick 6b3b0dd3a6 Generate ManagementContextConfiguration.imports file from annotations
This commit adds the
`ManagementContextConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module.

Closes gh-32222
2022-09-02 16:27:59 -05:00
Scott Frederick da4de7d67d Generate the AutoConfiguration.imports file from annotations
This commit adds the `AutoConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module. When added to a project build, the annotation processor will
generate the
`org.springframework.boot.autoconfigure.AutoConfiguration.imports`
file automatically from `@AutoConfiguration`-annotated classes. It
also applies the annotation processor to the Spring Boot build.

Closes gh-31228
2022-09-02 15:10:22 -05:00
Andy Wilkinson 795ea289db Adapt to BindingReflectionHintsRegistrar moving package 2022-09-02 19:46:02 +01:00
Andy Wilkinson cf8e84d406 Adapt to BindingReflectionHintsRegistrar moving into spring-core 2022-09-02 17:34:29 +01:00
Andy Wilkinson d6e9a03136 Adapt to synthesized annotation changes in Framework 2022-09-02 17:01:51 +01:00
Phillip Webb 44f1949c5e Polish hint API calls 2022-09-01 19:43:43 -07:00
Madhura Bhave 47effdcade Support role-based sanitization for actuator endpoints
Closes gh-32156
2022-08-24 16:03:58 -07:00
Stephane Nicoll 24a52aa66d Annotate actuator internal infrastructure with @Reflective
This commit simplifies the registration of hints for the infrastructure
of the Actuator that is invoked via reflection.
2022-08-17 17:25:06 +02:00
Stephane Nicoll e6977777cc Merge branch '2.7.x'
Closes gh-32100
2022-08-17 09:10:13 +02:00
Stephane Nicoll ca63a6e9ad Merge branch '2.6.x' into 2.7.x
Closes gh-32099
2022-08-17 09:10:02 +02:00
Stephane Nicoll 191593cf15 Review Git contribution documentation
Closes gh-31904
2022-08-17 08:58:56 +02:00
Madhura Bhave cea6492c4a Align default JMX and WEB endpoint exposures
Closes gh-32005
2022-08-16 14:29:08 -07:00
Stephane Nicoll 888ccfea2d Adapt to changes in Spring Framework 2022-08-16 16:02:00 +02:00
Andy Wilkinson ba93e6c0ed Restore support for Jersey
Closes gh-28637
2022-08-08 15:45:20 +01:00
Andy Wilkinson fb2f7c1e38 Fix test to create correct type of child context
Closes gh-32002
2022-08-08 14:18:40 +01:00
Madhura Bhave 0991bd3983 Harmonize data configuration
Any classes that rely on Spring Data being on the classpath
have been moved under a data package.

Certain configuration properties have also been updated to
accurately reflect whether Spring Data is required for the
auto-configuration to work.

Closes gh-11574
2022-08-05 13:32:25 -07:00
Stephane Nicoll 1af5994d8f Adapt to API change in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/28927
2022-08-05 10:39:36 +02:00
Andy Wilkinson 2f0dfc341c Merge branch '2.7.x'
Closes gh-31972
2022-08-03 15:20:34 +01:00
Andy Wilkinson 700460c322 Merge branch '2.6.x' into 2.7.x
Closes gh-31971
2022-08-03 14:58:07 +01:00
Andy Wilkinson fa73b73898 Fail build on missing configuration property descriptions
Closes gh-31916
2022-08-03 14:45:42 +01:00
Johnny Lim 6a4681baf5 Polish
See gh-31948
2022-08-02 15:14:23 +02:00
Moritz Halbritter eaf8683e8d Fix timeunit in ZipkinConfigurations to milliseconds instead of seconds
Closes gh-31957
2022-08-02 13:40:00 +02:00
Moritz Halbritter 767631e2cc Fix bean chicken and egg problem with WavefrontSender
Closes gh-31954
2022-08-02 11:19:24 +02:00
Brian Clozel 38f1bc9793 Reinstate Spring for GraphQL auto-configuration
This commit adds the Spring for GraphQL auto-configuration back
into Spring Boot 3.0, now that a 1.1.0 release is scheduled with the
required baseline. This release also needs GraphQL Java 19.0 as a
baseline.

Closes gh-31809
2022-08-01 14:33:25 +02:00
Madhura Bhave a82b95c955 Merge branch '2.7.x' into main
Closes gh-31927
2022-07-29 11:33:41 -07:00
Madhura Bhave 2884ec81e9 Merge branch '2.6.x' into 2.7.x
Closes gh-31926
2022-07-29 11:33:17 -07:00
Madhura Bhave cc15eb0b96 Configure existing probes at additional path when necessary
Fixes gh-30612
2022-07-29 11:31:19 -07:00
Stephane Nicoll db0e008c01 Register composed annotations explicitly
Closes gh-31919
2022-07-29 16:41:50 +02:00
Phillip Webb 22144987e9 Update copyright year of changed files 2022-07-29 12:10:03 +01:00
Phillip Webb e08c16dfd6 Polish 2022-07-29 12:10:02 +01:00
Phillip Webb 57e967576e Adapt to upstream Spring Framework AOT changes 2022-07-27 21:44:18 +01:00
Stephane Nicoll fdb1ee5f97 Adapt to deprecations in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/27954
See gh-29699
2022-07-27 18:18:09 +02:00
Stephane Nicoll c413f9adbe Merge branch '2.7.x'
Closes gh-31884
2022-07-27 09:23:39 +02:00
Stephane Nicoll 53a652ec65 Merge branch '2.6.x' into 2.7.x
Closes gh-31883
2022-07-27 09:23:05 +02:00
Adrian Bob aad9c8906a Disable auto-detection in tests that start Hazelcast
This commit updates test configurations to disable auto-detection of
Hazelcast instances.

See gh-31863
2022-07-27 08:16:48 +02:00
Stephane Nicoll 782e3f75b6 Polish Hazelcast configuration
This commit updates the XSD to 4.2 and removes the "tcp-ip" network
option as it is disabled by default.

See gh-31863
2022-07-27 08:15:53 +02:00
Stephane Nicoll 193c1d7acf Adapt to changes in DefaultGenerationContext
See https://github.com/spring-projects/spring-framework/issues/28877
2022-07-26 18:06:46 +02:00
Phillip Webb 7377d85096 Merge branch '2.7.x'
Closes gh-31866
2022-07-26 12:18:14 +01:00
Phillip Webb a4ef6a7c5c Merge branch '2.6.x' into 2.7.x
Closes gh-31865
2022-07-26 12:13:16 +01:00
Phillip Webb f8412847dc Update copyright year for "Fix typos in code and documentation"
See gh-31734
2022-07-26 12:08:30 +01:00
Marc Wrobel dbfc6bded4 Fix typos in code and documentation
See gh-31734
2022-07-26 12:08:07 +01:00
Phillip Webb b93dbd56e8 Merge branch '2.7.x' 2022-07-26 10:51:17 +01:00
Phillip Webb 3931e82841 Merge branch '2.6.x' into 2.7.x 2022-07-26 10:50:42 +01:00
Phillip Webb 4bcec6e0ee Polish 2022-07-26 10:50:01 +01:00
Olga Maciaszek-Sharma 57dc274284 Switch to Spring Framework SNAPSHOTs
Switch to Spring Framework SNAPSHOTs and adapt to updated APIs.

See gh-31834
2022-07-21 13:42:48 +01:00
Andy Wilkinson de672f4330 Merge branch '2.7.x'
Closes gh-31819
2022-07-20 21:02:06 +01:00
Andy Wilkinson 2e98cafcca Merge branch '2.6.x' into 2.7.x
Closes gh-31818
2022-07-20 21:01:47 +01:00
Andy Wilkinson ab2b04fafd Find health contributors in ancestor contexts in non-reactive apps
Previously, health contributors in a non-reative app were found by
retrieving them from the application context rather than via
dependency injection. This results in only contributors from the
current context being found, with contributors in ancestor contexts
ignored.

This commit moves to injection of the contributors, aligning the
behaviour with that of a reactive application.

Closes gh-27308
2022-07-20 20:52:02 +01:00
Vedran Pavic f1bf80f5e1 Upgrade to Flyway 9.0.1
See gh-31723
2022-07-20 15:44:00 +01:00
Andy Wilkinson 18d3d4de5d Merge branch '2.7.x'
Closes gh-31805
2022-07-20 10:17:56 +01:00
Andy Wilkinson 10e19d504a Merge branch '2.6.x' into 2.7.x
Closes gh-31804
2022-07-20 10:17:39 +01:00
Andy Wilkinson 628c2cd0b1 Ensure JMX endpoints are uniquely named in a context hierarchy
Closes gh-31718
2022-07-20 10:15:52 +01:00
Moritz Halbritter 5030cfedcc Revert "Make MeterRegistry lazy in TimerObservationHandlerObservationRegistryCustomizer"
This reverts commit 04391275c1.
2022-07-19 16:33:35 +02:00
Andy Wilkinson 5c057a2730 Auto-configure the new Elasticsearch clients
This commit introduces auto-configuration for the new Elasticsearch
clients that are based upon their new Java client. The new Java
client builds on top of their existing low-level REST client,
replacing the high-level REST client which has been deprecated.
As part of introducing support for the new Elasticsearch client,
the auto-configuration for the templates (both imperative and
reactive) provided by Spring Data has also been updated to use the
new templates that build upon the new Java client.

As part of these changes, support for the high-level REST client and
the old Spring Data Elasticsearch templates has been removed. One
significant change is that the new reactive template is no longer
based on WebClient. As a result, the WebClient-specific configuration
property has been removed.

Closes gh-30647
Closes gh-28597
Closes gh-31755
2022-07-19 15:26:42 +01:00
Stephane Nicoll 51cba6ec72 Polish "Add AOT support for actuator"
See gh-31671
2022-07-19 13:02:49 +02:00
Moritz Halbritter 584b7d1343 Add AOT support for actuator
Mainly adds reflection hints for the actuator infrastructure.
Also adds the OperationReflectiveProcessor, which registers the
@ReadMethod, @DeleteMethod and @WriteMethod annotated methods for
reflection and adds reflection hints for method return types.

See gh-31671
2022-07-19 13:02:48 +02:00
Andy Wilkinson 3405a54f9e Exclude Jetty toolchain dependencies in favor of official API artifacts
Closes gh-31720
2022-07-14 13:55:26 +01:00
Madhura Bhave 7c56a45d3e Drop support for String path matching for MVC endpoints
Closes gh-31700
2022-07-13 14:03:32 -07:00
Stephane Nicoll 9cace34a19 Merge branch '2.7.x'
Closes gh-31705
2022-07-13 13:50:36 +02:00
Stephane Nicoll b8647551cb Merge branch '2.6.x' into 2.7.x
Closes gh-31704
2022-07-13 13:50:17 +02:00
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 cd6c7cd6c9.

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 35997a30a3.
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