Commit Graph

11013 Commits

Author SHA1 Message Date
Stephane Nicoll c5532cfac0 Upgrade to Spring Security 5.2.6.RELEASE
Closes gh-23299
2020-09-14 13:38:05 +02:00
Stephane Nicoll 4da461cf85 Upgrade to Spring Amqp 2.2.10.RELEASE
Closes gh-23298
2020-09-14 13:38:05 +02:00
Stephane Nicoll 1862eb4455 Upgrade to Postgresql 42.2.16
Closes gh-23297
2020-09-14 13:38:05 +02:00
Stephane Nicoll 0edd00c9d7 Upgrade to Neo4j Ogm 3.2.15
Closes gh-23296
2020-09-14 13:38:05 +02:00
Stephane Nicoll de38777397 Upgrade to Infinispan 9.4.20.Final
Closes gh-23295
2020-09-14 13:38:04 +02:00
Stephane Nicoll bf02b86f60 Upgrade to Hibernate 5.4.21.Final
Closes gh-23294
2020-09-14 13:38:04 +02:00
Stephane Nicoll 12d0835da0 Upgrade to Elasticsearch 6.8.12
Closes gh-23293
2020-09-14 13:38:04 +02:00
Stephane Nicoll 53ba03bdec Upgrade to Jetty 9.4.31.v20200723
Closes gh-23292
2020-09-14 13:38:04 +02:00
Stephane Nicoll 4125e5fc8f Upgrade to Byte Buddy 1.10.14
Closes gh-23291
2020-09-14 13:38:04 +02:00
Stephane Nicoll 0d12683a93 Upgrade to Undertow 2.0.31.Final
Closes gh-23290
2020-09-14 13:38:04 +02:00
Stephane Nicoll 67f3c3193d Upgrade to Rsocket 1.0.2
Closes gh-23289
2020-09-14 13:38:03 +02:00
Stephane Nicoll 1a676b154e Upgrade to Netty Tcnative 2.0.34.Final
Closes gh-23288
2020-09-14 13:38:03 +02:00
Stephane Nicoll f4a84d3b63 Upgrade to Netty 4.1.52.Final
Closes gh-23287
2020-09-14 13:37:57 +02:00
Stephane Nicoll a9f1441fcc Upgrade to Micrometer 1.3.12
Closes gh-23286
2020-09-14 13:12:09 +02:00
Stephane Nicoll 87fdccf4a0 Upgrade to Dropwizard Metrics 4.1.12.1
Closes gh-23285
2020-09-14 13:12:07 +02:00
Stephane Nicoll da9505cf01 Upgrade to Hazelcast 3.12.9
Closes gh-23284
2020-09-14 13:12:05 +02:00
Stephane Nicoll 5ce3aaefb2 Upgrade to Appengine Sdk 1.9.82
Closes gh-23283
2020-09-14 13:12:03 +02:00
Stephane Nicoll 492e1a4c0f Upgrade to Netty 4.1.52.Final
Closes gh-23269
2020-09-14 11:28:55 +02:00
Stephane Nicoll 3bd4337a4e Upgrade to Spring Security 5.1.12.RELEASE
Closes gh-23278
2020-09-14 10:41:44 +02:00
Stephane Nicoll 72a5b2353d Upgrade to Postgresql 42.2.16
Closes gh-23277
2020-09-14 10:41:43 +02:00
Stephane Nicoll 5c3947c64b Upgrade to Neo4j Ogm 3.1.21
Closes gh-23276
2020-09-14 10:41:40 +02:00
Stephane Nicoll c723b4e705 Upgrade to Infinispan 9.4.20.Final
Closes gh-23275
2020-09-14 10:41:25 +02:00
Stephane Nicoll 738613b889 Upgrade to Hibernate 5.3.18.Final
Closes gh-23274
2020-09-14 10:41:25 +02:00
Stephane Nicoll c608f4425d Upgrade to Jetty 9.4.31.v20200723
Closes gh-23273
2020-09-14 10:41:25 +02:00
Stephane Nicoll 9f0befbcb8 Upgrade to Undertow 2.0.31.Final
Closes gh-23272
2020-09-14 10:41:25 +02:00
Stephane Nicoll 78c1e105ee Upgrade to Dependency Management Plugin 1.0.10.RELEASE
Closes gh-23271
2020-09-14 10:41:24 +02:00
Stephane Nicoll 6d99776d9d Upgrade to Netty Tcnative 2.0.34.Final
Closes gh-23270
2020-09-14 10:41:20 +02:00
Stephane Nicoll e5a9a7ae83 Upgrade to Micrometer 1.1.17
Closes gh-23268
2020-09-14 09:47:49 +02:00
Stephane Nicoll fb935ecb8d Upgrade to Appengine Sdk 1.9.82
Closes gh-23267
2020-09-14 09:47:48 +02:00
Stephane Nicoll 76fd9a530c Upgrade to Jackson 2.9.10.20200824
Closes gh-23266
2020-09-14 09:47:47 +02:00
Phillip Webb 3a8c15af0d Merge branch '2.3.x'
Closes gh-23265
2020-09-13 22:50:28 -07:00
Phillip Webb 45275e6586 Merge branch '2.2.x' into 2.3.x
Closes gh-23264
2020-09-13 22:49:21 -07:00
Phillip Webb a20fdf8e6a Merge branch '2.1.x' into 2.2.x
Closes gh-23263
2020-09-13 22:45:39 -07:00
Phillip Webb 895ff9c72d Merge pull request #19041 from mathieufortin01
* pr/19041:
  Polish 'Fix signed jar performance issues'
  Fix signed jar performance issues
  Ignore Visual Studio Code Files

Closes gh-19041
2020-09-13 22:40:05 -07:00
Phillip Webb c6a9696dd1 Polish 'Fix signed jar performance issues'
Update the performance improvements to push certificate loading
and storage into the `JarFileEntries` class. This allows us to
keep certificates without needing to cache all entry data. We
now also keep certificates and code signers in a dedicated class
which is set whenever the full jar stream as been read, even if
the contained values are `null`. The logic that assumes META-INF
entries are not signed has been removed in favor of delegating to
the streamed entry results.

See gh-19041
2020-09-13 22:28:45 -07:00
mathieufortin01 4d053e15d8 Fix signed jar performance issues
Update Spring Boot nested JarFile support to improve the performance of
signed jars. Prior to this commit, `certificates` and `codeSigners`
were read by streaming the entire jar whenever the existing values
were `null`. Unfortunately, the contract for `getCertificates` and
get `getCodeSigners` states that `null` is a valid return value. This
meant that full jar streaming would occur whenever either method was
called on an entry that had no result. The problem was further
exacerbated by the fact that entries might not be cached.

See gh-19041
2020-09-13 22:14:03 -07:00
Phillip Webb a95dbb5d8f Merge branch '2.3.x'
Closes gh-23261
2020-09-13 11:02:54 -07:00
Phillip Webb 5294c34807 Merge branch '2.2.x' into 2.3.x
Closes gh-23260
2020-09-13 11:02:19 -07:00
Phillip Webb 326a56da01 Support validation of bound map key entries
Update `ValidationBindHandler` so that pushed fields that reference
map keys can be used. This fixes a regression that was introduced in
commit 4483f417 when we switched to a `AbstractBindingResult` that no
longer required public getters/setters.

Closes gh-20350
2020-09-13 10:54:30 -07:00
Phillip Webb 922b4c04bf Merge branch '2.3.x' 2020-09-11 19:01:44 -07:00
Phillip Webb f5ae58e8e5 Fix deprecation warning
See gh-23256
2020-09-11 19:01:22 -07:00
Phillip Webb f1d9832282 Merge branch '2.3.x'
Closes gh-23259
2020-09-11 18:45:39 -07:00
Phillip Webb 507fae5141 Merge branch '2.2.x' into 2.3.x
Closes gh-23258
2020-09-11 18:45:05 -07:00
Phillip Webb d8232b3c21 Polish 'Allow other "timestamp" types in MVC error model'
See gh-23256
2020-09-11 18:44:04 -07:00
lock14 d1d953819a Allow other "timestamp" types in MVC error model
Remove casting "timestamp" to `java.util.Date` in
`ErrorMvcAutoConfiguration` as the cast is not necessary and it
prevents other types (e.g. `java.time`) from being used.

See gh-23256
2020-09-11 18:11:47 -07:00
Stephane Nicoll f03ed3b2a7 Publish single page doc to /htmlsingle consistently
Closes gh-21585
2020-09-11 16:05:57 +02:00
Stephane Nicoll 7a8b7b9fa7 Polish "Add separate property for Redis read and connection timeout"
See gh-23137
2020-09-11 11:46:27 +02:00
anshlykov 2527fcac9c Add separate property for Redis read and connection timeout
See gh-23137
2020-09-11 11:46:27 +02:00
Brian Clozel 20eb8d0fc2 Merge branch '2.3.x'
Closes gh-23253
2020-09-11 11:45:23 +02:00
Brian Clozel 62cb87bd95 Merge branch '2.2.x' into 2.3.x
Closes gh-23252
2020-09-11 11:42:32 +02:00
David Good 775f0fa861 Improve sanitization for list of URI types
Prior to this commit, Actuator would sanitize properties values when
serializing them on the dedicated endpoint. Keys like "password" or
"secret" are entirely sanitized, but other keys like "uri" or "address"
are considered as URI types and only the password part of the user info
is sanitized.

This commit fixes the sanitization process where lists of such URI types
would not match the first entries of the list since they're starting
with `'['`. This commit improves the regexp matching process to sanitize
all URIs within a collection.

The documentation is also updated to better underline the processing
difference between complete sanitization and selective sanitization for
URIs.

Fixes gh-23037
2020-09-11 11:34:38 +02:00
Stephane Nicoll 36d4e95254 Merge branch '2.3.x'
Closes gh-23251
2020-09-11 10:03:42 +02:00
Stephane Nicoll 7c13c01cb6 Fix mapping of Cassandra's idle-timeout and heartbeat-interval
Previous to this commit the connection idle timeout and heartbeat
interval were mapped to seconds whereas Cassandra expects ms for all
duration types.

This commit fixes the mapping and removes the default duration unit
since it should be considered ms like every other duration properties.

Closes gh-23249
2020-09-11 08:59:34 +02:00
Andy Wilkinson 143d19754b Exclude starter jars when running and packaging with Gradle
This commit updates the Gradle Plugin to filter dependencies based on
the Spring-Boot-Jar-Type entry in their manifest. Jars with a
Spring-Boot-Jar-Type of dependencies-starter are excluded. Unlike the
Maven plugin, jars with a type of annotation-processor are not
excluded. It is not necessary with Gradle as use of the
annotationProcessor configuration for such dependencies already ensures
that they are not included.

See gh-22036
2020-09-10 14:43:41 +01:00
Andy Wilkinson e743d5fe66 Exclude by jar type when running and packaging with Maven
This commit updates the Maven Plugin to filter dependencies based on
the Spring-Boot-Jar-Type entry in their manifest. Jars with a
Spring-Boot-Jar-Type of dependencies-starter or annotation-processor
are excluded.

See gh-22036
2020-09-10 14:38:19 +01:00
dreis2211 be56cac2bb Note starters' and annotation processors' jar type in their manifest
See gh-22203
2020-09-10 14:37:06 +01:00
Brian Clozel 0715750eb3 Polish "Add SSL support to RSocketServer"
See gh-19399
2020-09-10 15:14:55 +02:00
cbono b4810b8b91 Add SSL support to RSocketServer
See gh-19399
2020-09-10 15:14:55 +02:00
Andy Wilkinson dd024048e9 Merge branch '2.3.x'
Closes gh-23244
2020-09-10 11:18:31 +01:00
Andy Wilkinson aab4ee9aa2 Merge branch '2.2.x' into 2.3.x
Closes gh-23243
2020-09-10 11:15:03 +01:00
Andy Wilkinson e4691a4c61 Document that sliced tests don't scan @ConfigurationProperties beans
Closes gh-23210
2020-09-10 11:14:28 +01:00
Andy Wilkinson 8daf57fdeb Upgrade to Spring Security 5.4.0
The commit also includes an upgrade to Nimbus JOSE JWT 9.0. Spring
Security requires 9.0 and it is not backwards compatible with 8.19.

Closes gh-23225
Closes gh-23242
2020-09-10 11:00:54 +01:00
Andy Wilkinson 6619dfacf3 Merge branch '2.3.x'
Closes gh-23241
2020-09-10 10:03:09 +01:00
Andy Wilkinson e7e77a917f Align PropertiesLauncher's close behavior with JarLauncher
Previously, PropertiesLauncher would close each archive that it
iterated over when creating its ClassLoader. This was not aligned
with JarLauncher's behaviour and left the ClassLoader with closed
archives. The close was introduced in [1] and became more apparent
following the change to fail operations on closed archives [2].

This commit updates Launcher to remove the close() that was added in
[1]. This aligns the behavior of PropertiesLauncher with JarLauncher
and ensures that the ClassLoader does not have entries backed by
closed archives on its classpath.

Fixes gh-23165

[1] ad72f86bdb
[2] ed7a5db174
2020-09-10 09:40:44 +01:00
Phillip Webb f260c77fe3 Add @ImportConfigurationPropertiesBean support
Add repeatable `@ImportConfigurationPropertiesBean` annotation that can
be used to import types and treat them as `@ConfigurationProperties`
beans. This annotation is specifically designed to support third-party
classes that can't contain any Spring annotations.

Closes gh-23172
2020-09-09 22:05:49 -07:00
Brian Clozel d2e67ab84d Align WebClient uri metric tag with RestTemplate
Prior to this commit, the `WebClientExchangeTags`, when given a request
without a string template, would only get the request path to create the
"uri" tag for metrics. This is inconsistent with the
`RestTemplateExchangeTags`, which are taking the full request URI minus
the protocol+host+port.

This commit aligns the `WebClientExchangeTags` behavior in this case.

Closes gh-22832
2020-09-09 13:33:48 +02:00
Andy Wilkinson 9c408babfa Upgrade to Spring Kafka 2.6.0
Closes gh-23012
2020-09-09 09:04:57 +01:00
Phillip Webb df944c6354 Polish 2020-09-08 11:19:33 -07:00
dreis2211 79ec1401a5 Enable Spring Integration RSocket test again
See gh-23229
2020-09-08 16:25:23 +01:00
Brian Clozel 9e0fd01aae Deprecate resource "app-cache" configuration support
This commit deprecates the
`"spring.resources.chain.html-application-cache"` configuration property
and its support, since the feature has been deprecated in Spring
Framework.

The app-cache manifest feature is being removed from browsers in favor
of web workers.

Closes gh-23228
2020-09-08 16:34:25 +02:00
Stephane Nicoll b9b7393053 Deprecate Cassandra health indicators that rely on Spring Data
With the introduction of health indicators that only require the
CqlSession, this commit deprecates the health indicators that require
Spring Data since the latter build on top of the former.

Closes gh-23226
2020-09-08 14:39:37 +02:00
Andy Wilkinson b1a843279a Merge branch '2.3.x'
Closes gh-23224
2020-09-08 11:39:52 +01:00
Andy Wilkinson 3e0096e9b1 Use classpath normalizer on antlib's integration test classpath input
Closes gh-23223
2020-09-08 11:38:31 +01:00
Stephane Nicoll a73b7bb7dd Polish
This commit makes sure that no high-level client is auto-configured if
a low-level client is registered as a bean.

See gh-22358
2020-09-08 12:17:58 +02:00
Andy Wilkinson aa3c93078e Adapt to deprecation of ReactiveDataAccessStrategy
ReactiveDataAccessStrategy has been deprecated in Spring Data R2BC in
favor of R2dbcConverter (and StatementMapper and UpdateMapper). When
not using Boot, an R2dbcConverter bean is now defined by
AbstractR2dbcConfiguration. This commit updates
R2dbcDataAutoConfiguration to replace the definition of a
ReactiveDataAccessStrategy bean with the definition of an
R2dbcConverter bean.

See gh-23197
2020-09-08 10:36:00 +01:00
Brian Clozel 8d27cac43e Polish
See gh-22358
2020-09-08 10:35:50 +02:00
Brian Clozel 1d73d4eda7 Remove Elasticsearch RestClient auto-configuration
Prior to this commit, Spring Boot would auto-configure both
Elasticsearch variants: `RestClient` ("Low Level" client) and
`RestHighLevelClient` ("High Level" client).
Since one can be derived from the other, this would create complex and
unclear situations depending on what developers provided with their
configuration.

`RestHighLevelClient` is mostly for actual use of the Elasticsearch API,
with support for specific methods and (de)serialization. On the other
hand, `RestClient` is merely wrapping the Apache HTTP client for
load-balancing support and low level HTTP features.

This commit completely removes the support for `RestClient` in Spring
Boot and now requires the presence of the
`org.elasticsearch.client:elasticsearch-rest-high-level-client`
dependency for REST client support with Elasticsearch.

Closes gh-22358
2020-09-08 10:17:27 +02:00
Andy Wilkinson 016c46c6b3 Temporarily disable Spring Integration RSocket test
See gh-23214
See gh-23010
2020-09-08 09:00:19 +01:00
Stephane Nicoll 7bf6edf661 Upgrade to OAuth2 OIDC SDK 8.19.1
Closes gh-22951
2020-09-08 09:18:16 +02:00
Spencer Gibb 27136cda44 Fix typo
See gh-23215
2020-09-08 08:36:12 +02:00
Brian Clozel 1152a39caa Polish 2020-09-07 20:34:23 +02:00
Brian Clozel 8dcb3312f2 Switch startup actuator endpoint to using HTTP POST
Closes gh-23213
2020-09-07 20:32:26 +02:00
Brian Clozel 29e8f1d980 Switch to RSocket SNAPSHOTs for 1.1.0-M2 upgrade
See gh-23214
2020-09-07 18:22:30 +02:00
Brian Clozel 676e1809fb Add startup Actuator endpoint
This commit builds on top of gh-22603 and exposes data collected by the
`BufferingApplicationStartup` on a dedicated `"/startup"` Actuator
endpoint.

Closes gh-23213
2020-09-07 18:04:48 +02:00
Brian Clozel 6be4409fde Add mainApplicationClass tag to startup step
This commit adds a new tag to the `"spring.boot.application.starting"`
startup step.

Closes gh-23162
2020-09-07 18:04:42 +02:00
Brian Clozel fdf21da7ba Add buffering ApplicationStartup variant
As of spring-projects/spring-framework#24878, Spring Framework provides
an `ApplicationStartup` infrastructure that applications can use to
collect and track events during the application startup phase.

This commit adds a new `BufferingApplicationStartup` implementation that
buffer `StartupStep`s and tracks their execution time. Once buffered,
these steps can be pushed to an external metrics system or drained
through a web endpoint, to a file...

Closes gh-22603
2020-09-07 18:04:31 +02:00
Stephane Nicoll 268dfceffd Start building against Spring Session 2020.0.0-RC1 snapshots
See gh-23188
2020-09-07 16:40:25 +02:00
Stephane Nicoll 25f7403a2b Start building against Spring Batch 4.3.0-RC1 snapshots
See gh-23189
2020-09-07 16:39:36 +02:00
Stephane Nicoll b633928d2f Start building against Spring Data 2020.0.0-RC1 snapshots
See gh-23197
2020-09-07 16:21:57 +02:00
Stephane Nicoll 52859303fe Start building against Spring Kafka 2.5.6 snapshots
See gh-23199
2020-09-07 15:55:27 +02:00
Stephane Nicoll c909b2b4a0 Start building against Spring Session Dragonfruit-SR1 snapshots
See gh-23187
2020-09-07 15:54:49 +02:00
Stephane Nicoll 72c34c8bfd Start building against Spring Data Neumann-SR4 snapshots
See gh-23196
2020-09-07 15:54:08 +02:00
Stephane Nicoll c352528aa5 Start building against Reactor Dysprosium-SR12 snapshots
See gh-23192
2020-09-07 15:53:27 +02:00
Stephane Nicoll ba7a103588 Start building against Spring Kafka 2.3.11 snapshots
See gh-23198
2020-09-07 15:24:02 +02:00
Stephane Nicoll 3b4f541b44 Start building against Spring Session Corn-SR4 snapshots
See gh-23186
2020-09-07 15:23:21 +02:00
Stephane Nicoll a8c36b7659 Start building against Spring Data Moore-SR10 snapshots
See gh-23195
2020-09-07 15:22:43 +02:00
Stephane Nicoll e3635c4848 Start building against Reactor Dysprosium-SR11 snapshots
See gh-23191
2020-09-07 15:21:51 +02:00
Andy Wilkinson b2cc442539 Merge branch '2.3.x'
See gh-23204
2020-09-07 14:17:11 +01:00
Andy Wilkinson 86fc4dea2a Merge branch '2.2.x' into 2.3.x
See gh-23203
2020-09-07 14:16:37 +01:00
Andy Wilkinson 5f00d91176 Restore identifying org.hsqldb.jdbcDriver as embedded
See gh-23036
2020-09-07 14:03:10 +01:00
Stephane Nicoll b3960cae86 Start building against Spring Data Bean-SR12 snapshots
See gh-23185
2020-09-07 14:38:50 +02:00
Stephane Nicoll d2a6035914 Start building against Spring Data Lovelace-SR20 snapshots
See gh-23194
2020-09-07 14:38:25 +02:00
Stephane Nicoll e35cf5219a Start building against Reactor Californium-SR21 snapshots
See gh-23190
2020-09-07 14:38:18 +02:00
Stephane Nicoll 88e0c280ce Start building against Spring Framework 5.0.19 snapshots
See gh-23181
2020-09-07 14:36:01 +02:00
Andy Wilkinson 9bf6e1ceda Merge branch '2.3.x'
Closes gh-23205
2020-09-07 13:34:47 +01:00
Andy Wilkinson 116b2472a7 Merge branch '2.2.x' into 2.3.x
Closes gh-23200
2020-09-07 13:34:14 +01:00
Andy Wilkinson 115ea87b14 Restore ordering of ErrorPageFilter lost in 49f8943
See gh-19471
2020-09-07 13:33:43 +01:00
Andy Wilkinson 3dfe11e9e3 Merge branch '2.3.x'
Closes gh-23204
2020-09-07 13:30:26 +01:00
Andy Wilkinson d39b107917 Merge branch '2.2.x' into 2.3.x
Closes gh-23203
2020-09-07 13:30:02 +01:00
Stephane Nicoll defa7c47cd Merge branch '2.3.x'
Closes gh-23201
2020-09-07 12:42:48 +02:00
Stephane Nicoll 648789ef84 Document that buildpacks use non-root users
Closes gh-21122
2020-09-07 12:41:51 +02:00
Andy Wilkinson c948c70c5a Align EmbeddedDatabaseConnection with DatabaseDriver
Fixes gh-23036
2020-09-07 10:13:55 +01:00
Stephane Nicoll 73c039e4b8 Fix use of deprecated methods 2020-09-07 09:42:19 +02:00
Stephane Nicoll d2eeb9524f Merge branch '2.2.x' into 2.3.x
See gh-23183
2020-09-07 09:17:51 +02:00
Stephane Nicoll 4b5a3f4ff9 Start building against Spring Framework 5.2.9 snapshots
See gh-23182
2020-09-07 08:47:57 +02:00
Stephane Nicoll 1b68efa478 Polish "Upgrade to Assertj 3.17.2"
See gh-23179
2020-09-07 07:59:50 +02:00
Eddú Meléndez db8d117d38 Upgrade to Assertj 3.17.2
See gh-23179
2020-09-07 07:54:25 +02:00
Brian Clozel f50927f7a1 Start building against Spring Framework 5.3.0.RC1 SNAPSHOTs
See gh-23170
2020-09-02 17:47:06 +02:00
Stephane Nicoll 681abcc185 Polish "Configure SAML 2.0 Service Provider via Metadata"
See gh-23045
2020-09-02 10:31:50 +02:00
Josh Cummings 5187c01e39 Configure SAML 2.0 Service Provider via Metadata
See gh-23045
2020-09-02 10:03:41 +02:00
Dario Seidl 22d03b21df Add reference to AOProfiling Spring Boot starter
See gh-23161
2020-09-02 09:51:02 +02:00
Andy Wilkinson 2c981d99a2 Avoid unnecessary reflection in TaskExecutorBuilder
Closes gh-23107
2020-09-01 12:46:22 +01:00
Stephane Nicoll f8bc656921 Polish "Removed some redundant 'else's using early return"
See gh-22528
2020-09-01 13:35:17 +02:00
Pradipta Sarma 2627bf896e Removed some redundant 'else's using early return
See gh-22528
2020-09-01 13:35:17 +02:00
Andy Wilkinson 72c6435078 Polish
See gh-23157
2020-09-01 12:12:16 +01:00
Stephane Nicoll f4c8668afd Merge branch '2.3.x'
Closes gh-23157
2020-09-01 11:50:40 +02:00
Stephane Nicoll 652561c274 Review checkstyle rule to prevent non BDD mockito imports
Closes gh-20902
2020-09-01 11:50:14 +02:00
Stephane Nicoll 5a86162ff3 Polish "Simplify code"
See gh-23111
2020-09-01 10:06:17 +02:00
EruDev ffc577b499 Simplify code
See gh-23111
2020-09-01 10:04:31 +02:00
Stephane Nicoll ce169c4d51 Allow to customize how EntityScanner scans entities
This commit adds a protected method that lets an override customize the
configuration of the ClassPathScanningCandidateComponentProvider used
to scan entities.

Closes gh-23154
2020-09-01 10:00:41 +02:00
Phillip Webb 446dfe4ad7 Merge branch '2.3.x'
Closes gh-23153
2020-08-31 15:31:49 -07:00
Phillip Webb 0d80f46cef Remove node and recursive limits for YAML
Update `OriginTrackedYamlLoader` to remove node limits and recursive
parsing restrictions. SnakeYAML 1.26 introduced these options in order
to protect against the "billion laugh attacks" but since we consider
`application.yml` files to be trusted, we don't need these restrictions.

Fixes gh-23096
2020-08-31 15:27:37 -07:00
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
Stephane Nicoll 28b938a229 Merge branch '2.3.x'
Closes gh-23088
2020-08-26 10:00:24 +02:00
dreis2211 d8ba7dd4d0 Remove unused methods
See gh-23086
2020-08-26 09:57:49 +02: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 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
Andy Wilkinson b57b2f0b44 Test the Gradle Plugin against 6.5 and 6.6
Closes gh-23075
2020-08-25 12:01:25 +01:00
Andy Wilkinson dbf583bc3c Merge branch '2.3.x' 2020-08-25 10:22:43 +01:00
Andy Wilkinson 0b3a1310bd Align managed version of Nimbus JOSE JWT with Spring Security
Closes gh-22996
2020-08-25 09:53:50 +01:00
Andy Wilkinson 7a5392d6bd Polish 2020-08-25 09:45:40 +01:00
Andy Wilkinson 4fa7b3dc02 Merge branch '2.3.x'
Closes gh-23072
2020-08-25 08:50:19 +01:00
Andy Wilkinson 858e1948dd Polish "Added dependency management for nimbus-jose-jwt"
See gh-22996
2020-08-25 08:49:36 +01:00
Thomas Kåsene 0277dce3da Added dependency management for nimbus-jose-jwt
See gh-22996
2020-08-25 08:49:36 +01:00
Stephane Nicoll 640000c0bb Disable file system preference for Freemarker templates
Previously to this commit, a project that has several classpath
locations matching the template path may lead to some of those
locations to be ignored if one of them is a directory. This can easily
happen if you run your tests in your IDE.

This commit changes the default of "preferFileSystemAccess" to
false so that the complete classpath is always considered.

Closes gh-23051
2020-08-24 18:22:50 +02:00
Andy Wilkinson 0417f949ad Start building against Reactor 2020.0.0-RC1 snapshots
See gh-23065
2020-08-24 15:58:53 +01:00
Stephane Nicoll deee3606c3 Merge branch '2.3.x'
Closes gh-23064
2020-08-24 12:21:12 +02:00
Stephane Nicoll 0374ed2a0c Merge branch '2.2.x' into 2.3.x
Closes gh-23063
2020-08-24 12:20:30 +02:00
Stephane Nicoll 5b0f22e8fe Fix unintended import on commons lang
Closes gh-23059
2020-08-24 12:12:33 +02:00
Stephane Nicoll 65a5994354 Merge branch '2.3.x'
Closes gh-23061
2020-08-24 11:57:42 +02:00
Stephane Nicoll 39dc2e7de4 Merge branch '2.2.x' into 2.3.x
Closes gh-23060
2020-08-24 11:57:22 +02:00
Stephane Nicoll f1455b156a Polish "Add example of custom Actuator operations"
See gh-23028
2020-08-24 11:56:31 +02:00
Ivo Smid e8de069e00 Add example of custom Actuator operations
See gh-23028
2020-08-24 11:37:00 +02:00
dreis2211 33cd875cb8 Simplify InputStream assertions
See gh-23052
2020-08-24 11:35:17 +02:00
Stephane Nicoll 2f7f5f4c8e Polish "Add Hyperledger Fabric for Spring Boot Starter"
See gh-23058
2020-08-24 11:33:02 +02:00
mvanmeerbeck cd6945aad2 Add Hyperledger Fabric for Spring Boot Starter
See gh-23058
2020-08-24 11:30:44 +02:00
Phillip Webb 758df17c7d Allow placeholders to be used in imports
Allow `${..}` property placeholders to be used in `spring.config.import`
properties. Prior to this commit, placeholders were not resolved when
binding the `ConfigDataProperty` instance. Furthermore, binding happened
too early for all placeholders to be resolved correctly. The
`ConfigDataEnvironmentContributor` class now has two states for imported
contributors, `UNBOUND_IMPORT` has the initial unbound state and is
eventually replaced with a `BOUND_IMPORT`.

Closes gh-23020
2020-08-23 20:27:12 -07:00
dreis2211 f7d6f38368 Fix typos in tests
See gh-23050
2020-08-22 11:44:19 -07:00
Phillip Webb d123c924a0 Add BootstrapRegisty support for config data
Expose the `BootstrapRegisty` to both `ConfigDataLocationResolver` and
`ConfigDataLoader` implementations. The registry is exposed via the
context interfaces and may be used to reuse instances that are expensive
to create. It may also be used to ultimately register beans with the
`ApplicationContext`.

Closes gh-22956
2020-08-20 21:49:03 -07:00
Phillip Webb 2260657781 Add BootstrapRegistry for long lived instances
Add a simple `BootstrapRegistry` that can be used to store and share
object instances across `EnvironmentPostProcessors`. The registry
can be injected into the constructor of any `EnvironmentPostProcessor`.

Registrations can also perform additional actions when the
`ApplicationContext` has been prepared. For example, they could register
the the bootstrap instances as beans so that they become available to
the application.

See gh-22956
2020-08-20 21:45:02 -07:00
Phillip Webb 167e31d564 Provide a simple Instantiator utility class
Make `Instantiator` a public utility class so that it can be used
by other parts of the codebase.

Closes gh-23029
2020-08-20 13:02:17 -07:00
Stephane Nicoll f7ef3445a6 Upgrade to Kotlin Coroutines 1.3.9
Closes gh-23025
2020-08-20 11:32:21 +02:00
Stephane Nicoll aed49c0631 Add configuration option for GridFsTemplate's bucket
Closes gh-22854
2020-08-20 10:45:51 +02:00
Scott Frederick ee41d71ea8 Merge branch '2.3.x'
Closes gh-23016
2020-08-19 16:12:44 -05:00
Scott Frederick 56bc0eb9e0 Use canonical path for CNB builder lifecycle binaries
This commit changes the path used to invoke lifecycle binaries in
CNB builders from `/lifecycle` to `/cnb/lifecycle` to conform to
the CNB spec. This will ensure the build plugin image-building
goals and tasks are compatible with future versions of builders
that may not support both paths.

See gh-23009
2020-08-19 16:11:59 -05:00
Phillip Webb c302b72083 Merge branch '2.3.x'
Closes gh-23015
2020-08-19 13:24:10 -07:00
Phillip Webb 8fd9c685a2 Reduce HTTP debug logging when building image
Update `BuildImageMojo` so that commons HTTP wire logging is configured
to ERROR. Without this update, running `mvn -X` will produce a great
deal of logging since by default HTTP Client logs all bytes transfered
at DEBUG and Maven will enable DEBUG for all logs.

Closes gh-22674
2020-08-19 13:20:06 -07:00
Phillip Webb c8d7aa8fbc Upgrade to Spring Kafka 2.6.0-SNAPSHOT
See gh-23012
2020-08-19 10:55:19 -07:00
Phillip Webb 847baba0b1 Upgrade to Spring AMQP 2.3.0-SNAPSHOT
See gh-23011
2020-08-19 10:53:39 -07:00
Phillip Webb 0beb30bb5a Upgrade to Spring Integration 5.4.0-SNAPSHOT
See gh-23010
2020-08-19 10:52:25 -07:00
Phillip Webb ea8bd75ba1 Merge branch '2.3.x' 2020-08-19 10:34:17 -07:00
Phillip Webb 73038267a0 Merge branch '2.2.x' into 2.3.x 2020-08-19 10:34:06 -07:00
Phillip Webb 17e2d72bcb Fix Windows path issue in JarFileWrapperTests
See gh-22991
2020-08-19 10:33:23 -07:00
Phillip Webb bb57c7eacf Merge branch '2.3.x' 2020-08-19 10:26:25 -07:00
Phillip Webb 8722c2c5de Close writer after use in ExtractCommandTests
Update `ExtractCommandTests` so that the writer is closed after the
contents have been written.

See gh-22993
2020-08-19 10:25:37 -07:00
Phillip Webb bd5266b9b1 Merge branch '2.3.x' 2020-08-19 10:22:55 -07:00
Phillip Webb 0dd38a7264 Merge branch '2.2.x' into 2.3.x 2020-08-19 10:22:45 -07:00
Phillip Webb 3fe2005e06 Use @AfterEach to close the source jar file
Update `JarFileWrapperTests` so that the jar files are closed after each
test.

See gh-22991
2020-08-19 10:22:10 -07:00
Stephane Nicoll d04f2583f1 Merge branch '2.3.x'
Closes gh-23005
2020-08-19 10:09:43 +02:00
Stephane Nicoll 9a374f7d67 Merge branch '2.2.x' into 2.3.x
Closes gh-23004
2020-08-19 10:09:22 +02:00
dreis2211 06eb7e9777 Mention correct JUnit 5 annotations in Kotlin testing section
See gh-23002
2020-08-19 10:07:40 +02:00
Phillip Webb 899e8e189b Merge branch '2.3.x'
Closes gh-23001
2020-08-18 16:49:12 -07:00
Phillip Webb f7452b9383 Ensure LayoutFactory is not passed an empty file
Update `Repackager` to ensure that `getLayout` is called before we
backup the source file. This restores earlier behavior that some
custom `ModuleFactory` implementations were relying on.

Closes gh-22995
2020-08-18 16:45:44 -07:00
Phillip Webb cfc053d75e Merge branch '2.3.x' 2020-08-18 16:21:23 -07:00
Phillip Webb c5b12effbf Merge branch '2.2.x' into 2.3.x 2020-08-18 16:21:03 -07:00
Phillip Webb 2a137a2d8a Remove Mockito from JarFileWrapperTests
Remove Mockto from JarFileWrapperTests since it seems to be failing on
later versions of Java.

See gh-22991
2020-08-18 16:20:05 -07:00
Phillip Webb ea8762c484 Update copyright year of changed files 2020-08-18 15:40:05 -07:00
Phillip Webb 2fb08ca48f Merge branch '2.3.x' 2020-08-18 15:39:29 -07:00
Phillip Webb 15a0cbc96b Update copyright year of changed files 2020-08-18 15:39:23 -07:00
Phillip Webb aa2580bb51 Merge branch '2.3.x' 2020-08-18 15:39:08 -07:00
Phillip Webb ba2ab3363b Merge branch '2.2.x' into 2.3.x 2020-08-18 15:38:53 -07:00
Phillip Webb 60b5de192c Merge branch '2.2.x' into 2.3.x 2020-08-18 15:38:11 -07:00
Phillip Webb 4e76138ebc Update copyright year of changed files 2020-08-18 15:37:59 -07:00
Phillip Webb 5997cbd21f Refine AbstractJarFile method visibility
Refine method visibility in an attempt to fix test issues on Java 11+.

See gh-22991
2020-08-18 15:37:37 -07:00
Scott Frederick 341615d7d0 Merge branch '2.3.x'
Closes gh-23000
2020-08-18 17:07:25 -05:00
Scott Frederick 3f80638a36 Fail on layertools extract with launch script
This commit adds a check to the `layertools extract` command to
ensure that the jar file being processed is readable and has a
valid directory.

Fixes gh-22993
2020-08-18 17:06:31 -05:00
Phillip Webb b60820564e Merge branch '2.3.x'
Closes gh-22999
2020-08-18 14:35:59 -07:00
Phillip Webb 2b1b096fac Merge branch '2.2.x' into 2.3.x
Closes gh-22998
2020-08-18 14:35:45 -07:00
Phillip Webb aac367e9c5 Attempt to fix memory leak in JarFile class
Create a new `JarFileWrapper` class so that we can wrap and existing
`JarFile` and offer a version that can be safely closed.

Prior to this commit, we provided wrapper functionality in the `JarFile`
class itself. Unfortunately, because we override `close` and also create
a lot of wrappers this caused memory issues when running on Java 11.

With Java 11 `java.util.zip.ZipFile` class uses `FinalizableResource`
for any implementation that overrides `close()`. This means that any
wrapper classes will not be garbage collected until the JVM finalizer
thread runs.

Closes gh-22991
2020-08-18 14:07:03 -07:00
Stephane Nicoll 0b28236e55 Rename neo4j.version to neo4j-java-driver.version
Closes gh-22952
2020-08-18 11:00:11 +02:00
Phillip Webb 9460d74e8a Rename CompositeMeterRegistryAutoConfiguration
Rename `CompositeMeterRegistryAutoConfiguration` to
`MeterRegistryAutoConfiguration` since it can also create non-composite
registries.

Closes gh-22988
2020-08-17 16:41:10 -07:00
Phillip Webb 12bae2ad52 Merge branch '2.3.x'
Closes gh-22990
2020-08-17 16:18:23 -07:00
Phillip Webb ff36f8bab8 Merge branch '2.2.x' into 2.3.x
Closes gh-22989
2020-08-17 16:17:47 -07:00
Phillip Webb 10da595302 Polish 'Order metrics auto-configurations correctly'
See gh-21134
2020-08-17 16:10:18 -07:00
Martin Benda 02b7ec787e Order metrics auto-configurations correctly
Update metrics auto-configurations so that they are auto-configured
after `CompositeMeterRegistryAutoConfiguration` in order to ensure
the `MeterRegistry` bean has been defined.

Prior to this commit, metrics auto-configurations that depended on a
`MeterRegistry` has `@AutoConfigureAfter(MetricsAutoConfiguration.class)`
which is not sufficient since `MetricsAutoConfiguration` does not export
a `MeterRegistry`.

See gh-21134
2020-08-17 16:03:27 -07:00
Scott Frederick b7fdf8fe87 Preserve user-provided values in MongoClientSettings
Prior to this commit, values from MongoProperties would always
overwrite matching fields in MongoClientSettings. This commit
preserves all values in MongoClientSettings if the client app
provides the MongoClientSettings bean, and only overwrites from
MongoProperties if no MongoClientSettings bean is provided.

Fixes gh-22321
2020-08-17 16:07:40 -05:00
Phillip Webb 9c6f0d8f7e Merge branch '2.3.x'
Closes gh-22984
2020-08-17 12:40:18 -07:00
Scott Frederick c2ec46c5b1 Polish "Fix include exception handling in DefaultErrorAttributes"
See gh-22750
2020-08-17 13:33:59 -05:00
Lopfest c49605cd7b Fix include exception handling in DefaultErrorAttributes
This commit fixes a problem with the handling of the includeException
field in DefaultErrorAttributes.

See gh-22750
2020-08-17 13:33:59 -05:00
Stephane Nicoll f8265e3e44 Merge branch '2.3.x'
Closes gh-22980
2020-08-17 14:20:50 +02:00
Jean-Baptiste Nizet 27528fdd07 Fix custom image name example and documentation
There is no `artifactId` property in a gradle Project, and the default
value uses the project name.

See gh-22918
2020-08-17 13:59:42 +02:00
Stephane Nicoll b1e631e8a6 Remove trailing whitespaces 2020-08-17 13:59:08 +02:00
Stephane Nicoll 8c0318edc7 Polish "Consider RecordFilterStrategy in Kafka auto-configuration"
See gh-22973
2020-08-17 13:54:20 +02:00
anshlykov f68dfde35e Consider RecordFilterStrategy in Kafka auto-configuration
See gh-22973
2020-08-17 13:37:00 +02:00
dreis2211 61838eede1 Fix typos in docs
See gh-22945
2020-08-17 13:27:46 +02:00
Stephane Nicoll 80e9bfb9a6 Merge branch '2.3.x' 2020-08-17 13:26:58 +02:00
Stephane Nicoll 6b679b7d64 Polish
See gh-22945
2020-08-17 13:24:51 +02:00
Phillip Webb 4df618a2b1 Merge branch '2.3.x'
Closes gh-22967
2020-08-14 17:12:53 -07:00
Phillip Webb f75e988450 Merge branch '2.2.x' into 2.3.x
Closes gh-22966
2020-08-14 17:12:41 -07:00
Phillip Webb 3271542d98 Add @Interited to @TypeExcludeFilters
Update `@TypeExcludeFilters` so that it is also annotated with
`@Inherited`.

Closes gh-22939
2020-08-14 17:12:31 -07:00
Phillip Webb 7a85373fea Merge branch '2.3.x'
Closes gh-22965
2020-08-14 17:09:13 -07:00
Phillip Webb 1675b47637 Merge branch '2.2.x' into 2.3.x
Closes gh-22964
2020-08-14 17:08:48 -07:00
Phillip Webb 89a6f83344 Fix and improve SpringApplicationBuilder javadoc
Update SpringApplicationBuilder.properties method javadoc to fix
inaccuracies and apply more consistency.

Closes gh-22962
2020-08-14 17:06:39 -07:00
Phillip Webb 3e939cbabd Polish method order 2020-08-14 17:02:13 -07:00
Phillip Webb 5591a6ab77 Merge branch '2.3.x'
Closes gh-22961
2020-08-14 15:11:47 -07:00
Phillip Webb 03d4b89c06 Merge branch '2.2.x' into 2.3.x
Closes gh-22960
2020-08-14 15:11:23 -07:00
Maciej Walkowiak 15de956566 Fix typo `Assert4J` -> `AssertJ`
See gh-22948
2020-08-14 15:09:56 -07:00
Madhura Bhave bbbbe8e4d2 Make security auto-configs back off when SecurityFilterChain present
Closes gh-22739
2020-08-14 12:24:25 -07:00
Andy Wilkinson c9b8a05321 Merge branch '2.3.x' 2020-08-14 15:41:20 +01:00
Andy Wilkinson 3e35fd480f Wait longer for server port and improve diagnostics on timeout
See gh-22909
2020-08-14 15:34:41 +01:00
Phillip Webb 310ef6e999 Rename volumemount -> configtree
Closes gh-22941
2020-08-13 13:28:25 -07:00
Phillip Webb 5579f9d1c4 Polish 2020-08-13 11:53:36 -07:00
Scott Frederick 2a998a4373 Fix DataNeo4jTestReactiveIntegrationTests
See gh-22940
2020-08-13 13:45:04 -05:00
Stephane Nicoll 045d2f678d Document Spring Data Neo4j 6 support
Closes gh-22652
2020-08-13 17:51:39 +02:00
Stephane Nicoll d4ba55f8d6 Do not configure a ReactiveNeo4jTransactionManager
The current arrangement with Neo4j does not allow us to know for sure
that the user intends to use `@Transactional` for reactive or imperative
operations.

The main reason for that is that the only trigger for the reactive
auto-configuration is the presence of reactor on the classpath given
that the Neo4j driver ships with both styles in the same jar. And
reactor can be on the classpath for a number of reasons that are
unrelated to imperative access (typically `WebClient`).

This commits removes the auto-configuration of the
ReactiveNeo4jAutoConfiguration and makes sure that if the user defines
one, the regular `PlatformTransactionManager` backs off. This is
a temporarily situation until we can provide a better signal that the
user intends to primarily use imperative repositories.

Closes gh-22940
2020-08-13 16:57:51 +02:00
Andy Wilkinson 4398c71d12 Merge branch '2.3.x'
Closes gh-22938
2020-08-13 13:32:27 +01:00
Andy Wilkinson 8c4e6f766c Revert "Merge pull request #21060 from dsyer"
This reverts commit 6547ea56f9, reversing
changes made to e9e4a34e62.

Fixes gh-22039
2020-08-13 13:31:45 +01:00
Andy Wilkinson 1c8392e980 Upgrade to Selenium HtmlUnit 2.43.1
Closes gh-22937
2020-08-13 12:04:42 +01:00
Andy Wilkinson 7310b7dbcd Upgrade to Micrometer 1.5.4
Closes gh-22936
2020-08-13 12:04:40 +01:00
Andy Wilkinson 1c930396b4 Upgrade to Flyway 6.5.4
Closes gh-22935
2020-08-13 12:04:39 +01:00
Stephane Nicoll 2f5145b6a1 Upgrade to Micrometer 1.5.4
Closes gh-22932
2020-08-13 13:04:03 +02:00
Andy Wilkinson a087d706d0 Upgrade to Spring Batch 4.3.0-M2
Closes gh-22892
2020-08-13 12:03:07 +01:00
Stephane Nicoll 42ca62b2e7 Merge branch '2.3.x'
Closes gh-22931
2020-08-13 11:49:03 +02:00
Stephane Nicoll df78105a3c Merge branch '2.2.x' into 2.3.x
Closes gh-22930
2020-08-13 11:48:43 +02:00
Stephane Nicoll f61a632a37 Polish "Fix conditions that lead to auto-configure PushGateway"
See gh-22919
2020-08-13 11:47:43 +02:00
smlc c355b95f6c Fix conditions that lead to auto-configure PushGateway
See gh-22919
2020-08-13 11:41:49 +02:00
Stephane Nicoll 947e484001 Merge branch '2.3.x'
Closes gh-22928
2020-08-13 09:44:26 +02:00
Stephane Nicoll d0662e824a Fix default value of server.jetty.accesslog.format
Closes gh-22921
2020-08-13 09:43:37 +02:00
Scott Frederick 7c7079f91a Merge branch '2.3.x' 2020-08-12 17:44:52 -05:00
Scott Frederick 4c6a722f18 Fix test for Java version in image building docs
See gh-22916
2020-08-12 17:43:37 -05:00
Scott Frederick 092bbd198e Merge branch '2.3.x'
Closes gh-22923
2020-08-12 17:04:54 -05:00
Scott Frederick 005ed8b8db Use Java version wildcard in image building docs
Fixes gh-22916
2020-08-12 17:04:17 -05:00
Scott Frederick 6b15822cb1 Polish "Add pullPolicy option for image building"
See gh-22736
2020-08-12 15:16:38 -05:00
anshlykov c7449b57ce Add pullPolicy option for image building
This commit adds a pullPolicy option to the configuration of the Maven
plugin spring-boot:build-image goal and the Gradle plugin bootBuildImage
task. The new option gives users control over pulling the builder image
and run image from a remote image registry to the local Docker daemon.

See gh-22736
2020-08-12 15:16:38 -05:00
Andy Wilkinson b35cfb7fb7 Upgrade to Spring Integration 5.4.0-M2
Closes gh-22729
2020-08-12 20:17:50 +01:00
Andy Wilkinson c59b48b690 Upgrade to Spring Kafka 2.5.5.RELEASE
Closes gh-22843
2020-08-12 19:19:57 +01:00
Andy Wilkinson ce729b7188 Upgrade to Spring AMQP 2.2.10.RELEASE
Closes gh-22842
2020-08-12 19:19:18 +01:00
Andy Wilkinson 2de48ac6ee Upgrade to Spring Kafka 2.6.0-M1
Closes gh-22730
2020-08-12 19:17:14 +01:00
dreis2211 c00d5c5643 Introduce @ForkedClassPath for testing unmodified class path
See gh-22710
2020-08-12 17:21:31 +01:00
Andy Wilkinson 0158213b3f Upgrade to Spring AMQP 2.3.0-M2
Closes gh-22761
2020-08-12 17:20:33 +01:00
Andy Wilkinson fff9193860 Merge branch '2.3.x'
Closes gh-22917
2020-08-12 17:06:30 +01:00
Andy Wilkinson f43a0b4891 Fix configuration of environment in Kotlin bootBuildImage examples
Fixes gh-22913
2020-08-12 17:06:16 +01:00
Phillip Webb bc3f028a1f Fix spring.config.activate.on-profile metadata
Fix the `spring.config.activate.on-profile` entry which was accidentally
entered as `spring.config.import.on-profile`.

See gh-22497
2020-08-12 07:13:11 -07:00
Stephane Nicoll 5e5c1fb4d0 Upgrade to Spring Data Neumann SR3
Closes gh-22844
2020-08-12 15:42:54 +02:00
Andy Wilkinson 147b048a07 Merge branch '2.3.x'
See gh-22909
2020-08-12 13:24:50 +01:00
Andy Wilkinson 2b1bb2f18f Improve diagnostics when remote application does not start as expected
See gh-22909
2020-08-12 13:24:17 +01:00
Andy Wilkinson 0d8719adb7 Merge branch '2.3.x'
Closes gh-22911
2020-08-12 13:14:33 +01:00
Andy Wilkinson 65ccb514d0 Merge branch '2.2.x' into 2.3.x
Closes gh-22910
2020-08-12 13:14:15 +01:00
Johnny Lim 68e2dd626d Mention configuration customizers for WebTestClient and RestAssured
See gh-22765
2020-08-12 13:13:11 +01:00
Stephane Nicoll 25e08d2dee Restore handling of certain spring.data.neo4j.* properties
This commit switches the deprecation level of several properties in the
spring.data.neo4j namespace from error and warning. The server URI and
basic authentication can be used in a deprecated fashion to configure
the new neo4j driver.

Closes gh-22653
2020-08-12 14:07:44 +02:00
Andy Wilkinson 9a2d2effa5 Merge branch '2.3.x'
Closes gh-22907
2020-08-12 12:24:38 +01:00
Andy Wilkinson 1381929525 Upgrade to Gradle 6.6
Closes gh-22905
2020-08-12 12:24:08 +01:00
Andy Wilkinson 520cfa4638 Merge branch '2.3.x'
Closes gh-22904
2020-08-12 11:40:48 +01:00
Andy Wilkinson 0841eab877 Simplify build.gradle for spring-boot-starter-data-solr
Closes gh-22903
2020-08-12 11:40:21 +01:00
Stephane Nicoll 8409df5540 Upgrade to Spring Data 2020.0.0-M2
Closes gh-22647
2020-08-12 12:15:23 +02:00
Stephane Nicoll 14eb041086 Polish "Add basic auth support for Prometheus pushgateway"
See gh-22548
2020-08-12 10:27:07 +02:00
AndrewDi 9ddc97f815 Add basic auth support for Prometheus pushgateway
See gh-22548
2020-08-12 09:54:08 +02:00
Stephane Nicoll 2c120eb161 Merge branch '2.3.x'
Closes gh-22900
2020-08-12 09:51:44 +02:00
Stephane Nicoll 38baaf31d3 Merge branch '2.2.x' into 2.3.x
Closes gh-22899
2020-08-12 09:51:25 +02:00
Stephane Nicoll ee2363fca7 Polish "Harmonize Discover the HTTP Port at Runtime How-To"
See gh-22898
2020-08-12 09:50:44 +02:00
John Franco 303768b2b5 Harmonize Discover the HTTP Port at Runtime How-To
See gh-22898
2020-08-12 09:48:57 +02:00
Phillip Webb 7838c7b072 Polish 'Support ConfigurationClassPostProcessor supplier'
See gh-22858
2020-08-11 12:31:02 -07:00
Dave Syer 06eff45a71 Support ConfigurationClassPostProcessor supplier
Update `SharedMetadataReaderFactoryContextInitializer` to optionally
support a `ConfigurationClassPostProcessor` provided via an instance
`Supplier`.

If the instance supplier is available then we can use that to set the
`MetadataReaderFactory` non-reflectively, instead of using a
`PropertyValue` (and the `BeanWrapper` eventually).

The previous behavior is left as a  fallback and without a change in
Spring Framework will continue to be the default for most applications.

See gh-22858
2020-08-11 12:31:02 -07:00
Madhura Bhave 4799b26d2c Merge branch '2.3.x'
Closes gh-22897
2020-08-11 12:25:48 -07:00
Madhura Bhave eeca767c49 Merge branch '2.2.x' into 2.3.x
Closes gh-22895
2020-08-11 12:22:43 -07:00
Madhura Bhave cdbb7f441a Do not ignore null/empty values from SPRING_APPLICATION_JSON
Fixes gh-21542
2020-08-11 12:22:08 -07:00
Phillip Webb a062b51efb Polish 'Allow step action to be optional'
See gh-22845
2020-08-11 10:57:03 -07:00
Marten Deinum 0e5be0ab62 Allow step action to be optional
Update `SpringApplicationRunListeners` so that the step action
is optional and does not need to call `end()`.

This commit also introduces a test for the failure case showing
that there is a missed call to end with the initial solution.

See gh-22845
2020-08-11 10:54:00 -07:00
Andy Wilkinson ac357283a6 Upgrade to Spring HATEOAS 1.2.0-M1
Closes gh-22893
2020-08-11 16:28:16 +01:00
Andy Wilkinson e358144b2e Polish "Exclude cookie headers by default from HTTP traces"
See gh-22829
2020-08-11 15:58:55 +01:00
Emily Tsanova 5ff515727d Exclude cookie headers by default from HTTP traces
See gh-22829
2020-08-11 15:58:55 +01:00