Commit Graph

11687 Commits

Author SHA1 Message Date
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 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 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 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 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 f568aa489c Fixup title anchors 2020-12-18 15:06:11 -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 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 e083be7de1 Fix ConfigDataEnvironmentPostProcessorIntegrationTests in Windows 2020-12-18 15:26:03 +00: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 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 4822516fb7 Merge branch '2.3.x' into 2.4.x 2020-12-16 15:33:58 -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 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 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 d6890e39a7 Merge branch '2.3.x' into 2.4.x
Closes gh-24536
2020-12-16 13:10:35 -08: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 5fdb2ae2fd Protect PluginApplicationActions against absent plugin classes
Closes gh-24526
2020-12-16 09:51:25 +00: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 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 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 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 251e8b2640 Update instruction to add the configuration processor with Maven
Closes gh-24498
2020-12-15 14:48:19 +01:00
izeye 8e69a821d5 Use BindResult.orElseGet() where beneficial
See gh-24477
2020-12-15 11:26:15 +01: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
Stephane Nicoll 96510156ae Merge branch '2.3.x' into 2.4.x
Closes gh-24495
2020-12-14 16:19:50 +01:00
Stephane Nicoll 26e7e61919 Merge branch '2.2.x' into 2.3.x
Closes gh-24494
2020-12-14 16:19:23 +01:00
Stephane Nicoll 60f526add0 Remove links to Jetty API and documentation
This commit removes links to Jetty API and documentation as those links
are breaking every time the Jetty team releases a new version

See https://github.com/eclipse/jetty.project/issues/4546

Closes gh-24493
2020-12-14 16:17:25 +01:00
Stephane Nicoll 08b692581a Prepare 2.4.x branch 2020-12-14 14:22:07 +01:00
Phillip Webb 72d36e0c07 Update copyright year of changed files 2020-12-10 10:46:04 -08:00
Phillip Webb 14816a6b6c Support @Name meta-annotations with Kotlin binding
Update `ValueObjectBinder` Kotlin support to meta-annotations of
`@Named`.

See gh-24379
2020-12-10 10:44:15 -08:00
Andy Wilkinson 32e1289bbc Use unique names for wildcard property sources
Update `StandardConfigDataLoader` to use unique names for property
sources imported from a wildcard location.

Prior to this commit, all the property sources created from the same
wildcard location would have the same name. Each time a property source
that is equal to an existing property source is added, it replaces the
existing property source. Property source equality is name-based so this
resulted in the last property sources from the wildcard location
winning.

This commit updates `StandardConfigDataLoader` to use the resolved
Resource rather than the wildcard location in which it was discovered
in the name of the property source that it creates, ensuring that each
is property source from a wildcard location is uniquely named.

Fixes gh-24428
2020-12-10 10:43:34 -08:00
Stephane Nicoll 0533ac58fb Test the Gradle plugin against 6.7.1
Closes gh-24449
2020-12-10 15:33:37 +01:00