Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,054 Commits 23 Branches 0 Tags
f4258aae06a461eb72ebd64f4c8a360d6db5f0a2
Commit Graph

30054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Phillip Webb
2cd1459a9a Merge pull request #24532 from dreis2211 
* pr/24532:
  Avoid duplicates in MergedContextConfiguration

Closes gh-24532
 2020-12-16 13:09:58 -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
Stephane Nicoll
160b20fa49 Merge branch '2.4.x' 2020-12-15 16:19:59 +01:00
Stephane Nicoll
c6a64c46b6 Merge branch '2.3.x' into 2.4.x 2020-12-15 16:19:40 +01:00
Stephane Nicoll
39751fd692 Merge branch '2.2.x' into 2.3.x 
Closes gh-24513
 2020-12-15 16:17:27 +01:00
Stephane Nicoll
7194210762 Remove reference to java14 in CI scripts 
Closes gh-24472
 2020-12-15 16:16:02 +01: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
Stephane Nicoll
bf1619e84e Merge pull request #24477 from izeye 
* pr/24477:
  Use BindResult.orElseGet() where beneficial

Closes gh-24477
 2020-12-15 11:29:52 +01:00
izeye
8e69a821d5 Use BindResult.orElseGet() where beneficial 
See gh-24477
 2020-12-15 11:26:15 +01:00
Stephane Nicoll
2cabbed1b9 Merge pull request #24114 from vpelikh 
* pr/24114:
  Polish "Add Apache Phoenix to supported database drivers"
  Add Apache Phoenix to supported database drivers

Closes gh-24114
 2020-12-15 11:16:16 +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
eb14f067ad Merge pull request #24076 from topikachu 
* pr/24076:
  Polish "Add configuration for Rabbit's key store and trust store algorithm"
  Add configuration for Rabbit's key store and trust store algorithm

Closes gh-24076
 2020-12-15 11:01:37 +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
Phillip Webb
315067b379 Merge branch '2.4.x' 
Closes gh-24505
 2020-12-14 20:40:35 -08:00
Phillip Webb
d1f2aab1e8 Fix non-optional classpath location checking 
Allow directory locations that exist but do not contribute properties
to be specified without an `optional:` prefix. This commit fixes logic
introduced in commit 3dc03ac275 which didn't account for the fact that
a directory might contain only profile specific property files and that
profiles might not always be active.

Closes gh-24499
 2020-12-14 20:32:13 -08:00
Madhura Bhave
edf67e541c Merge branch '2.4.x' 
Closes gh-24502
 2020-12-14 12:16:09 -08:00
Madhura Bhave
923ddd3479 Update latest GA param for SDKMAN 
See gh-24501
 2020-12-14 12:11:57 -08:00
Madhura Bhave
5d163ba906 Merge branch '2.3.x' into 2.4.x 
Closes gh-24501
 2020-12-14 12:11:11 -08:00