Commit Graph

37588 Commits (4a3299a60f90a1b84728c33aa83f076ab6a5611f)
 

Author SHA1 Message Date
Andy Wilkinson 7e97073994 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 74494f1d37 Merge branch '2.6.x' into 2.7.x
Closes gh-30671
3 years ago
Andy Wilkinson 1720290234 Merge branch '2.5.x' into 2.6.x
Closes gh-30670
3 years ago
Andy Wilkinson f7d181e65b Handle null additional properties more gracefully
Closes gh-30654
3 years ago
Andy Wilkinson 9658661bd4 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 7789a18d23 Merge branch '2.6.x' into 2.7.x
Closes gh-30667
3 years ago
Andy Wilkinson d4348279a7 Merge branch '2.5.x' into 2.6.x
Closes gh-30666
3 years ago
Andy Wilkinson 8f1b8622ba Ensure that webEnvironment=NONE creates non-web context
Previously, if spring.main.web-application-type was configured in
application.properties to servlet or reactive, setting
webEnvironment=NONE on @SpringBootTest would not work correctly and
a servlet or reactive web application context would be created
based on the value of spring.main.web-application-type.

This commit updates the test context bootstapper to set
spring.main.web-application-type to none when webEnvironment has been
set to none. This is done in the merged context configuration's
property source properties which are applied to the environment in a
high-precedence test property source that will override configuration
in application.properties.

Closes gh-29695
3 years ago
Andy Wilkinson 21ccd58f67 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 4545d39603 Merge branch '2.6.x' into 2.7.x
Closes gh-30665
3 years ago
Andy Wilkinson 887fa4a13f Merge branch '2.5.x' into 2.6.x
Closes gh-30664
3 years ago
Andy Wilkinson c8de843d85 Honor final web application type when creating context in tests
Previously, SpringBootContextLoader would configure its
SpringApplication with an ApplicationContextFactory that ignores
the WebApplicationType with which its called and instead returns a
hard-coded type of context based on the type of the
MergedContextConfiguration. This hard-coding would result in the
wrong type of context being used if a subsequent change was made to
the application's WebApplicationType, for example due to binding of
the spring.main.web-application-type configuration property.

This commit updates SpringBootContextLoader to configure
SpringApplication with an ApplicationContextFactory that takes the
WebApplicationType with which it is called into consideration.

Fixes gh-29170
3 years ago
Stephane Nicoll b0fb212836 Merge pull request #30572 from pruidong
* pr/30572:
  Polish "Add link to @Order annotation"
  Add link to @Order annotation

Closes gh-30572
3 years ago
Stephane Nicoll c654638654 Polish "Add link to @Order annotation"
See gh-30572
3 years ago
prd c72f3d79af Add link to @Order annotation
See gh-30572
3 years ago
Moritz Halbritter 3860eb211a Implement auto-configurations for Brave and OpenTelemetry
- Configure Zipkin
- Configure Wavefront
- Configure Brave
- Configure OpenTelemetry
- Configure Micrometer Tracing bridges for OpenTelemetry and Brave
- Create the ObservationHandler for tracing with Micrometer

Closes gh-30156
3 years ago
Scott Frederick f5f7fc8e9a Merge branch '2.7.x' 3 years ago
Scott Frederick d387b3fa81 Support configuration of web SSL using PEM-encoded certificates
This commit adds the ability to configure SSL in embedded web containers
using PEM-encoded certificate and private key files, as an alternative
to configuring SSL with Java KeyStore files.

Closes gh-29273
3 years ago
Scott Frederick 9aff0a998f Merge branch '2.7.x' 3 years ago
Scott Frederick f032690d0a Add support for CNB platform API 0.9
Fixes gh-30566
3 years ago
Andy Wilkinson 3d5086a42d Merge branch '2.7.x' 3 years ago
Andy Wilkinson ff40c8b6f5 Use MeterBinders to bind DataSource metrics
Closes gh-30282
3 years ago
Andy Wilkinson d1cd95eb13 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 5e76671859 Remove remaining code that was deprecated in 2.5
Closes gh-30442
3 years ago
Andy Wilkinson c37857c6c6 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 631b876165 Deprecate DatabaseDriver.GAE
Closes gh-29984
3 years ago
Moritz Halbritter 2c42be9392 Merge branch '2.7.x' 3 years ago
Moritz Halbritter 6c04241ad6 Merge branch '2.6.x' into 2.7.x
Closes gh-30652
3 years ago
Moritz Halbritter 9e98ccd8ab Merge branch '2.5.x' into 2.6.x
Closes gh-30651
3 years ago
Moritz Halbritter dfc0f21932 Fix language in WavefrontProperties
Closes gh-30649
3 years ago
Stephane Nicoll 95d226fea8 Merge branch '2.7.x' 3 years ago
Stephane Nicoll b0bc06fb7f Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll b5713ba5e7 Upgrade to Spring Framework 5.3.19
Closes gh-30518
3 years ago
Stephane Nicoll e2dd454233 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll 138192230c Upgrade to Spring Framework 5.3.19
Closes gh-30517
3 years ago
Stephane Nicoll 08954fce85 Upgrade to Spring Framework 5.3.19
Closes gh-30516
3 years ago
Andy Wilkinson fe46392144 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 27a936e466 Fix Elastic health indicator without RestHighLevelClient
Closes gh-28496
3 years ago
Stephane Nicoll 62069ead48 Merge branch '2.7.x' 3 years ago
Stephane Nicoll f96efa72ab Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll 00a481e4e9 Upgrade to Reactor 2020.0.18
Closes gh-30604
3 years ago
Stephane Nicoll d489bf00be Merge branch '2.5.x' into 2.6.x 3 years ago
Andy Wilkinson 258ae5e153 Merge branch '2.7.x' 3 years ago
Andy Wilkinson e32c314bff Merge branch '2.7.x' 3 years ago
Andy Wilkinson 562627fb42 Deprecate auto-configuration for RestHighLevelClient
Closes gh-28598
3 years ago
Andy Wilkinson 4e054385a4 Polish 3 years ago
Andy Wilkinson d5a92ccb8b Merge branch '2.7.x' 3 years ago
Andy Wilkinson 227c3164f1 Merge pull request #28496 from filiphr
* gh-28496:
  Polish "Bring back Elasticsearch RestClient auto-configuration"
  Bring back Elasticsearch RestClient auto-configuration

Closes gh-28496
3 years ago
Andy Wilkinson a7a71da9ef Polish "Bring back Elasticsearch RestClient auto-configuration"
See gh-28496
3 years ago
Filip Hrisafov eb3bf40bdb Bring back Elasticsearch RestClient auto-configuration
Prior to this commit, Spring Boot would only auto-configure the
`RestHighLevelClient` and `RestClientBuilder` if the
`RestHighLevelClient` was present. This was done in 1d73d4ed.

This commit brings back the exposing of the `RestClient` bean in when
exposing the `RestHighLevelClient` or when the `RestHighLevelClient`
is not present. It allows for using the auto-configuration and its
customizers of the `RestClientBuilder` in a similar way as it is done
for the `RestTemplateBuilder` and the `WebClient.Builder`.

The presence of the `elasticsearch-rest-high-level-client` module is
now optional. This opens the door for potentially adding support for
the new Elasticsearch Java Client[1] that is based on the same
`RestClient`.

The health contributor and its configuration has also been updated to
only depend on the low-level RestClient.

See gh-28496

[1] https://github.com/elastic/elasticsearch-java
3 years ago