Commit Graph

37177 Commits (87840c755b6c47a41a8e26fd0ddd84c091007b21)
 

Author SHA1 Message Date
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 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
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 f032690d0a Add support for CNB platform API 0.9
Fixes gh-30566
3 years ago
Andy Wilkinson ff40c8b6f5 Use MeterBinders to bind DataSource metrics
Closes gh-30282
3 years ago
Andy Wilkinson 5e76671859 Remove remaining code that was deprecated in 2.5
Closes gh-30442
3 years ago
Andy Wilkinson 631b876165 Deprecate DatabaseDriver.GAE
Closes gh-29984
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 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 27a936e466 Fix Elastic health indicator without RestHighLevelClient
Closes gh-28496
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 562627fb42 Deprecate auto-configuration for RestHighLevelClient
Closes gh-28598
3 years ago
Andy Wilkinson 4e054385a4 Polish 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
Brian Clozel e0ae1d3501 Use auto-configured JSON codecs for GraphQlTester
Prior to this commit, the auto-configured
`ExecutionGraphQlServiceTester` would use a default Jackson
`ObjectMapper` provided by the builder for its JSON
serialization/deserialization needs. Other testers, like the
`HttpGraphQlTester` are based on auto-configured components which
already use the auto-configured `ObjectMapper`.

This commit uses the newly introduced `encoder(Encoder<?>)` and
`decoder(Decoder<?>)` builder methods to configure custom JSON codecs
honoring the application configuration.

Closes gh-30646
3 years ago
rstoyanchev b91bfc7067 Update WebMVC GraphQL autoconfig to the latest
As a result of changes for
https://github.com/spring-projects/spring-graphql/issues/342,
GraphQlWebSocketHandler now exposes a method to create the
WebSocketHttpRequestHandler, pre-configured with a context propagating
HandshakeInterceptor. This commit updates the autoconfig to use it.

Closes gh-30641
3 years ago
Stephane Nicoll 368ba019de Upgrade to Reactor 2020.0.18
Closes gh-30596
3 years ago
Stephane Nicoll a1fe2b8857 Upgrade to Reactor 2020.0.18
Closes gh-30587
3 years ago
Andy Wilkinson 6580f6c742 Align with latest changes in Micrometer 1.9 snapshots
See gh-30605
3 years ago
Andy Wilkinson 48f8021d88 Migrate @Local*Port annotations to spring-boot-test
Closes gh-29589
3 years ago
Andy Wilkinson b8b903527a Update tag keys to comply with Micrometer recommendations
Closes gh-30536
3 years ago
Stephane Nicoll 6f62e1c743 Start building against Spring Session 2021.2.0-RC1 snapshots
See gh-30611
3 years ago
Stephane Nicoll 2ed65b3035 Start building against Spring Security 2.7.0-RC1 snapshots
See gh-30609
3 years ago
Stephane Nicoll 8658765eb4 Start building against Spring Kafka 2.8.5 snapshots
See gh-30608
3 years ago
Stephane Nicoll 726c4e9ced Start building against Spring Retry 1.3.3 snapshots
See gh-30607
3 years ago
Stephane Nicoll 65efc75c6f Start building against Spring LDAP 2.4.0-RC1 snapshots
See gh-30606
3 years ago
Stephane Nicoll 454f409a14 Start building against Micrometer 1.9.0-RC1 snapshots
See gh-30605
3 years ago
Stephane Nicoll 719fb625ef Start building against Reactor 2020.0.18 snapshots
See gh-30604
3 years ago
Stephane Nicoll 2ded2bf71a Adapt to latest change in Spring Framework snapshots 3 years ago
Stephane Nicoll 0e05c6589f Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll 2a36d3dd14 Start building against Spring Session 2021.1.3 snapshots
See gh-30603
3 years ago
Stephane Nicoll c080a29feb Start building against Spring Security 5.6.3 snapshots
See gh-30601
3 years ago
Stephane Nicoll e42eeca549 Start building against Spring Kafka 2.8.5 snapshots
See gh-30600
3 years ago
Stephane Nicoll 65e2c20ca8 Start building against Spring Data 2021.1.4 snapshots
See gh-30602
3 years ago
Stephane Nicoll 33994a9f54 Start building against Spring Retry 1.3.3 snapshots
See gh-30599
3 years ago
Stephane Nicoll 9eb6f714b5 Start building against Spring LDAP 2.3.7 snapshots
See gh-30598
3 years ago
Stephane Nicoll ccdd49040f Start building against Micrometer 1.8.5 snapshots
See gh-30597
3 years ago