Commit Graph

28454 Commits

Author SHA1 Message Date
Stephane Nicoll
8bcae12ffc Merge branch '2.3.x'
Closes gh-23140
2020-08-31 09:40:42 +02:00
Stephane Nicoll
008eee42a1 Add a note about using graceful shutdown from an IDE
Closes gh-22959
2020-08-31 09:38:21 +02:00
Phillip Webb
0ddd1b6ce8 Refine global optional config data opt-out
Rename the opt-out property and use an enum in case we want to provide
additional options in the future.

Closes gh-23097
2020-08-28 16:30:39 -07:00
Phillip Webb
bebb4363d6 Merge branch '2.3.x' 2020-08-28 15:31:09 -07:00
Phillip Webb
98f432681f Merge branch '2.2.x' into 2.3.x 2020-08-28 15:30:57 -07:00
Phillip Webb
611447c4d5 Fix checkstyle issue caused by polish commit
See gh-22946
2020-08-28 15:30:27 -07:00
Phillip Webb
21897a7097 Merge branch '2.3.x'
Closes gh-23136
2020-08-28 15:23:26 -07:00
Phillip Webb
84f281fbfd Merge branch '2.2.x' into 2.3.x
Closes gh-23135
2020-08-28 15:23:10 -07:00
Phillip Webb
38db582af1 Merge pull request #22946 from rgoers
* pr/22946:
  Polish 'Remove ResourceUtils.getURL logging config check'
  Remove ResourceUtils.getURL logging config check

Closes gh-22946
2020-08-28 15:19:43 -07:00
Phillip Webb
35994b061c Polish 'Remove ResourceUtils.getURL logging config check'
Extend `initializeSystem` to search the exception stack for a
FileNotFoundException before reporting the error. This allows
us to provide a similar stack trace to the one that used to be
thrown when we had the `ResourceUtils.getURL` check.

See gh-22946
2020-08-28 15:16:12 -07:00
Ralph Goers
684b65e80c Remove ResourceUtils.getURL logging config check
Remove `ResourceUtils.getURL` checking from `LoggingApplicationListener`
so that logging systems can implement custom location support.

Prior to this commit, we checked in the listener if the specified config
location could be opened as a URL. This unfortunately prevents Log4J
extensions such as `log4j-spring-cloud-config-client` from implementing
configurable SSL and credentials support.

See gh-22946
2020-08-28 15:07:06 -07:00
Scott Frederick
b70d0dd5ac Merge branch '2.3.x'
Closes gh-23134
2020-08-28 17:04:57 -05:00
Scott Frederick
bc1834bfdf Ensure layer digest hashes contain 64 characters
This commit ensures that encoded digest hashes for Docker image
layers are zero-padded to the required 64 characters length.

Fixes gh-23132
2020-08-28 17:04:34 -05:00
Scott Frederick
ccabc1a4c9 Merge branch '2.3.x'
Closes gh-23133
2020-08-28 15:18:30 -05:00
Scott Frederick
4f1b4c98ae Fail on Docker image load with empty response
In some cases, a call to the Docker image load API will fail but
return a 200 OK response status code and an empty response. This
commit detects that the response from this call is empty and
treats this condition as an error instead of a silent failure.

Fixes gh-23130
2020-08-28 15:18:02 -05:00
Andy Wilkinson
06a1fdd87e Merge branch '2.3.x' 2020-08-28 16:02:00 +01:00
Andy Wilkinson
6186db735a Merge branch '2.2.x' into 2.3.x 2020-08-28 16:01:53 +01:00
Andy Wilkinson
f6f832b4da Merge branch '2.1.x' into 2.2.x 2020-08-28 16:01:44 +01:00
Andy Wilkinson
1906914711 Upgrade to Gradle Enterprise Maven Extension 1.6.3
Closes gh-23113
2020-08-28 16:01:34 +01:00
Andy Wilkinson
605f9894b4 Merge branch '2.3.x' 2020-08-28 16:00:58 +01:00
Andy Wilkinson
822f821649 Merge branch '2.2.x' into 2.3.x 2020-08-28 16:00:49 +01:00
Andy Wilkinson
e2323fd45c Merge branch '2.1.x' into 2.2.x
Closes gh-23129
2020-08-28 16:00:29 +01:00
Andy Wilkinson
b6569bb075 Upgrade to Gradle Enterprise Maven Extension 1.6.3
Closes gh-23113
2020-08-28 15:59:30 +01:00
Andy Wilkinson
9ee2487a6e Merge branch '2.3.x'
Closes gh-23128
2020-08-28 14:37:20 +01:00
Andy Wilkinson
b58264b16a Merge pull request #23127 from dreis2211
* gh-23127:
  Use DynamicPropertySource in MongoDB tests

Closes gh-23127
2020-08-28 14:37:09 +01:00
dreis2211
51c9dee899 Use DynamicPropertySource in MongoDB tests
See gh-23127
2020-08-28 14:32:01 +01:00
Andy Wilkinson
a462372854 Merge branch '2.3.x' 2020-08-28 12:39:30 +01:00
Andy Wilkinson
3df58b2d8d Merge branch '2.2.x' into 2.3.x 2020-08-28 12:39:19 +01:00
Andy Wilkinson
627ede8bff Remove duplicate jackson-datatype-jsr310 dependency
Closes gh-23123
2020-08-28 12:38:42 +01:00
Andy Wilkinson
2c166d1a58 Merge branch '2.3.x'
Closes gh-23125
2020-08-28 12:29:29 +01:00
Andy Wilkinson
33ef1b6e5b Merge branch '2.2.x' into 2.3.x
Closes gh-23124
2020-08-28 12:29:07 +01:00
Andy Wilkinson
5cd910c7ce Replace Embedded Mongo with Testcontainers' MongoDB support
Closes gh-23090
2020-08-28 12:00:31 +01:00
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