Commit Graph

138 Commits (7373111c70cdf7855e2e00361144996b4ee7b4ae)

Author SHA1 Message Date
Moritz Halbritter 44ff29c4d4 Merge branch '2.5.x' into 2.6.x
Closes gh-29728
3 years ago
Moritz Halbritter 096ba72a39 Add documentation for WebMvc.fn
See gh-29683
3 years ago
Stephane Nicoll 136b5959c3 Merge branch '2.5.x' into 2.6.x
Closes gh-29612
3 years ago
Yanming Zhou b49418aaaf Enforce use of BDDMockito
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
3 years ago
Phillip Webb 72696cdb0f Merge branch '2.5.x' into 2.6.x
Closes gh-29371
3 years ago
Phillip Webb 7c16668bf3 Log Docker output to aid debugging
Add an SLF4J logger so that we can see real time output of the
Docker container.

See gh-29370
3 years ago
Andy Wilkinson 89b40e1e00 Add support for Log4j2's composite configuration
Closes gh-27110
3 years ago
Stephane Nicoll d6aab2fe84 Merge branch '2.5.x' 3 years ago
Stephane Nicoll 0f5bd90539 Add checkstyle ignore for unusual test structure 3 years ago
Andy Wilkinson e2a355f003 Consolidate Elasticsearch configuration properties
Previously, a number of Elasticsearch properties were duplicated
across the spring.elasticsearch.rest and
spring.data.elasticsearch.client.reactive prefixes for configuring
the blocking REST client provided by Elasticsearch and the reactive
client provided by Spring Data respectively. This could cause
problems when using the Elasticsearch REST client configured with
a custom spring.elasticsearch.rest.uris. If Spring WebFlux (to make
use of WebClient) and Spring Data Elasticsearch were on the classpath,
the reactive Elasticsearch Client would be autoconfigured but it
would use the default value of its analogous
spring.data.elasticsearch.client.reactive.endpoints property. It
would be unable to connect, causing a startup failure.

This commit consoliates the configuration properties where possible.
Each setting that is common across the two clients is now configured
using a single, shared spring.elasticsearch property. Each setting
that is specific to the blocked REST client or the WebClient-based
reactive client now have prefixes of spring.elasticsearch.restclient
and spring.elasticsearch.webclient respectively.

The old properties beneath spring.elasticsearch.rest and
spring.data.elasticsearch.client.reactive have been deprecated. If a
any deprecated property is set, all of the new properties are
ignored. In other words, to migrate to the new properties, each usage
of a now-deprecated property must be updated to use its new
replacement instead.

Closes gh-23106
3 years ago
Andy Wilkinson 575d83737a Merge branch '2.5.x'
Closes gh-27799
3 years ago
Andy Wilkinson e409489859 Merge branch '2.4.x' into 2.5.x
Closes gh-27798
3 years ago
Andy Wilkinson f8ef90813f Allow @MockBean to be used with Framework's @Repeat
Fixes gh-27693
3 years ago
Scott Frederick 2178c281e9 Polish "Add network option for image building"
See gh-27486
3 years ago
Scott Frederick a0b32251eb Split gradle test support into a separate module
See gh-25824
3 years ago
Scott Frederick 18c7c0af22 Add Paketo image building system tests
A new system test plugin is being made available for running test
suites that should be run less frequently than with every commit, such
as tests that verify Spring Boot compatibility with external
projects. CI pipeline configuration for running system tests is also
provided.

The first system tests verify the behavior of the Spring Boot image
building plugins when building images using Paketo buildpacks.

Closes gh-25824
3 years ago
Scott Frederick b62905b91d Merge branch '2.4.x'
Closes gh-25840
4 years ago
Scott Frederick 8ac297d6f3 Merge branch '2.3.x' into 2.4.x
Closes gh-25839
4 years ago
Scott Frederick 32d378a348 Use test harness for image building integration tests
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.

Fixes gh-25838
4 years ago
Phillip Webb b5583a4620 Polish doc code samples
See gh-6313
4 years ago
Phillip Webb 9aad29da0c Extract code samples from docs
See gh-6313
4 years ago
Phillip Webb b314d848dc Polish docs code
See gh-6313
4 years ago
Andy Wilkinson ad968a2640 Merge branch '2.4.x'
Closes gh-26273
4 years ago
Andy Wilkinson cf1b29ebd4 Merge branch '2.3.x' into 2.4.x
Closes gh-26272
4 years ago
dreis2211 9b1b47ae5d Rename nohttp whitelist to allowlist
See gh-26264
4 years ago
Andy Wilkinson d1164c63f9 Merge branch '2.4.x'
Closes gh-26176
4 years ago
Andy Wilkinson be99f386a8 Merge branch '2.3.x' into 2.4.x
Closes gh-26175
4 years ago
Andy Wilkinson 9e5f738f7a Make relative file references in checkstyle.xml more robust
Closes gh-26174
4 years ago
Andy Wilkinson b9348c6d28 Merge branch '2.4.x'
Closes gh-26169
4 years ago
Andy Wilkinson bc1a462143 Merge branch '2.3.x' into 2.4.x
Closes gh-26168
4 years ago
Andy Wilkinson 82198a99e0 Polish nohttp configuration
Closes gh-26166
4 years ago
Andy Wilkinson 8b5f914ba5 Revert "Merge branch '2.4.x'"
This reverts commit 97b26b4886, reversing
changes made to 6f9b1ed6a3.

See gh-25840
4 years ago
Andy Wilkinson e9ce20dbf4 Revert "Merge branch '2.3.x' into 2.4.x"
This reverts commit 586ce00e06, reversing
changes made to 563b8a8cec.

See gh-25839
4 years ago
Andy Wilkinson b35d1ec6e8 Revert "Use test harness for image building integration tests"
This reverts commit da9d8d6055.

See gh-25838
4 years ago
Scott Frederick 97b26b4886 Merge branch '2.4.x'
Closes gh-25840
4 years ago
Scott Frederick da9d8d6055 Use test harness for image building integration tests
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.

Fixes gh-25838
4 years ago
Andy Wilkinson 9d7135f515 Relax Micrometer import control for docs examples
See gh-25762
4 years ago
Andy Wilkinson cf7f59fe4b Merge branch '2.4.x'
Closes gh-25762
4 years ago
Andy Wilkinson f8c1a73bf2 Prevent import of Micrometer class outside of the Actuator
Closes gh-25760
4 years ago
Phillip Webb 8ba45cc6b5 Allow DB migrations without DataSourceProperties
Update `FlywayAutoConfiguration`, `LiquibaseAutoConfiguration` and
`DataSourceInitializer` classes so that they no longer depend on
`DataSourceProperties`. DB migrations can now be performed against
a `@Bean` defined primary `DataSource` with an alternative
username/password.

This update also removed using fallback properties when a custom
connection `url` is defined with Flyway or Liquibase. We now assume
that `username`, `password` and `driver-class-name` will be provided
if the default values are unacceptable. Our previous logic was
particularly flawed if a custom URL caused a change of driver type.

Closes gh-25643
4 years ago
Phillip Webb bea307b115 Extract code samples from docs
See gh-6313
4 years ago
Madhura Bhave c4432a81a8 Merge branch '2.4.x'
Closes gh-25615
4 years ago
Madhura Bhave df1d1dbaa9 Fallback to BeanPropertyBindingResult for unbound property validation
gh-17424 updated `ValidationBindHandler` so that it would
only look at bound values when validating. This commit updates
`ValidationBindHandler` to use Spring Framework's `BeanPropertyBindingResult`.
This means that for fields that are not bound, JavaBean accessor methods can
be used to get the value to validate.

Fixes gh-25356
4 years ago
Phillip Webb 2a85427324 Refine spring-boot-docs package restructure
Refine the package restructure started in 91ccc23462 to help provide
a solid foundation for code snippets. This commit renames many of the
classes so that they no longer end in `Example`. It also removes some
of the inner types that were previously used. Many tag comments have
also been moved to ensure that `import` statements are available in
the docs.

Closes gh-25089
4 years ago
Phillip Webb 49e754f48b Merge branch '2.2.x' into 2.3.x
Closes gh-24411
4 years ago
Phillip Webb 286ef61071 Narrow auto-configure checkstyle suppressions
Closes gh-21015
4 years ago
Andy Wilkinson 2dce4aa42b Merge branch '2.2.x' into 2.3.x
Closes gh-24009
4 years ago
Andy Wilkinson 30a0ccab02 Remove use of `@PostConstruct` from main code
When running on Java 11 (where `@PostConstruct` is no longer part of
the JRE) and without a dependency on jakarta-annotation-api,
`@PostContruct` annotions are silently dropped. This leads to obscure and
hard-to-track down changes in the behaviour of our auto-configuration
as the `@PostConstruct`-annotated methods are not invoked.

To allow users to run on Java 11 without having jakarta-annotation-api
on the classpath, this commit removes use of `@PostConstruct` from main
code. A Checkstyle rule has also been added to prevent its usage in
main code from being reintroduced.

Closes gh-23723
4 years ago
Phillip Webb e12a449ed9 Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb 8b3728a57e Refine StringSequence checkstyle suppression
See gh-23440
4 years ago