root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
30,297 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

11882 Commits

Author SHA1 Message Date
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
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
asheCarry 17c0c7d9d6 Fix javadoc typo in ConfigDataLocation 
See gh-24660
 2021-01-06 17:39:39 -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
Phillip Webb 52e47c4275 Fix test for JSR-350 @Nonnull 
Closes gh-24647
 2021-01-06 12:33:25 -08:00
Phillip Webb 2dfb9b0911 Merge branch '2.4.x' 
Closes gh-24671
 2021-01-06 12:24:05 -08:00
Phillip Webb 2b497b6aff Merge branch '2.3.x' into 2.4.x 
Closes gh-24670
 2021-01-06 12:23:45 -08:00
Phillip Webb 848ed65f5b Add test for JSR-350 @Nonnull 
Closes gh-24647
 2021-01-06 12:04:58 -08:00
Stephane Nicoll 2547a9e255 Merge branch '2.4.x' 
See gh-24655
 2021-01-06 14:24:34 +01:00
Stephane Nicoll c014bb9880 Merge branch '2.3.x' into 2.4.x 
See gh-24647
 2021-01-06 14:24:13 +01:00
Stephane Nicoll 67d1f355d7 Fix Nullable reference 
See gh-24647
 2021-01-06 14:23:38 +01:00
Stephane Nicoll b3278f459e Merge branch '2.4.x' 
See gh-24655
 2021-01-06 08:59:14 +01:00
Stephane Nicoll 4e6f15a466 Merge branch '2.3.x' into 2.4.x 
See gh-24647
 2021-01-06 08:58:48 +01:00
Stephane Nicoll 2bd78355dc Reference javax.annotation.Nonnull support in reference guide 
See gh-24647
 2021-01-06 08:58:13 +01:00
Phillip Webb 11c4ce2135 Merge branch '2.4.x' 
Closes gh-24658
 2021-01-05 16:03:23 -08:00
Phillip Webb c9f9246c59 Merge branch '2.3.x' into 2.4.x 
Closes gh-24657
 2021-01-05 16:03:01 -08:00
Phillip Webb 9b9c3edfcd Polish "Return -1 port for non-listening WebServers" 
See gh-24606
 2021-01-05 16:02:26 -08:00
Stefan Partusch 5c61df3131 Return -1 port for non-listening WebServers 
Update `WebServer` implementations to return -1 from `getPort()` if
the server  isn't listening on a port. This aligns the implementations
with the interface Javadoc.

See gh-24606
 2021-01-05 15:56:25 -08:00
Phillip Webb bd3dd0a526 Merge branch '2.4.x' 
Closes gh-24655
 2021-01-05 14:08:57 -08:00
Phillip Webb ab8080353e Merge branch '2.3.x' into 2.4.x 
Closes gh-24654
 2021-01-05 14:08:41 -08:00
Phillip Webb 2ad9a47d08 Support JSR-305 annotations on endpoint methods 
Update `OperationMethodParameter` to additionally support JSR-305 based
`@Nullable` annotations.

Closes gh-24647
 2021-01-05 14:07:22 -08:00
Scott Frederick d0fba2473f Merge branch '2.4.x' 
Closes gh-24652
 2021-01-05 14:05:58 -06:00
Scott Frederick 505340909a Support symlinks in configtree property paths 
Prior to this commit, the configtree property source would not traverse
into a sub-directory in a property path if the sub-directory was a
symbolic link. This commit allows symlinked sub-directories to be
traversed like any other sub-directory in the property path.

Fixes gh-24530
 2021-01-05 14:04:59 -06:00
Madhura Bhave f8cc7180e5 Merge branch '2.4.x' 
Closes gh-24651
 2021-01-05 10:49:17 -08:00
Madhura Bhave 615a8ae56e Ignore documents that do not apply when checking mandatory locations 
Closes gh-24584
 2021-01-05 10:47:06 -08:00
Andy Wilkinson 77652961cd Merge branch '2.4.x' 
Closes gh-24650
 2021-01-05 17:13:45 +00:00
Andy Wilkinson 89f29c933f Merge branch '2.3.x' into 2.4.x 
Closes gh-24649
 2021-01-05 17:13:30 +00:00
dreis2211 fe3217d2c4 Exclude starters from Javadoc aggregation 
See gh-24648
 2021-01-05 17:12:39 +00:00
Stephane Nicoll 1fb32fcf7a Merge branch '2.4.x' 
Closes gh-24644
 2021-01-05 08:28:35 +01:00
Stephane Nicoll e1ec70ac36 Merge branch '2.3.x' into 2.4.x 
Closes gh-24643
 2021-01-05 08:28:13 +01:00
Stephane Nicoll f33c7bc27c Polish "Remove unnecessary semicolon" 
See gh-24628
 2021-01-05 08:24:03 +01:00
Andrey Kolchanov 097104584c Remove unnecessary semicolon 
See gh-24628
 2021-01-05 08:15:32 +01:00
Madhura Bhave b62325a056 Merge branch '2.4.x' 2021-01-04 13:37:05 -08:00
Madhura Bhave 86e94b95c3 Merge branch '2.3.x' into 2.4.x 2021-01-04 13:36:36 -08:00
Madhura Bhave 9928d74a9e Revert fix to enable cors for actuator endpoints 
The fix causes a Jersey application to fail in the absence
of a `CorsFilter` or `CorsConfigurationSource` bean.

See gh-11987
 2021-01-04 12:25:43 -08:00
Stephane Nicoll ca1ad1488d Merge branch '2.4.x' 2021-01-04 16:40:23 +01:00
Stephane Nicoll c19f7e696e Polish 
See gh-24597
 2021-01-04 16:39:27 +01:00
Stephane Nicoll 4289523d7d Merge branch '2.4.x' 
Closes gh-24637
 2021-01-03 18:03:08 +01:00
Stephane Nicoll 1bc1258341 Polish "Make a field final" 
See gh-24629
 2021-01-03 17:58:46 +01:00
Andrey Kolchanov 0e3990931e Make a field final 
See gh-24629
 2021-01-03 17:58:14 +01:00
Stephane Nicoll 63444ae957 Merge branch '2.4.x' 
Closes gh-24627
 2021-01-01 09:18:31 +01:00
Stephane Nicoll 052565ef2b Merge branch '2.3.x' into 2.4.x 
Closes gh-24626
 2021-01-01 09:18:13 +01:00
dreis2211 261b7a5b18 Update copyrights to 2021 
See gh-24625
 2021-01-01 09:17:13 +01:00
Stephane Nicoll 8cd07dbc60 Polish 
See gh-21286
 2020-12-24 11:10:37 +01:00
Stephane Nicoll e4618cfb8d Delete ErrorProperties.IncludeStacktrace 
Closes gh-21286
 2020-12-24 10:35:04 +01:00
Stephane Nicoll 1a2577a07e Fix sample formatting 2020-12-23 17:19:18 +01:00
Stephane Nicoll 1fd17cf641 Add support for Elasticsearch sniffer 
Closes gh-24174
 2020-12-23 17:11:40 +01:00
Stephane Nicoll 1e8d5c37ed Merge branch '2.4.x' 
Closes gh-24607
 2020-12-23 16:09:13 +01:00
izeye 5e3f618f9d Polish 
See gh-24604
 2020-12-23 16:08:21 +01:00
Stephane Nicoll e3d7ab0e3b Merge branch '2.3.x' into 2.4.x 2020-12-23 16:08:08 +01:00
Stephane Nicoll d0a1c49873 Polish 
See gh-24604
 2020-12-23 16:07:27 +01:00
Stephane Nicoll 8cf5510f26 Upgrade to REST Assured 4.2.1 
Closes gh-22303
 2020-12-23 11:24:46 +01:00
Stephane Nicoll 830843bb70 Merge branch '2.4.x' 
Closes gh-24603
 2020-12-23 11:14:56 +01:00
Stephane Nicoll 1261e08371 Merge branch '2.3.x' into 2.4.x 
Closes gh-24602
 2020-12-23 11:14:37 +01:00
Stephane Nicoll d86eba3b6b Upgrade to Thymeleaf 3.0.12 
Closes gh-24599
 2020-12-23 10:57:36 +01:00
Stephane Nicoll 7c767e9a0b Merge branch '2.4.x' 
Closes gh-24600
 2020-12-23 10:44:52 +01:00
Stephane Nicoll ff59bb3abf Configure resources filtering encoding 
Closes gh-24576
 2020-12-23 10:44:06 +01:00
Stephane Nicoll b070c39ac3 Merge branch '2.4.x' 
Closes gh-24598
 2020-12-23 09:15:25 +01:00
Stephane Nicoll 4cdfd6f13d Polish "Handle missing manifest files in JarTypeFilter" 
See gh-24597
 2020-12-23 09:12:58 +01:00
Rob Edwards 86eecb01b3 Handle missing manifest files in JarTypeFilter 
This commit makes sure that a jar file without a manifest is handled
properly (i.e. included in the repackaged archive).

See gh-24597
 2020-12-23 09:11:24 +01:00
Madhura Bhave b29ac37db6 Add docs about using InMemoryOAuth2AuthorizedClientService 
Closes gh-24596
 2020-12-22 12:18:47 -08:00
Madhura Bhave d36c950e33 Merge branch '2.4.x' 
Closes gh-24595
 2020-12-22 12:14:16 -08:00
Madhura Bhave a0afec120d Add docs about using InMemoryOAuth2AuthorizedClientService 
Closes gh-24313
 2020-12-22 12:13:17 -08:00
Madhura Bhave 467f853641 Merge branch '2.4.x' 
Closes gh-24593
 2020-12-22 11:17:54 -08:00
Madhura Bhave a714ba44ea Update documentation containing examples of WebSecurityConfigurerAdapter 
Closes gh-24551
 2020-12-22 11:17:30 -08:00
Stephane Nicoll ad6b01d6d0 Add control connection timeout property for Cassandra 
Closes gh-24189
 2020-12-22 15:20:44 +01:00
Stephane Nicoll 5000051891 Merge branch '2.4.x' 
Closes gh-24589
 2020-12-22 12:32:24 +01:00
Stephane Nicoll 0691ba600f Polish "Detect Persistent and RelationshipProperties with Neo4j" 
See gh-24239
 2020-12-22 12:30:48 +01:00
Gerrit Meier ab4b1c4e61 Detect Persistent and RelationshipProperties with Neo4j 
See gh-24239
 2020-12-22 12:15:03 +01:00
Stephane Nicoll ec683605d4 Polish "Allow to configure Kafka Listener's onlyLogRecordMetadata" 
See gh-24582
 2020-12-22 09:53:53 +01:00
Martín Dacosta b539e2e749 Allow to configure Kafka Listener's onlyLogRecordMetadata 
See gh-24582
 2020-12-22 09:53:07 +01:00
Stephane Nicoll 1f71927a9f Merge branch '2.3.x' into 2.4.x 
Closes gh-24587
 2020-12-22 09:45:42 +01:00
Stephane Nicoll 9e5a6c5228 Harmonize references to ActiveMQ Artemis 
Closes gh-24586
 2020-12-22 09:44:49 +01:00
Stephane Nicoll 490a40af20 Polish 2020-12-22 08:33:59 +01:00
Stephane Nicoll 338c8c4fc8 Polish "Allow to configure ActiveMQ Artemis with a broker url" 
See gh-24302
 2020-12-21 17:53:10 +01:00
Justin Bertram 99b43cb690 Allow to configure ActiveMQ Artemis with a broker url 
See gh-24302
 2020-12-21 17:32:49 +01:00
Stephane Nicoll a6c6655c82 Polish "Upgrade to Jackson 2.12.0" 
Guard breaking change to PropertyNamingStrategies so that we tolerate
older Jackson versions.

See gh-24415
 2020-12-21 15:51:52 +01:00