Commit Graph

17131 Commits

Author SHA1 Message Date
Phillip Webb
8ccf7ee489 Make file detection more resilient across restarts
Retain file snapshot state across devtools restarts to help prevent
detection failures.

Closes gh-19543
2020-08-31 13:44:43 -07:00
Stephane Nicoll
cc5f2537b1 Merge branch '2.3.x'
Closes gh-23148
2020-08-31 16:16:16 +02:00
Stephane Nicoll
ee914624e6 Document buildpacks are configured with target Java version
Closes gh-21796
2020-08-31 16:15:30 +02:00
Stephane Nicoll
29b5c4f8cb Merge branch '2.3.x'
Closes gh-23145
2020-08-31 11:34:09 +02:00
Stephane Nicoll
8404c4c71b Document how to perform tasks after application startup
Closes gh-22100
2020-08-31 11:33:27 +02:00
Stephane Nicoll
dee3fad8d0 Merge branch '2.3.x'
Closes gh-23144
2020-08-31 11:19:55 +02:00
Stephane Nicoll
e74e53fdaf Clarify how to take full control of ElasticSearch's rest client
Closes gh-23074
2020-08-31 11:19:36 +02:00
Stephane Nicoll
e0b41f8192 Merge branch '2.3.x'
Closes gh-23143
2020-08-31 10:53:10 +02:00
Stephane Nicoll
b80314b44b Document how to customize the jmxPort for Maven integration tests
Closes gh-22401
2020-08-31 10:52:47 +02:00
Stephane Nicoll
1fea6914bc Merge branch '2.3.x'
Closes gh-23142
2020-08-31 09:59:40 +02:00
Stephane Nicoll
62dbd90d46 Document how to add auto-configurations to a test slice
Closes gh-22531
2020-08-31 09:58:56 +02:00
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
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
9ee2487a6e Merge branch '2.3.x'
Closes gh-23128
2020-08-28 14:37:20 +01:00
dreis2211
51c9dee899 Use DynamicPropertySource in MongoDB tests
See gh-23127
2020-08-28 14:32:01 +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
84a12c8436 Upgrade to Testcontainers 1.14.3
Closes gh-23122
2020-08-28 11:57:32 +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
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
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
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