Commit Graph

30558 Commits

Author SHA1 Message Date
Stephane Nicoll a60b5e0f70 Upgrade to Byte Buddy 1.10.19
Closes gh-24722
2021-01-11 09:20:10 +01:00
Stephane Nicoll 180493422d Upgrade to AppEngine SDK 1.9.84
Closes gh-24721
2021-01-11 09:20:08 +01:00
Stephane Nicoll 04a02f0a2d Merge pull request #24717 from bono007
* pr/24717:
  Polish "Add support for GET requests for /actuator/startup"
  Add support for GET requests for /actuator/startup

Closes gh-24717
2021-01-11 09:14:08 +01:00
Stephane Nicoll 632c1239e6 Polish "Add support for GET requests for /actuator/startup"
See gh-24717
2021-01-11 09:12:53 +01:00
bono007 4b8d6efc12 Add support for GET requests for /actuator/startup
See gh-24717
2021-01-11 08:49:06 +01:00
Stephane Nicoll 8a6e79dc8b Configure Couchbase to use the application's ObjectMapper
Closes gh-24616
2021-01-10 10:10:42 +01:00
Andy Wilkinson 45f298bc7a Merge branch '2.4.x'
Closes gh-24711
2021-01-08 17:08:52 +00:00
Andy Wilkinson 9e389c8376 Merge branch '2.3.x' into 2.4.x
Closes gh-24710
2021-01-08 17:07:45 +00:00
Andy Wilkinson 5ad4d627fd Fix classpath index so entries match those expected by the launcher
This reverts commit ad164269e9 and adds
some additional tests.

Fixes gh-24192
2021-01-08 15:32:19 +00:00
Stephane Nicoll 1d30a4716e Merge branch '2.4.x'
Closes gh-24708
2021-01-08 15:54:36 +01:00
Stephane Nicoll b8a1869569 Merge branch '2.3.x' into 2.4.x
Closes gh-24707
2021-01-08 15:53:53 +01:00
Stephane Nicoll 826d79be3e Clarify behaviour of WebServerFactory in reference guide
Closes gh-24705
2021-01-08 15:50:16 +01:00
Stephane Nicoll 3b8663ce49 Merge branch '2.4.x' 2021-01-08 09:39:03 +01:00
Stephane Nicoll 40f1f9a25c Start building against Spring Kafka 2.6.5 snapshots
See gh-24703
2021-01-08 09:24:42 +01:00
Stephane Nicoll a27b87a118 Start building against Spring AMQP 2.3.3 snapshots
See gh-24702
2021-01-08 09:23:34 +01:00
Stephane Nicoll 0bfb072467 Start building against Spring Integration 5.4.3 snapshots
See gh-24701
2021-01-08 09:22:59 +01:00
Stephane Nicoll 5bfc0285c6 Start building against Spring Data 2020.0.3 snapshots
See gh-24700
2021-01-08 09:22:03 +01:00
Stephane Nicoll 11d20eba82 Start building against Spring Framework 5.3.3 snapshots
See gh-24699
2021-01-08 08:36:21 +01:00
Stephane Nicoll 9f70b71036 Start building against Reactor 2020.0.3 snapshots
See gh-24698
2021-01-08 08:35:34 +01:00
Madhura Bhave 320f4b206e Merge branch '2.4.x'
Closes gh-24692
2021-01-07 14:24:25 -08:00
Madhura Bhave e5981c16d7 Merge branch '2.3.x' into 2.4.x
Closes gh-24691
2021-01-07 14:22:58 -08:00
Madhura Bhave b309980a59 Automate homebrew tap repo update
Closes gh-24677
2021-01-07 14:21:01 -08:00
Scott Frederick c82165694d Merge branch '2.4.x'
Closes gh-24690
2021-01-07 16:00:03 -06:00
Scott Frederick 210438ee5b Merge branch '2.3.x' into 2.4.x
Closes gh-24689
2021-01-07 15:59:37 -06:00
Scott Frederick a302238e21 Remove layout parameters from build-image Maven goal
This commit removes the `layout` and `layoutFactory` parameters
from the `build-image` goal in the Maven plugin while retaining
them for the `repackage` goal. The `build-image` goal currently
only supports jar archives, so allowing other layout types to be
configured for the goal could cause confusion.

Fixes gh-24105
2021-01-07 15:59:02 -06:00
Scott Frederick bd4c6e51fa Merge branch '2.4.x'
Closes gh-24687
2021-01-07 10:36:06 -06:00
Scott Frederick ef7a82756e Allow overriding ThemeResolver and FlashMapManager beans
Previously, an error would occur when a user contributed a
`ThemeResolver` or `FlashMapManager` bean because those beans would
would not properly override the default beans provided by Spring
Framework. This commit adds conditional auto-configuration of these
bean types, preferring user-provided beans and falling back to
Framework-provided defaults.

Fixes gh-24207
2021-01-07 10:29:13 -06:00
Phillip Webb bd027de736 Merge branch '2.4.x'
Closes gh-24685
2021-01-06 17:40:20 -08:00
Phillip Webb cca8a386ea Merge pull request #24660 from asheCarry
* pr/24660:
  Fix javadoc typo in ConfigDataLocation

Closes gh-24660
2021-01-06 17:40:06 -08:00
asheCarry 17c0c7d9d6 Fix javadoc typo in ConfigDataLocation
See gh-24660
2021-01-06 17:39:39 -08:00
Phillip Webb 9270c047d0 Merge pull request #24664 from runningcode
* pr/24664:
  Add filter to Gradle Enterprise Readme badge

Closes gh-24664
2021-01-06 17:36:35 -08:00
Nelson Osacky 592ee0220e Add filter to Gradle Enterprise Readme badge
Add a filter to the Gradle Enterprise Readme badge to filter the scans
list by only the Spring Boot project.

See gh-24664
2021-01-06 17:34:58 -08:00
Phillip Webb fdeee9776e Merge branch '2.4.x'
Closes gh-24684
2021-01-06 17:31:09 -08:00
Phillip Webb 48661e79f5 Merge branch '2.3.x' into 2.4.x
Closes gh-24683
2021-01-06 17:30:55 -08:00
Phillip Webb 7cbd57b635 Log FailureAnalyzer errors at trace level
Update `FailureAnalyzers` to log errors at `trace` rather than `debug`.
This should reduce noise when an analyzer unexpectedly fails and the
user is running with `--debug`.

Fixes gh-24630
2021-01-06 17:29:24 -08:00
Phillip Webb 86bb3b7dcd Merge branch '2.4.x' 2021-01-06 17:02:13 -08:00
Phillip Webb 76aa33b65a Merge branch '2.3.x' into 2.4.x 2021-01-06 17:01:53 -08:00
Phillip Webb a24ec9d372 Merge branch '2.2.x' into 2.3.x 2021-01-06 17:01:22 -08:00
Phillip Webb 46629ef5e4 Migrate away from pivotal-legacy/homebrew-tap
Update formula to use spring-boot rather than springboot. This will
allow both taps to be used at the same time.

See gh-24659
2021-01-06 16:58:05 -08:00
Phillip Webb 42e649debe Merge branch '2.4.x'
Closes gh-24682
2021-01-06 16:47:46 -08:00
Phillip Webb 04616a01cf Merge branch '2.3.x' into 2.4.x
Closes gh-24681
2021-01-06 16:47:24 -08:00
Phillip Webb ef09982b39 Merge branch '2.2.x' into 2.3.x
Closes gh-24680
2021-01-06 16:46:50 -08:00
Phillip Webb 25033ee5e7 Migrate away from pivotal-legacy/homebrew-tap
Update reference documentation to the new spring-io/homebrew-tap repo.

Closes gh-24659
2021-01-06 16:45:10 -08:00
Madhura Bhave 012fb3d3b9 Merge branch '2.4.x'
Closes gh-24679
2021-01-06 16:44:58 -08:00
Madhura Bhave 920136d908 Merge branch '2.3.x' into 2.4.x
Closes gh-24678
2021-01-06 16:44:32 -08:00
Madhura Bhave 73a2a4b383 Consider context-path for WebTestClient baseUrl
Fixes gh-24168
2021-01-06 16:42:09 -08:00
Phillip Webb cb0069f385 Merge branch '2.4.x'
Closes gh-24674
2021-01-06 13:32:09 -08:00
Phillip Webb 5b126b01c0 Replace binder as contributors are processed
Update `ConfigDataEnvironment` so that the bootstrap `Binder` is
replaced as contributors are processed. The final `Binder` is now
also added without the `FAIL_ON_BIND_TO_INACTIVE_SOURCE` option so
that properties can be bound at the last stage even if values exist
in an inactive profile-specific document.

Closes gh-24669
2021-01-06 13:31:29 -08:00
Phillip Webb 45ca4a5a56 Merge branch '2.4.x'
Closes gh-24673
2021-01-06 12:34:13 -08:00
Phillip Webb ac4243d615 Merge branch '2.3.x' into 2.4.x
Closes gh-24672
2021-01-06 12:33:53 -08:00