Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
33,172 Commits 23 Branches 0 Tags
d16ecab24b4087c83559bd8144143be94de918bb
Commit Graph

33172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
b9a50f2440 Merge branch '2.3.x' 2020-08-28 11:59:35 +01:00
Andy Wilkinson
242a23328a Merge branch '2.2.x' into 2.3.x 2020-08-28 11:59:24 +01:00
Andy Wilkinson
84a12c8436 Upgrade to Testcontainers 1.14.3 
Closes gh-23122
 2020-08-28 11:57:32 +01:00
Andy Wilkinson
8ce2058dc7 Merge pull request #22943 from chali 
* gh-22943:
  Polish "Mark bootArchives configuration as unresolvable"
  Mark bootArchives configuration as unresolvable

Closes gh-22943
 2020-08-28 10:05:58 +01:00
Andy Wilkinson
9dc5b88949 Polish "Mark bootArchives configuration as unresolvable" 
See gh-22943
 2020-08-28 10:05:45 +01:00
Martin Chalupa
796307a78c Mark bootArchives configuration as unresolvable 
See gh-22943
 2020-08-28 10:05:44 +01:00
Phillip Webb
cf8776b83c Expose originParents on actuator endpoints 
Update `ConfigurationPropertiesReportEndpoint` and `EnvironmentEndpoint`
so that they expose `originParents` when they are available.

Closes gh-23018
 2020-08-27 22:15:51 -07:00
Phillip Webb
3c1e141aef Add parent origin support to config data 
Allow `ConfigDataLocationResolvers` to access `Origin` information for
locations so that they can be used as a parent origin of loaded items.

The `ResourceConfigData...` classes have been reworked so that loaded
`PropertySources` include the parent origin.

See gh-23018
 2020-08-27 22:15:51 -07:00
Phillip Webb
960651c15a Add parent origin support 
Update the `Origin` interface to include a default `getParent()` method
which can be used to get the parent origin. The `TextResourceOrigin`
has been updated to implement the method against the source `Resource`.
A new `OriginTrackedResource` implementation allows any `Resource` to
be decorated and carry an optional `Origin`.

Ultimately this will allow us to include parent `Origin` information
on properties loaded via a `PropertySourceLoader` without needing any
changes to that interface.

See gh-23018
 2020-08-27 22:05:04 -07:00
Phillip Webb
bc5958c398 Polish test method names 
Polish method names to remove "should".
 2020-08-27 21:28:16 -07:00
Phillip Webb
c613d119f7 Support binding with multiple constructors 
Update `DefaultBindConstructorProvider` so that binding to objects with
multiple constructors is allowed, as long as there is only one
non-public candidate.

Closes gh-23117
 2020-08-27 21:28:16 -07:00
Stephane Nicoll
cf9e85ca53 Merge pull request #23091 from 01045972746 
* pr/23091:
  Polish "Add support for RabbitMQ's addressShuffleMode property"
  Add support for RabbitMQ's addressShuffleMode property

Closes gh-23091
 2020-08-27 14:38:30 +02:00
Stephane Nicoll
674ad85cdb Polish "Add support for RabbitMQ's addressShuffleMode property" 
See gh-23091
 2020-08-27 14:37:11 +02:00
Jonghan Kim
4b77e2e205 Add support for RabbitMQ's addressShuffleMode property 
See gh-23091
 2020-08-27 14:26:46 +02:00
Stephane Nicoll
3748b234ed Upgrade Java 15 version in CI image 
Closes gh-23099
 2020-08-27 11:59:38 +02:00
Stephane Nicoll
c735d2f712 Upgrade Ubuntu version in CI images 
Closes gh-23101
 2020-08-27 11:58:49 +02:00
Stephane Nicoll
adbd7f3366 Merge branch '2.3.x' 2020-08-27 11:57:49 +02:00
Stephane Nicoll
9814a30b51 Upgrade Ubuntu version in CI images 
Closes gh-23100
 2020-08-27 11:57:16 +02:00
Stephane Nicoll
83d96cece8 Merge branch '2.2.x' into 2.3.x 2020-08-27 11:56:11 +02:00
Stephane Nicoll
0032ab6afe Upgrade Ubuntu version in CI images 
Closes gh-23103
 2020-08-27 11:55:37 +02:00
Stephane Nicoll
fda8990fe9 Merge branch '2.1.x' into 2.2.x 2020-08-27 11:54:24 +02:00
Stephane Nicoll
1ae120f8c5 Upgrade Ubuntu version in CI images 
Closes gh-23102
 2020-08-27 11:52:53 +02:00
Phillip Webb
a2530ad5f1 Fix global optional config data opt-out test 
See gh-23097
 2020-08-26 21:06:21 -07:00
Phillip Webb
aa0f204732 Add global optional config data opt-out 
Support a `spring.config.all-locations-optional` property which can be
set to `true` if all config data locations should be considered
optional.

Closes gh-23097
 2020-08-26 20:11:40 -07:00
Phillip Webb
c1be5cb5e0 Add limited support for spring.profiles.include 
Restore support for the `spring.profiles.include` property but only
for non-profile specific documents.

Closes gh-22944
 2020-08-26 15:43:28 -07:00
Andy Wilkinson
6cfd2e3a33 Merge branch '2.3.x' 
Closes gh-23095
 2020-08-26 14:49:37 +01:00
Andy Wilkinson
c74e0be0d2 Merge branch '2.2.x' into 2.3.x 
Closes gh-23094
 2020-08-26 14:49:12 +01:00
Andy Wilkinson
04540887af Widen timeout and delay to accommodate Windows' imprecision under load 
Closes gh-23093
 2020-08-26 14:48:33 +01:00
Stephane Nicoll
e0ccf54727 Merge pull request #23081 from izeye 
* pr/23081:
  Polish

Closes gh-23081
 2020-08-26 10:48:09 +02:00
Johnny Lim
e48af31ced Polish 
See gh-23081
 2020-08-26 10:47:45 +02:00
Andy Wilkinson
4320b3a919 Merge branch '2.3.x' 
Closes gh-23089
 2020-08-26 09:04:09 +01:00
Andy Wilkinson
4143c31f9c Merge branch '2.2.x' into 2.3.x 
Closes gh-23087
 2020-08-26 09:03:46 +01:00
Stephane Nicoll
28b938a229 Merge branch '2.3.x' 
Closes gh-23088
 2020-08-26 10:00:24 +02:00
Stephane Nicoll
f42da16136 Merge pull request #23086 from dreis2211 
* pr/23086:
  Remove unused methods

Closes gh-23086
 2020-08-26 10:00:15 +02:00
dreis2211
d8ba7dd4d0 Remove unused methods 
See gh-23086
 2020-08-26 09:57:49 +02:00
Andy Wilkinson
eba2bc3c0c Merge pull request #23084 from spencergibb 
* gh-23084:
  Polish "Handle null RSocketServer address when setting port property"
  Handle null RSocketServer address when setting port property

Closes gh-23084
 2020-08-26 08:53:05 +01:00
Andy Wilkinson
6f047c8356 Polish "Handle null RSocketServer address when setting port property" 
See gh-23084
 2020-08-26 08:52:57 +01:00
spencergibb
f08f948c3e Handle null RSocketServer address when setting port property 
See gh-23084
 2020-08-26 08:52:57 +01:00
Phillip Webb
d0fce0553f Support extensionless file imports 
Update `ResourceConfigDataLocationResolver` so that it can import files
that have no file extension.

Closes gh-22280
 2020-08-25 13:57:10 -07:00
Phillip Webb
081a7ee28c Throw exception if import locations are not found 
Update config data processing code so that import locations are
mandatory by default. Any import request will now throw a
`ConfigDataLocationNotFoundException` if the specified import
location cannot be found. For optional imports, the user can
use the `optional:` prefix to indicate that the application should
continue to start, even if the location does not exist.

Closes gh-23032
 2020-08-25 12:56:55 -07:00
Andy Wilkinson
19558ecda7 Merge branch '2.3.x' 2020-08-25 16:51:17 +01:00
Andy Wilkinson
d133f228e2 Increase wait times in DevToolsIntegrationTests 
See gh-22909
 2020-08-25 16:50:56 +01:00
Andy Wilkinson
cf0036992f Increase timeouts used in Cassandra integration tests 
Closes gh-23083
 2020-08-25 16:33:26 +01:00
Andy Wilkinson
1b8bfaa1fb Merge pull request #23048 from s50600822 
* gh-23048:
  Polish "Add a configuration property for KLC's idleBetweenPolls"
  Add a configuration property for KLC's idleBetweenPolls

Closes gh-23048
 2020-08-25 16:15:11 +01:00
Andy Wilkinson
e9ab269b3b Polish "Add a configuration property for KLC's idleBetweenPolls" 
See gh-23048
 2020-08-25 16:02:29 +01:00
hoaphan
03a8937d5c Add a configuration property for KLC's idleBetweenPolls 
See gh-23048
 2020-08-25 15:54:59 +01:00
Andy Wilkinson
56ded38f5d Generate default values from Duration and Period .ZERO 
Closes gh-23082
 2020-08-25 15:46:50 +01:00
Stephane Nicoll
085091dbe3 Adapt auto-configurations to back-off in presence of TransactionManager 
Previous to this commit, an auto-configuration would create a
PlatformTransactionManager if none is present and others conditions are
met. Spring Framework now has the notion of TransactionManager, a parent
interface that gathers both PlatformTransactionManager and
ReactiveTransactionManager.

Spring Boot should not be in a situation where both managers are defined
out-of-the-box. This commit makes sure to back-off if any
TransactionManager is available.

Closes gh-22851
 2020-08-25 15:32:38 +02:00
Stephane Nicoll
f191b7513d Polish 2020-08-25 15:13:56 +02:00
Stephane Nicoll
598b7a9137 Merge branch '2.3.x' 
Closes gh-23078
 2020-08-25 14:06:46 +02:00