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,483 Commits 23 Branches 345 Tags 278 MiB
Commit Graph

11998 Commits

Author SHA1 Message Date
Stephane Nicoll 487f694872 Upgrade to Dropwizard Metrics 4.1.17 
Closes gh-24723
 2021-01-11 09:20:11 +01:00
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 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 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
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
Valery Yatsynovich 1f63b82c5b Upgrade to Jackson 2.12.0 
See gh-24415
 2020-12-21 15:27:44 +01:00
Stephane Nicoll abbdbb07f6 Polish "Upgrade to Embedded Mongo 3.0.0" 
See gh-24254
 2020-12-21 10:45:18 +01:00
paulius 2f6b51babd Upgrade to Embedded Mongo 3.0.0 
See gh-24254
 2020-12-21 10:44:52 +01:00
Stephane Nicoll 5da27ea57a Polish "Reduce the overhead of char[] creation" 
See gh-24204
 2020-12-21 10:24:46 +01:00
Marten Deinum 5121ca5d17 Reduce the overhead of char[] creation 
See gh-24204
 2020-12-21 10:21:49 +01:00
Stephane Nicoll c063c3434d Merge branch '2.4.x' 
Closes gh-24581
 2020-12-21 10:03:31 +01:00
dreis2211 f9fbadb8d9 Add JavaVersion entry for JDK 16 
See gh-24453
 2020-12-21 09:59:52 +01:00
Stephane Nicoll 09fa16c58c Merge branch '2.3.x' into 2.4.x 2020-12-21 09:59:33 +01:00
Stephane Nicoll 306b964ce3 Fix multi-release JAR test on JDK 16 
See gh-24453
 2020-12-21 09:59:01 +01:00
Stephane Nicoll f4ce82de40 Merge branch '2.4.x' 
Closes gh-24580
 2020-12-21 09:46:34 +01:00
dreis2211 fb207f73e7 Remove deprecated SpringBootContextLoader#getArgs() 
See gh-24550
 2020-12-21 09:44:28 +01:00
Stephane Nicoll c78d0370ec Merge branch '2.4.x' 
Closes gh-24579
 2020-12-21 09:38:52 +01:00
Stephane Nicoll 2c0bfb7674 Merge branch '2.3.x' into 2.4.x 
Closes gh-24578
 2020-12-21 09:38:37 +01:00
izeye 97dd4c0871 Polish 
See gh-24558
 2020-12-21 09:35:41 +01:00
Madhura Bhave 13a06e4eca Merge branch '2.4.x' 2020-12-18 18:03:45 -08:00
Madhura Bhave af67e6fa54 Merge branch '2.3.x' into 2.4.x 2020-12-18 18:03:22 -08:00
Madhura Bhave b82f5a408a Add a note about disabling git info 
See gh-24205
 2020-12-18 18:02:27 -08:00
Madhura Bhave 15a56f81df Merge branch '2.4.x' 
Closes gh-24573
 2020-12-18 17:27:13 -08:00
Madhura Bhave f9d1a4526c Merge branch '2.3.x' into 2.4.x 
Closes gh-24572
 2020-12-18 17:26:44 -08:00
Madhura Bhave a5c8b84511 Update version of git-properties plugin in the docs 
Closes gh-24567
 2020-12-18 17:25:26 -08:00
Madhura Bhave acbe18cf85 Merge branch '2.4.x' 
Closes gh-24571
 2020-12-18 17:15:26 -08:00
Madhura Bhave c231f3da10 Merge branch '2.3.x' into 2.4.x 
Closes gh-24570
 2020-12-18 17:15:01 -08:00
Madhura Bhave 302ba77812 Improve documentation regarding git commit info 
Closes gh-24205
 2020-12-18 17:13:30 -08:00
Phillip Webb 8a67ab0c2d Merge branch '2.4.x' 
Closes gh-24569
 2020-12-18 16:37:25 -08:00
Phillip Webb 5317d8a9bb Change scope of bootstrap registered Binder 
Update `ConfigDataEnvironment` so that the `Binder` is registered as
a prototype bootstrap instance. This allows it to be accessed early
but still replaced when a more complete version is available.

Fixes gh-24559
 2020-12-18 15:16:11 -08:00
Phillip Webb e1b158ec66 Add BootstrapRegistry Scope support 
Update `BootstrapRegistry` so that it can be used to register instances
in either a `singleton` or `prototype` scope. The prototype scope has
been added so that instances can be registered and replaced later
if needed.

See gh-24559
 2020-12-18 15:14:04 -08:00
Phillip Webb 07348066e3 Merge branch '2.4.x' 2020-12-18 15:10:00 -08:00
Phillip Webb f568aa489c Fixup title anchors 2020-12-18 15:06:11 -08:00
Madhura Bhave 9aa1b528df Merge branch '2.4.x' 
Closes gh-24566
 2020-12-18 14:17:12 -08:00
Madhura Bhave 01537bc54f Merge branch '2.3.x' into 2.4.x 
Closes gh-24565
 2020-12-18 14:16:45 -08:00
Madhura Bhave c9a09cf6a9 Clarify when SpEL expressions in application properties are evaluated 
Closes gh-24531
 2020-12-18 14:15:27 -08:00
Madhura Bhave 86d64c727d Merge branch '2.4.x' 
Closes gh-24564
 2020-12-18 14:05:49 -08:00
Madhura Bhave 55d9951d90 Merge branch '2.3.x' into 2.4.x 
Closes gh-24563
 2020-12-18 14:05:20 -08:00
Madhura Bhave 1db271c2c5 Reorder documentation about building images 
Closes gh-24560
 2020-12-18 14:02:29 -08:00
Andy Wilkinson 1c3ace79e5 Merge branch '2.4.x' 2020-12-18 15:26:17 +00:00
Andy Wilkinson e083be7de1 Fix ConfigDataEnvironmentPostProcessorIntegrationTests in Windows 2020-12-18 15:26:03 +00:00
Phillip Webb 82791b4eda Improve performance of Tomcat 'jar:war:file' URLs 
Update jar `Handler` fallback logic to directly support Tomcat
'jar:war:file' URLs. This commit allows contents to be accessed without
the JDK needing to extracted the nested jar to the temporary folder.

Closes gh-24553
 2020-12-17 22:51:19 -08:00
Phillip Webb 65c3464fce Merge branch '2.4.x' 
Closes gh-24555
 2020-12-17 20:47:58 -08:00
Phillip Webb 0730949325 Merge branch '2.3.x' into 2.4.x 
Closes gh-24554
 2020-12-17 20:47:13 -08:00
Phillip Webb c4e41305d5 Prevent Tomcat URL "reflective access" warnings 
Update the jar `Handler` class to support a non-reflective fallback
mechanism when possible. The updated code attempts to capture a regular
jar URL before our handler is installed. It can then use that URL as
context when creating the a fallback URL. The JDK jar `Handler` will
be copied from the context URL to the fallback URL.

Without this commit, resolving new Tomcat URLs of the form
`jar:war:file:...` would result in an ugly "Illegal reflective access"
warning.

Fixes gh-18631
 2020-12-17 20:43:41 -08:00
Phillip Webb aeaefbee33 Make StandardConfigDataResource.getResource public 
Update `StandardConfigDataResource`  to make the `getResource()` method
public so that it can be used by Spring Cloud.

Closes gh-24504
 2020-12-16 16:54:49 -08:00
Phillip Webb b2abc8ff3f Only throw PortInUseException if port is set 
Refine the `PortInUseException` logic in `NettyWebServer` to only throw
an exception if the port is set. The prevents a misleading exception
from being thrown when a domain socket is being used.

Closes gh-24529
 2020-12-16 16:54:49 -08:00
Phillip Webb 5ca01ce5a8 Make StandardConfigDataResource.getResource public 
Update `StandardConfigDataResource`  to make the `getResource()` method
public so that it can be used by Spring Cloud.

Closes gh-24504
 2020-12-16 16:49:39 -08:00
Phillip Webb d195815488 Only throw PortInUseException if port is set 
Refine the `PortInUseException` logic in `NettyWebServer` to only throw
an exception if the port is set. The prevents a misleading exception
from being thrown when a domain socket is being used.

Closes gh-24529
 2020-12-16 16:45:16 -08:00
Madhura Bhave 7f51984cbd Merge branch '2.4.x' 2020-12-16 15:34:25 -08:00
Madhura Bhave 4822516fb7 Merge branch '2.3.x' into 2.4.x 2020-12-16 15:33:58 -08:00
Phillip Webb f4258aae06 Merge branch '2.4.x' 
Closes gh-24544
 2020-12-16 15:30:24 -08:00
Phillip Webb 7fd4c53352 Deal with unsupported DisposableServer operations 
Update `NettyWebServer` to deal with any `UnsupportedOperationException`
thrown from `DisposableServer`. Specifically, this commit allows the
`NettyWebServer` to work with domain socket backed servers which cannot
provide a port.

Fixes gh-24529
 2020-12-16 15:29:54 -08:00
Madhura Bhave 361198ebba Fix tests 
See gh-11987
 2020-12-16 15:25:02 -08:00
Madhura Bhave 58f0e253e7 Merge branch '2.4.x' 
Closes gh-24543
 2020-12-16 14:58:29 -08:00
Madhura Bhave a1ea5b49ec Merge branch '2.3.x' into 2.4.x 
Closes gh-24542
 2020-12-16 14:57:50 -08:00
Madhura Bhave 09e07428cc Configure CORS in default security configuration for MVC 
Fixes gh-11987
 2020-12-16 14:55:36 -08:00
Scott Frederick b51caf2c45 Merge branch '2.4.x' 
Closes gh-24539
 2020-12-16 16:00:09 -06:00
Scott Frederick 4e603d9239 Merge branch '2.3.x' into 2.4.x 
Closes gh-24538
 2020-12-16 15:59:28 -06:00
Scott Frederick e4d124dc45 Improve error message with Maven build-image and war packaging 
Fixes gh-24522
 2020-12-16 15:58:53 -06:00
Phillip Webb c8f59e1239 Merge branch '2.4.x' 
Closes gh-24537
 2020-12-16 13:11:15 -08:00
Phillip Webb d6890e39a7 Merge branch '2.3.x' into 2.4.x 
Closes gh-24536
 2020-12-16 13:10:35 -08:00
Scott Frederick 1f21933c48 Merge branch '2.4.x' 
Closes gh-24534
 2020-12-16 15:02:14 -06:00
Scott Frederick dfcabe1665 Merge branch '2.3.x' into 2.4.x 
Fixes gh-24521 in 2.4.2
 2020-12-16 14:53:55 -06:00
dreis2211 0ec603cdad Avoid duplicates in MergedContextConfiguration 
Remove duplicate config attribute classes by using a `Set` rather
than a `List` in the `SpringBootTestContextBootstrapper`.

See gh-24532
 2020-12-16 12:50:54 -08:00
Scott Frederick 0e5df2296e Fail with Gradle bootBuildImage and war packaging 
Prior to this commit, running the bootBuildImage Gradle task on a
project configured for war packaging would result in a jar file being
built and used in the image instead of the war file. With this commit
an error will be thrown from the plugin in this case.

Fixes gh-24521
 2020-12-16 13:23:43 -06:00
Andy Wilkinson 4dd0e9ae54 Merge branch '2.4.x' 
Closes gh-24527
 2020-12-16 10:01:52 +00:00
Andy Wilkinson 5fdb2ae2fd Protect PluginApplicationActions against absent plugin classes 
Closes gh-24526
 2020-12-16 09:51:25 +00:00
Phillip Webb 5bd5ca5107 Merge branch '2.4.x' 
Closes gh-24524
 2020-12-15 19:53:54 -08:00
Phillip Webb 38e4c2a179 Add ConfigDataEnvironmentUpdateListener support 
Add an overloaded `ConfigDataEnvironmentPostProcessor.applyTo` method
that accepts a listener that can used to track the updates that were
applied to the `Environment`.

The listener can be used to track the which `ConfigDataLocation` and
the `ConfigDataResource` were used to add a `PropertySource`. The lister
can also be used to tell which profiles were applied.

This enhancement is being added in a patch release because it's will
be useful for Spring Cloud 2020.0.0.

Closes gh-24504
 2020-12-15 19:52:20 -08:00
Phillip Webb 5e1a69e90e Polish 2020-12-15 19:51:53 -08:00
Phillip Webb 308c2042ee Merge branch '2.4.x' 2020-12-15 19:49:15 -08:00
Phillip Webb 4fba7d0c60 Merge branch '2.3.x' into 2.4.x 2020-12-15 19:48:52 -08:00
Phillip Webb 29300530c6 Polish 2020-12-15 19:44:40 -08:00
Phillip Webb f855256687 Merge branch '2.4.x' 2020-12-15 11:10:58 -08:00
Phillip Webb a2d0b64e9c Test that empty property files can be used 
Add an additional test to ensure that empty property files do not
throw ConfigDataLocationNotFoundException exceptions.

See gh-24499
See gh-24515
 2020-12-15 11:10:07 -08:00
Andy Wilkinson 4040105629 Merge branch '2.4.x' 
Closes gh-24519
 2020-12-15 17:22:01 +00:00
Andy Wilkinson a67edfbeb7 Merge branch '2.3.x' into 2.4.x 
Closes gh-24518
 2020-12-15 17:21:39 +00:00
Andy Wilkinson 76198f9a8d Include properties from test-autoconfigure in config props appendix 
Closes gh-24486
 2020-12-15 17:20:21 +00:00
Andy Wilkinson a52fee83f9 Pick up new minor releases when upgrading dependencies 
See gh-24491
 2020-12-15 14:23:32 +00:00
Andy Wilkinson fb0f27ce2d Move EMFDependsOnPostProcessor into autoconfigure.orm.jpa 
Closes gh-24452
 2020-12-15 14:20:50 +00:00
Stephane Nicoll 69c6b6b04d Merge branch '2.4.x' 
Closes gh-24511
 2020-12-15 14:48:38 +01:00
Stephane Nicoll 251e8b2640 Update instruction to add the configuration processor with Maven 
Closes gh-24498
 2020-12-15 14:48:19 +01:00
Stephane Nicoll 0dcd9efdac Merge branch '2.4.x' 
Closes gh-24509
 2020-12-15 11:30:04 +01:00
izeye 8e69a821d5 Use BindResult.orElseGet() where beneficial 
See gh-24477
 2020-12-15 11:26:15 +01:00
Stephane Nicoll 83bdf19934 Polish "Add Apache Phoenix to supported database drivers" 
See gh-24114
 2020-12-15 11:14:29 +01:00
Vasily Pelikh 305a7d9186 Add Apache Phoenix to supported database drivers 
See gh-24114
 2020-12-15 11:14:17 +01:00
Stephane Nicoll 59910338c9 Polish "Add configuration for Rabbit's key store and trust store algorithm" 
See gh-24076
 2020-12-15 10:59:39 +01:00
Gong Yi 489062b203 Add configuration for Rabbit's key store and trust store algorithm 
See gh-24076
 2020-12-15 10:50:17 +01:00