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

11680 Commits

Author SHA1 Message Date
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
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
Stephane Nicoll f9e44cd774 Merge branch '2.4.x' 
Closes gh-24496
 2020-12-14 16:20:11 +01: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
izeye 0eae6b4f72 Polish 
See gh-24418
 2020-12-10 13:53:06 +01:00
Stephane Nicoll 105cf591bf Merge branch '2.3.x' 
See gh-24418
 2020-12-10 13:52:49 +01:00
Stephane Nicoll ab99de4349 Polish 
See gh-24418
 2020-12-10 13:52:11 +01:00
Stephane Nicoll 6b858f3b84 Upgrade to Tomcat 9.0.41 
Closes gh-24447
 2020-12-10 09:30:36 +01:00
Stephane Nicoll dec085fa3c Upgrade to SQLite JDBC 3.32.3.3 
Closes gh-24446
 2020-12-10 09:30:35 +01:00
Stephane Nicoll 9091161cf9 Upgrade to Netty tcNative 2.0.35.Final 
Closes gh-24445
 2020-12-10 09:30:33 +01:00
Stephane Nicoll 9d5ea3da29 Upgrade to Netty 4.1.55.Final 
Closes gh-24444
 2020-12-10 09:30:32 +01:00