Commit Graph

10343 Commits

Author SHA1 Message Date
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 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 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 f5ae58e8e5 Fix deprecation warning
See gh-23256
2020-09-11 19:01:22 -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
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 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 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 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
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 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 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 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 d39b107917 Merge branch '2.2.x' into 2.3.x
Closes gh-23203
2020-09-07 13:30:02 +01: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 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 652561c274 Review checkstyle rule to prevent non BDD mockito imports
Closes gh-20902
2020-09-01 11:50:14 +02: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
Stephane Nicoll ee914624e6 Document buildpacks are configured with target Java version
Closes gh-21796
2020-08-31 16:15:30 +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 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 b80314b44b Document how to customize the jmxPort for Maven integration tests
Closes gh-22401
2020-08-31 10:52:47 +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 008eee42a1 Add a note about using graceful shutdown from an IDE
Closes gh-22959
2020-08-31 09:38:21 +02: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 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 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 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
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 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 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
Andy Wilkinson 4143c31f9c Merge branch '2.2.x' into 2.3.x
Closes gh-23087
2020-08-26 09:03:46 +01: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
Andy Wilkinson d133f228e2 Increase wait times in DevToolsIntegrationTests
See gh-22909
2020-08-25 16:50:56 +01: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 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 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 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 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
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 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 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 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 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 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 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 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 15a0cbc96b Update copyright year of changed files 2020-08-18 15:39:23 -07:00
Phillip Webb ba2ab3363b Merge branch '2.2.x' into 2.3.x 2020-08-18 15:38:53 -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 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 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
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 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
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 6b679b7d64 Polish
See gh-22945
2020-08-17 13:24:51 +02: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 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 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
Andy Wilkinson 3e35fd480f Wait longer for server port and improve diagnostics on timeout
See gh-22909
2020-08-14 15:34:41 +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
Stephane Nicoll 2f5145b6a1 Upgrade to Micrometer 1.5.4
Closes gh-22932
2020-08-13 13:04: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 d0662e824a Fix default value of server.jetty.accesslog.format
Closes gh-22921
2020-08-13 09:43:37 +02: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 005ed8b8db Use Java version wildcard in image building docs
Fixes gh-22916
2020-08-12 17:04:17 -05: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 f43a0b4891 Fix configuration of environment in Kotlin bootBuildImage examples
Fixes gh-22913
2020-08-12 17:06:16 +01:00
Stephane Nicoll 5e5c1fb4d0 Upgrade to Spring Data Neumann SR3
Closes gh-22844
2020-08-12 15:42:54 +02: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 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
Andy Wilkinson 1381929525 Upgrade to Gradle 6.6
Closes gh-22905
2020-08-12 12:24:08 +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 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
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
Stephane Nicoll 92445fcc54 Merge branch '2.2.x' into 2.3.x
Closes gh-22890
2020-08-11 16:51:34 +02:00
Stephane Nicoll ccffd50285 Document the limitation of default value detection
Closes gh-22685
2020-08-11 16:51:00 +02:00
Stephane Nicoll 64a5aa9340 Polish 2020-08-11 16:41:47 +02:00
Stephane Nicoll ac7320d7fe Document that Cassandra's application.conf is not considered
Closes gh-21787
2020-08-11 15:53:06 +02:00
Andy Wilkinson 1896566bc8 Avoid duplicates with different versions in Devtools' int test deps
Closes gh-22887
2020-08-11 14:33:27 +01:00
Andy Wilkinson 289797b5d4 Upgrade to Spring Security 5.3.4.RELEASE
Closes gh-22873
2020-08-11 12:50:16 +01:00
Andy Wilkinson 4f79f39b31 Upgrade to Spring HATEOAS 1.1.1.RELEASE
Closes gh-22872
2020-08-11 12:50:16 +01:00
Andy Wilkinson 33ece49921 Upgrade to RSocket 1.0.2
Closes gh-22871
2020-08-11 12:50:16 +01:00
Andy Wilkinson ad109c10d3 Upgrade to Pooled JMS 1.1.2
Closes gh-22870
2020-08-11 12:50:16 +01:00
Andy Wilkinson 006d960044 Upgrade to Lettuce 5.3.3.RELEASE
Closes gh-22869
2020-08-11 12:50:15 +01:00
Andy Wilkinson abf6123bae Upgrade to Kafka 2.5.1
Closes gh-22868
2020-08-11 12:50:15 +01:00
Andy Wilkinson e8307178c3 Upgrade to jOOQ 3.13.4
Closes gh-22867
2020-08-11 12:50:15 +01:00
Andy Wilkinson 6b843d3066 Upgrade to Jetty 9.4.31.v20200723
Closes gh-22866
2020-08-11 12:50:15 +01:00
Andy Wilkinson c89bc5120e Upgrade to Jackson Bom 2.11.2
Closes gh-22865
2020-08-11 12:50:15 +01:00
Andy Wilkinson 7a0af85b6e Upgrade to Hibernate 5.4.20.Final
Closes gh-22864
2020-08-11 12:50:15 +01:00
Andy Wilkinson 38891f7594 Upgrade to Dropwizard Metrics 4.1.12.1
Closes gh-22863
2020-08-11 12:50:14 +01:00
Andy Wilkinson 977f33ad80 Upgrade to Dependency Management Plugin 1.0.10.RELEASE
Closes gh-22862
2020-08-11 12:50:14 +01:00
Andy Wilkinson 8af4246db5 Upgrade to Couchbase Client 3.0.7
Closes gh-22861
2020-08-11 12:50:14 +01:00
Andy Wilkinson 6cb7eb926e Upgrade to Commons Pool2 2.8.1
Closes gh-22860
2020-08-11 12:50:14 +01:00
Andy Wilkinson d16aa3f377 Upgrade to Byte Buddy 1.10.14
Closes gh-22859
2020-08-11 12:50:14 +01:00
Stephane Nicoll dc4de06b35 Restore customization of the Couchbase cache manager
With the upgrade to the new Couchbase SDK and the related changes in
Spring Data Couchbase, CacheManagerCustomizer can no longer be used to
customize the Couchbase cache manager as it is an immutable class.

This commit introduces a dedicated callback for the
CouchbaseCacheManagerBuilder that is used by the auto-configuration and
update the documentation to refer to it with a sample usage.

Closes gh-22573
2020-08-11 13:32:17 +02:00
Andy Wilkinson b2c0c958c9 Upgrade to Dependency Management Plugin 1.0.10.RELEASE
Closes gh-22615
2020-08-11 12:14:24 +01:00
Andy Wilkinson 1270af90c2 Only enable full path optimization when there's one DispatcherServlet
Previously, UrlPathHelper's full path optimization was enabled when
there was a dispatcher servlet mapped to /. The UrlPathHelper is used
across Spring MVC and if there are multiple dispatcher servlets they
all share the sample UrlPathHelper. This meant that any additional
dispatcher servlets mapping to locations other than / would not be able
to map requests correctly as the UrlPathHelper would use the full path,
ignoring the url mapping of the dispatcher servlet.

This commit updates the MVC auto-configuration so that use of the full
path is only enabled if there's a single dispatcher servlet
registration.

Fixes gh-22682
2020-08-11 09:59:06 +01:00
Stephane Nicoll 980ddcffd0 Merge branch '2.2.x' into 2.3.x
Closes gh-22849
2020-08-10 16:05:13 +02:00
Stephane Nicoll dd9c9fd171 Polish "Migrate legacy endpoint that have a dash in their id"
See gh-21615
2020-08-10 14:53:18 +02:00
Gabriele Bianchet-David 0f9f10f97e Migrate legacy endpoint that have a dash in their id
See gh-21615
2020-08-10 14:42:46 +02:00
Stephane Nicoll 2b578296f9 Merge branch '2.2.x' into 2.3.x 2020-08-10 14:33:37 +02:00
Stephane Nicoll 8962d6ca21 Polish 2020-08-10 14:31:16 +02:00
Stephane Nicoll f466734801 Merge branch '2.2.x' into 2.3.x
Closes gh-22847
2020-08-10 14:23:31 +02:00
Stephane Nicoll 333af3d4e7 Polish "Propagate the cause that led Reactor"s debug agent to fail"
See gh-22777
2020-08-10 14:21:44 +02:00
davidbilge 12c419054a Propagate the cause that led Reactor"s debug agent to fail
Prior to this commit, DebugAgentEnvironmentPostProcessor throws a
RuntimeException with a generic error message if its initialization
fails. The causing exception is discarded, which makes error analysis
unnecessarily difficult.

This commit attaches the cause to the newly thrown RuntimeException.

See gh-22777
2020-08-10 14:21:26 +02:00
Stephane Nicoll b2e581947f Upgrade to Reactor Dysprosium-SR11
Closes gh-22841
2020-08-10 14:13:07 +02:00
ksmilek 5cb1b41355 Fix wrong reference in `ReadinessStateHealthIndicator` javadoc
See gh-22760
2020-08-10 14:03:46 +02:00
Stephane Nicoll dea2cc480d Start building against Spring Data Neumann SR3 snapshots
See gh-22844
2020-08-10 10:49:06 +02:00
Stephane Nicoll 1fdc6017ae Start building against Spring Kafka 2.5.5 snapshots
See gh-22843
2020-08-10 10:48:31 +02:00
Stephane Nicoll 4d95fb560b Start building against Spring AMQP 2.2.10 snapshotsEnabled
See gh-22842
2020-08-10 10:47:50 +02:00
Stephane Nicoll 2a3d45e5c4 Start building against Reactor Dysprosium-SR11 snapshots
See gh-22841
2020-08-10 10:47:04 +02:00
Andy Wilkinson 181e3b34ba Isolate Maven Plugin's integration tests from repo.spring.io
Previously, the Maven plugin integration tests used a settings.xml file
that defined https://repo.spring.io/snapshot as a repository. This
allowed them to resolve snapshots of the plugin's Spring Framework
dependencies but it had the unfortunate side-effect of also allowing
them to resolve snapshots of other Spring Boot modules from Artifactory
rather than using those currently being built.

This commit replaces the repositories in settings.xml with a Gradle
task that resolves the necessary dependencies and populates a local
repository with the dependencies' jars and pom files. This is achieved
using a ComponentMetadataRule that creates a custom variant of each
dependency that includes its pom file, inspired by the example in
gradle/gradle/#11449. A configuration that extends the
runtimeClasspath configuration and select the custom variant via its
attribute is then used to resolve the jars and pom files of the runtime
classpath such that they can then be used to populate the local
repository.

Closes gh-22828
2020-08-07 17:18:47 +01:00
Brian Clozel fea535d176 Update HTTP/2 auto-configuration for Jetty
Prior to this commit, the HTTP/2 server auto-configuration for Jetty
would require Conscrypt as a hard dependency.

This commit updates the auto-configuration for more flexibility and now
allows the following deployments:

* JDK9+ with the JDK ALPN implementation
* JDK8u252+ with the backported ALPN implementation
* Conscrypt with no JDK requirement

The auto-configuration now improves detection and guides developers in
case there is a missing `jetty-alpn-*-server` dependency.

The reference docs in the HOWTO section has been updated accordingly.

Closes gh-22188
2020-08-07 15:42:23 +02:00
Andy Wilkinson be32843dab Configure generated snippets as inputs to the Asciidoctor tasks
Closes gh-22819
2020-08-07 11:28:58 +01:00
Andy Wilkinson 95b504ccad Make processResources out-of-date on version change
Closes gh-22780
2020-08-07 09:44:16 +01:00
Madhura Bhave 3f82ca40e2 Merge branch '2.2.x' into 2.3.x
Closes gh-22774
2020-08-06 17:59:30 -07:00
Madhura Bhave f39f33bb8d Fix documentation related to the health endpoint's inner details
Closes gh-22490
2020-08-06 17:57:56 -07:00
Phillip Webb 4924573074 Merge branch '2.2.x' into 2.3.x 2020-08-06 10:15:22 -07:00
Phillip Webb fdd6a89a61 Polish 2020-08-06 10:14:01 -07:00
Andy Wilkinson 11d1002f15 Merge branch '2.2.x' into 2.3.x
Closes gh-22767
2020-08-06 15:13:55 +01:00
Andy Wilkinson 07699ea6ff Retry when dependency resolution fails in ModifiedClassPathClassLoader
Closes gh-22763
2020-08-06 15:12:20 +01:00
Andy Wilkinson 327138c227 Merge branch '2.2.x' into 2.3.x 2020-08-06 13:34:12 +01:00
Andy Wilkinson 63f7c75b61 Polish 2020-08-06 13:34:01 +01:00
Andy Wilkinson c121f9f61f Merge branch '2.2.x' into 2.3.x
Closes gh-22758
2020-08-06 09:21:29 +01:00
Andy Wilkinson b53f54f2cf Add tip about using AopTestUtils.getTargetProxy with proxied spy beans
Closes gh-22281
2020-08-06 09:21:11 +01:00
Andy Wilkinson a160755da5 Merge branch '2.2.x' into 2.3.x
Closes gh-22748
2020-08-05 18:15:45 +01:00
Andy Wilkinson bfe250e5d3 Clarify docs on schema and data SQL scripts with Flyway and Liquibase
Closes gh-20920
2020-08-05 18:14:39 +01:00
Andy Wilkinson c40835eba0 Merge branch '2.2.x' into 2.3.x
Closes gh-22746
2020-08-05 17:47:24 +01:00
Andy Wilkinson 71ffb44a3c Remove WebClient's in-memory buffer size limit for endpoint tests
Previously, the endpoints' responses could occasionally exceed
WebClient's in-memory buffer limt, for example if the threads endpoint
was reporting a large number of threads or the threads had large
stacks.

This commit disables WebClient's in-memory buffer size limit so that
the tests passing is not dependent on the size of the endpoints'
responses.

Closes gh-22743
2020-08-05 17:37:44 +01:00
Johnny Lim 1017774ed5 Polish
See gh-22740
2020-08-05 17:59:03 +02:00
Andy Wilkinson 94644f3814 Merge branch '2.2.x' into 2.3.x
Closes gh-22737
2020-08-05 09:05:10 +01:00
Andy Wilkinson 2238b0d797 Try to make FileSystemWatcherTests.waitsForQuietPeriod() more robust
Previously, waitsForQuietPeriod would iterate 10 times, touching a new
file and then sleeping for 100ms at it did so. With a quiet period of
200ms, this was intended to result in a single change set containing
10 files. However, the test would fail occasionally as multiple change
sets were detected. The test is multi-threaded and is, therefore, at
the mercy of the scheduler. If the thread that is iterating and
touching the files takes over 200ms to be scheduled – exceeding the
watcher's quiet period – the watcher may detect a change set while the
changes are still being made. Eliminating this possibilty would require
the test to participate in the watcher's synchronization, which would
require some changes to its implementation. Instead, this commit
aims to avoid the problem by sleeping for 1/10 of the time (10ms) and
expecting a single change set of 100 files. The hope is that the much
shorter sleep time will result in the file touching thread being
scheduled well within the 200ms quiet period.

Closes gh-22732
2020-08-05 09:00:49 +01:00
Scott Frederick 21b2dd2740 Allow empty env entries when building an image
Prior to this commit, an entry in the environment map provided to the
build plugin image building goal or task that had a null value would
result in a failure with a message that was difficult to diagnose.

This commit treats env map entries with a null value as an empty
entry to prevent the failure and also make it easier to provide an
explicit empty entry in the Maven XML.

Fixes gh-22703
2020-08-04 15:29:29 -05:00
Stephane Nicoll 13f1d00048 Merge branch '2.2.x' into 2.3.x
Closes gh-22706
2020-08-03 15:01:07 +02:00
Stephane Nicoll 4082cddce2 Merge branch '2.1.x' into 2.2.x
Closes gh-22705
2020-08-03 15:00:41 +02:00
Johnny Lim bd2874de49 Fix broken links to Micrometer registry docs
See gh-22704
2020-08-03 14:58:22 +02:00
Brian Clozel 8dedeb4c6a Fix missing liveness and readiness indicators
Prior to this commit, the livenessState and readinessState health
indicators would not be configured automatically and would be missing
from the "liveness" and "readiness" health groups, leading to 404s when
hitting the `/actuator/health/liveness` or `/actuator/health/readiness`.

This commit ensures that the health indicators beans have the proper
name and revisits the auto-configuration conditions to reflect that as
well.

Fixes gh-22562
2020-08-01 20:57:34 +02:00
Brian Clozel 35093aacf4 Polish "Document properties to enable probe health indicators"
See gh-22631
2020-08-01 19:59:25 +02:00
Tadaya Tsuyukubo 630cbae7d7 Document properties to enable probe health indicators
Document property names to enable probe(readiness/liveness)
health indicators.

See gh-22631
2020-08-01 19:59:03 +02:00
Andy Wilkinson 7d25948ab5 Merge branch '2.2.x' into 2.3.x
Closes gh-22686
2020-07-31 12:24:34 +01:00
Andy Wilkinson 59b1df4548 Polish "Look in correct context when finding Liquibase beans"
See gh-22681
2020-07-31 12:20:58 +01:00
biergit 62156810cf Look in correct context when finding Liquibase beans
See gh-22681
2020-07-31 12:20:09 +01:00
Andy Wilkinson 00cd8945d5 Document how to use Gradle's native bom support
Closes gh-21570
2020-07-30 20:53:44 +01:00
Andy Wilkinson f81e8909fa Document how to re-enable DataSource auto-config when using R2DBC
Closes gh-22094
2020-07-30 18:06:13 +01:00
Andy Wilkinson 6ee0f8df1b Merge branch '2.2.x' into 2.3.x
Closes gh-22672
2020-07-30 13:41:17 +01:00
Andy Wilkinson 49f8943a5f Register ErrorPageFilter for async dispatch
Fixes gh-19471
2020-07-30 13:38:02 +01:00
Andy Wilkinson 45346b63ba Merge branch '2.2.x' into 2.3.x
Closes gh-22669
2020-07-30 12:12:45 +01:00
Andy Wilkinson 22dc4e7608 Clarify documentation on @AutoConfigureRestDocs with WebTestClient
Closes gh-15977
2020-07-30 12:12:10 +01:00
Andy Wilkinson 7e547b60cf Merge branch '2.2.x' into 2.3.x
Closes gh-22665
2020-07-30 09:06:28 +01:00
Andy Wilkinson 1871cffc7d Document that constructor binding does not support @…Unit annotations
Closes gh-22565
2020-07-30 09:04:30 +01:00
Andy Wilkinson a580e3a370 Merge branch '2.2.x' into 2.3.x
Closes gh-22641
2020-07-29 14:10:25 +01:00
Andy Wilkinson 72551242fd Allow XADataSource auto-config with no spring.datasource properties
Fixes gh-20229
2020-07-29 13:57:50 +01:00
Andy Wilkinson 5dd7780a38 Try to stabilise descendantOfPropertyAccess performance test
Closes gh-22633
2020-07-29 10:56:30 +01:00
Andy Wilkinson 77287f8632 Merge branch '2.2.x' into 2.3.x
Closes gh-22629
2020-07-28 18:27:01 +01:00
Andy Wilkinson 5ea8bb0676 Recommend the use of a MeterBinder when a metric depends on a bean
Closes gh-19557
2020-07-28 18:26:38 +01:00
Stephane Nicoll 12d78b26b9 Merge branch '2.2.x' into 2.3.x
Closes gh-22626
2020-07-28 16:29:36 +02:00
Stephane Nicoll 16aa8fbc88 Fix actuator dependency on Jackson JSR 310 module
This commit harmonizes dependency declarations for Jackson in the
actuator. Both Jackson and JSR 310 are back to optional in the core
actuator module and mandatory when using the auto-configuration.

Closes gh-22624
2020-07-28 16:26:11 +02:00
Andy Wilkinson d6490da88b Merge branch '2.2.x' into 2.3.x
Closes gh-22622
2020-07-28 14:37:07 +01:00
Andy Wilkinson 856c55b188 List DevTools in section overview of multi-page documentation
Closes gh-22591
2020-07-28 14:36:23 +01:00
dreis2211 be8a70936d Add ElasticsearchReactiveHealthIndicator to docs
See gh-22616
2020-07-28 13:25:04 +01:00
Andy Wilkinson a2ce39d7eb Merge branch '2.2.x' into 2.3.x
Closes gh-22617
2020-07-28 13:22:32 +01:00
dreis2211 c405b8b9c9 Fix link to Elasticsearch health indicator
See gh-22598
2020-07-28 13:21:09 +01:00
Andy Wilkinson c2df326f6f Merge branch '2.2.x' into 2.3.x
Closes gh-22611
2020-07-28 09:15:14 +01:00
Andy Wilkinson ea5284ca91 Polish "Use milliseconds when configuring awaitTerminationPeriod"
See gh-22604
2020-07-28 09:03:57 +01:00
Tadaya Tsuyukubo 685a6116d1 Use milliseconds when configuring awaitTerminationPeriod
Prior to this change, TaskExecutorBuilder used seconds as its precision
to map the awaitTerminationPeriod value. This caused a loss of
millisecond information in the period.

This commit fixes the loss by converting the period to millisecond and
using setAwaitTerminationMillis to configure the executor.

See gh-22604
2020-07-28 09:01:55 +01:00
Andy Wilkinson 5471e16fce Merge branch '2.2.x' into 2.3.x
Closes gh-22608
2020-07-28 08:43:19 +01:00
Andy Wilkinson d9b61c4aaa Update link to App Engine's Spring Boot sample
Closes gh-22607
2020-07-28 08:42:40 +01:00
Andy Wilkinson 280ecfcd47 Polish 2020-07-27 16:00:47 +01:00
Andy Wilkinson 189fa12c9d Merge branch '2.2.x' into 2.3.x
Closes gh-22596
2020-07-27 15:53:03 +01:00
Andy Wilkinson 0a01875d41 Improve documentation about swapping one technical starter for another
Closes gh-20408
2020-07-27 15:50:07 +01:00
Andy Wilkinson 4a3683f7dd Merge branch '2.2.x' into 2.3.x
Closes gh-22592
2020-07-27 15:23:55 +01:00
Andy Wilkinson 812a0ed0c6 Define the reference doc authors in a single place
Closes gh-20896
2020-07-27 15:20:59 +01:00
Andy Wilkinson 810fdf4450 Merge branch '2.2.x' into 2.3.x
Closes gh-22589
2020-07-27 14:48:33 +01:00
Andy Wilkinson b631fa1405 Describe MongoClientSettingsBuilderCustomizer in the documentation
Closes gh-21696
2020-07-27 14:46:30 +01:00
Andy Wilkinson c2aa6cbc60 Merge branch '2.2.x' into 2.3.x
Closes gh-22587
2020-07-27 14:10:22 +01:00
Andy Wilkinson be428ef0f2 Document the need for configuration files to have a file extension
Closes gh-22278
2020-07-27 14:09:54 +01:00
Andy Wilkinson 8ff2b9f2e8 Merge branch '2.2.x' into 2.3.x
Closes gh-22585
2020-07-27 13:37:23 +01:00
Andy Wilkinson 1b48daf1d5 Do not ignore unknown fields when invalid fields are being ignored
Previously, ignoring invalid fields would cause the failure for an
unknown field to be ignored, irrespective of the ignoreUnknownFields
attribute on `@ConfigurationProperties`.

This commit updates the NoUnboundElementsBindHandler to ensure that
any UnboundConfigurationPropertiesException is thrown rather than
being ignored when the handler has been wrapped by an
IgnoreErrorsBindHandler.

Fixes gh-22308
2020-07-27 13:28:44 +01:00
Andy Wilkinson 39cb912819 Merge branch '2.2.x' into 2.3.x
Closes gh-22583
2020-07-27 13:08:14 +01:00
Andy Wilkinson 41954533b2 Fix Mock|SpyBean context caching
The fix for gh-20916 updated DefinitionsParser so that the
ResolvableType for each MockBean or SpyBean field included the
implementation class from which the field was found. Where the field
was declared with a variable generic signature that was made constant
by its implementation class, this allowed the correct concrete type to
be determined. It also had the unintended side-effect of preventing two
test classes with identical `@MockBean` and `@SpyBean` configuration
from sharing a context as the resolvable types for their mock and spy
bean fields would now be different.

This commit updates DefinitionsParser to only include the
implementation class in the ResolvableType if the field's generic type
is variable. For cases where it is not variable, this restores the
behaviour prior to the fix for gh-20916.

Fixes gh-22566
2020-07-27 13:04:02 +01:00
Andy Wilkinson d0c75aef19 Merge branch '2.2.x' into 2.3.x
Closes gh-22580
2020-07-27 11:29:14 +01:00
Andy Wilkinson 16eaae0b2f Defer background pre-init till the environment is prepared
Previously, background pre-init was started in response to the
application starting event. This meant that it would be running while
the logging turbo filter was in place and was rejecting all logging.
As a result, any logging performed during pre-init would be lost.

This commit changes background pre-init so that it is now started
in response to the application environment prepared event. By this
point, the logging turbo filter has been removed as the logging levels
have been configured from the environment.

Closes gh-21897
2020-07-27 11:24:36 +01:00
Andy Wilkinson f0d90020e5 Merge branch '2.2.x' into 2.3.x
Closes gh-22578
2020-07-27 10:57:58 +01:00
Andy Wilkinson b98c3dccfd Fix property-based configuration of Undertow socket options
Previously, only UndertowOptions was used as the source of options for
both server and socket options, but it only contains server options.
As a result, attempting to configure any socket options defined by
XNIO's Options class would fail.

This commit updates the property-based configuration of options to use
UndertowOptions as the source for server options and XNIO's Options as
the source for socket options.

Fixes gh-22502
2020-07-27 10:47:14 +01:00
Andy Wilkinson 5279b90ced Merge branch '2.2.x' into 2.3.x
Closes gh-22576
2020-07-27 10:11:47 +01:00
Andy Wilkinson 1c3528f5a4 Include Jackson Modules in WebMvcTest and WebFluxTest
Fixes gh-22530
2020-07-27 10:11:29 +01:00
Andy Wilkinson 979aef1f68 Merge branch '2.2.x' into 2.3.x
Closes gh-22574
2020-07-27 09:59:07 +01:00
Andy Wilkinson 7b3c0a9e09 Advise against java.util.Optional configuration properties
Closes gh-21868
2020-07-27 09:58:24 +01:00
Stephane Nicoll 6b32e62142 Fix CacheAutoConfiguration relative order for Couchbase
This commit fixes the auto-configuration of the Couchbase caching
support by configuring the cache once Spring Data Couchbase has gotten
a chance to be processed.

Closes gh-22542
2020-07-26 17:24:24 +02:00
Andy Wilkinson ce7210c4f0 Merge branch '2.1.x' into 2.2.x
Closes gh-22563
2020-07-25 09:06:11 +01:00
Nelson Osacky 585aed8f8f Add generated-snippets as output to test goal
The generated snippets were not declared as an output to the
`spring-boot-actuator-autoconfigure` test goal so when the test was
pulled from the cache, it did not contain the `generated-snippets`
directory. This directory is required as an input to the Asciidoctor
plugin.

See gh-22555
2020-07-25 08:26:15 +01:00
Stephane Nicoll 7ed54bda96 Fix typo for management.health.readinessstate.enabled
Closes gh-22560
2020-07-25 07:20:06 +02:00
Andy Wilkinson 98115239b3 Only create effective bom artifact when needed
Closes gh-22143
2020-07-24 16:44:46 +01:00
Andy Wilkinson 63cac4bedd Upgrade to Micrometer 1.5.3
Closes gh-22553
2020-07-24 15:53:35 +01:00
Andy Wilkinson 1a43cd1c8e Merge branch '2.1.x' into 2.2.x
Closes gh-22551
2020-07-24 14:28:11 +01:00
Nelson Osacky 0494007893 Disable extra scans for full profile.
The extra scans were not disabled for the full profile, only the
regular profile.

See gh-22550
2020-07-24 14:27:32 +01:00
Andy Wilkinson f4508b4059 Merge branch '2.1.x' into 2.2.x
Closes gh-22547
2020-07-24 11:54:12 +01:00
Nelson Osacky e41a53cf85 Add Gradle Enterprise Extension
This adds build caching and build scans.

The changes required disabling scans when using the maven invoker
plugin in order to not cause duplicate build scans when invoking other
maven builds. There is also an empty `.mvn` folder in the
spring-boot-starters project to prevent duplicate build scans as well
since there is no way to pass properties to the maven-javadoc-plugin.

The checkstyle plugin was causing a cache miss with the
`propertyExpansion` because it contains an absolute path. The absolute
path is now ignored and instead the files are added as inputs to the
checkstyle plugin. This only enables the local build cache. The remote
cache is not yet enabled.

On my local machine:

./mvnw clean install build times go from about 30 minutes to about 10 minutes.
./mvnw clean install -Pfull build times go from about 60 minutes to about 13 minutes.

See gh-22089
2020-07-24 11:47:24 +01:00
Andy Wilkinson c605a6e34b Override other variant of registerBeanDefintions
Fixes gh-22480
2020-07-24 10:33:16 +01:00
Andy Wilkinson 9c5e59371f Upgrade to Jackson 2.10.5
Closes gh-22432
2020-07-23 21:12:08 +01:00
Andy Wilkinson 39c8898008 Upgrade to MariaDB 2.6.2
Closes gh-22541
2020-07-23 21:05:32 +01:00
Andy Wilkinson 44e6cf2e55 Upgrade to AspectJ 1.9.6
Closes gh-22540
2020-07-23 21:05:31 +01:00
Andy Wilkinson f93bae4bd3 Upgrade to Aspectj 1.9.6
Closes gh-22539
2020-07-23 21:03:51 +01:00
Andy Wilkinson ce803cc678 Upgrade to Micrometer 1.3.11
Closes gh-22538
2020-07-23 21:03:49 +01:00
Andy Wilkinson 698db27a75 Upgrade to Aspectj 1.9.6
Closes gh-22537
2020-07-23 21:02:36 +01:00
Andy Wilkinson db242794ec Upgrade to Micrometer 1.1.16
Closes gh-22536
2020-07-23 21:02:34 +01:00
Stephane Nicoll e9a966a0a2 Upgrade to Groovy 2.5.13
Closes gh-22526
2020-07-23 11:06:12 +02:00
Stephane Nicoll 4f3b03afcf Merge branch '2.1.x' into 2.2.x
Closes gh-22525
2020-07-23 11:01:05 +02:00
Stephane Nicoll 0440a9a78c Upgrade to Groovy 2.5.13
Closes gh-22505
2020-07-23 10:55:47 +02:00
Phillip Webb 187d3af7fc Update copyright year of changed files 2020-07-22 17:25:17 -07:00
Phillip Webb d2a7808098 Polish 2020-07-22 17:25:04 -07:00
Phillip Webb 217b2eff89 Merge branch '2.2.x' into 2.3.x 2020-07-22 17:03:23 -07:00
Phillip Webb b5e70157dc Update copyright year of changed files 2020-07-22 17:01:36 -07:00
Phillip Webb 51a26a4d5a Polish 2020-07-22 17:01:19 -07:00
Stephane Nicoll dd615fd9dd Upgrade to Spring Integration 5.3.2
Closes gh-22389
2020-07-22 21:37:39 +02:00
Stephane Nicoll d9c34d5b84 Upgrade to Spring Integration 5.1.12
Closes gh-22511
2020-07-22 21:35:48 +02:00
Stephane Nicoll 68497649b1 Upgrade to Spring Integration 5.2.8
Closes gh-22385
2020-07-22 21:32:52 +02:00
Stephane Nicoll fb56483015 Upgrade to Spring Kafka 2.5.4
Closes gh-22390
2020-07-22 20:37:48 +02:00
Stephane Nicoll d1f9adc189 Upgrade to Spring Kafka 2.3.10
Closes gh-22386
2020-07-22 20:36:14 +02:00
Stephane Nicoll 155f8a1a88 Upgrade to Spring AMQP 2.2.9
Closes gh-22387
2020-07-22 18:44:52 +02:00
Stephane Nicoll ad976bec20 Upgrade to Spring AMQP 2.2.9
Closes gh-22383
2020-07-22 18:43:46 +02:00
Stephane Nicoll baa6a8aeb1 Upgrade to Spring AMQP 2.1.16
Closes gh-22507
2020-07-22 18:41:46 +02:00
Stephane Nicoll 8be46529e1 Merge branch '2.2.x' into 2.3.x 2020-07-22 13:38:34 +02:00
Stephane Nicoll d2ed9dc090 Upgrade to Spring Data Neumann-SR2
Closes gh-22388
2020-07-22 11:11:11 +02:00
Stephane Nicoll d5301f8b0a Upgrade to Spring Data Moore-SR9
Closes gh-22384
2020-07-22 11:09:58 +02:00
Stephane Nicoll 8b20840a1a Upgrade to Spring Data Lovelace-SR19
Closes gh-22382
2020-07-22 11:08:13 +02:00
dreis2211 198131f5e4 Remove redundant compiler arguments in Gradle build files
See gh-22488
2020-07-22 06:42:48 +01:00
Andy Wilkinson 2063c242ae Polish 2020-07-22 06:25:55 +01:00
Brian Clozel 03739e3097 Polish "Improve liveness/readiness health config"
See gh-22107
2020-07-21 16:50:03 +02:00
Brian Clozel fe807d6c0b Improve liveness/readiness health config
Prior to this commit, the application availability infrastructure
would mix the `AvailabilityState`, the `HealthIndicator` and the
`HealthGroup` concepts and would not align with the rest.

This commit auto-configures the livenessState and readinessState
health indicators with the relevant configuration properties.
Unlike other indicators, they are not enabled by default but might
be in future versions.

This also moves the `management.health.probes.enabled` property
to `management.endpoint.health.probes.enabled` since "probes" here
is not a health indicator but rather a configuration flag for the
health endpoint.

Finally, the probes auto-configuration is refined to automatically
add liveness and readiness indicators for the probes group if
they're not already present.

Closes gh-22107
2020-07-21 16:03:06 +02:00
Andy Wilkinson cb73558856 Upgrade to Spring Framework 5.2.8.RELEASE
Closes gh-22375
2020-07-21 13:37:23 +01:00
Andy Wilkinson 6114897473 Upgrade to Reactor Bom Dysprosium-SR10
Closes gh-22376
2020-07-21 13:37:23 +01:00
Andy Wilkinson dd38ffe3a7 Upgrade to Tomcat 9.0.37
Closes gh-22478
2020-07-21 13:37:23 +01:00
Andy Wilkinson e9c46074f1 Upgrade to Solr 8.5.2
Closes gh-22477
2020-07-21 13:37:23 +01:00
Andy Wilkinson 3c628209b8 Upgrade to Netty 4.1.51.Final
Closes gh-22476
2020-07-21 13:37:23 +01:00
Andy Wilkinson 057ab3c647 Upgrade to Neo4j OGM 3.2.14
Closes gh-22475
2020-07-21 13:37:22 +01:00
Andy Wilkinson bd64f4b9d1 Upgrade to MySQL 8.0.21
Closes gh-22474
2020-07-21 13:37:22 +01:00
Andy Wilkinson bf95b7ac2d Upgrade to MongoDB 4.0.5
Closes gh-22473
2020-07-21 13:37:22 +01:00
Andy Wilkinson 13ab92238b Upgrade to Micrometer 1.5.2
Closes gh-22472
2020-07-21 13:37:22 +01:00
Andy Wilkinson 347d3af35d Upgrade to MariaDB 2.6.1
Closes gh-22471
2020-07-21 13:37:22 +01:00
Andy Wilkinson f8c85b7ac9 Upgrade to Lettuce 5.3.2.RELEASE
Closes gh-22470
2020-07-21 13:37:22 +01:00
Andy Wilkinson 09de935f29 Upgrade to Kotlin Coroutines 1.3.8
Closes gh-22469
2020-07-21 13:37:21 +01:00
Andy Wilkinson ebcc903547 Upgrade to jOOQ 3.13.3
Closes gh-22468
2020-07-21 13:37:21 +01:00
Andy Wilkinson ee689f516f Upgrade to Johnzon 1.2.8
Closes gh-22467
2020-07-21 13:37:21 +01:00
Andy Wilkinson c71b5ed836 Upgrade to Jetty 9.4.30.v20200611
Closes gh-22466
2020-07-21 13:37:21 +01:00
Andy Wilkinson c104a13bd5 Upgrade to Jetty Reactive HTTPClient 1.1.4
Closes gh-22465
2020-07-21 13:37:21 +01:00
Andy Wilkinson 1ee9be847e Upgrade to Jakarta Servlet 4.0.4
Closes gh-22464
2020-07-21 13:37:21 +01:00
Andy Wilkinson 6b48705e6a Upgrade to Jackson Bom 2.11.1
Closes gh-22463
2020-07-21 13:37:21 +01:00
Andy Wilkinson 1663e46720 Upgrade to HSQLDB 2.5.1
Closes gh-22462
2020-07-21 13:37:20 +01:00
Andy Wilkinson c368f38e88 Upgrade to Hibernate 5.4.18.Final
Closes gh-22461
2020-07-21 13:37:20 +01:00
Andy Wilkinson 3c05f8eb40 Upgrade to Hazelcast 3.12.8
Closes gh-22460
2020-07-21 13:37:20 +01:00
Andy Wilkinson 3be07566fb Upgrade to Flatten Maven Plugin 1.2.4
Closes gh-22459
2020-07-21 13:37:20 +01:00
Andy Wilkinson d783f3e4d2 Upgrade to Dropwizard Metrics 4.1.11
Closes gh-22458
2020-07-21 13:37:20 +01:00
Andy Wilkinson 8030c8635c Upgrade to DB2 JDBC 11.5.4.0
Closes gh-22457
2020-07-21 13:37:20 +01:00
Andy Wilkinson f88038f00d Upgrade to Couchbase Client 3.0.6
Closes gh-22456
2020-07-21 13:37:19 +01:00
Andy Wilkinson 48ea8caf3d Upgrade to Caffeine 2.8.5
Closes gh-22455
2020-07-21 12:35:34 +01:00
Andy Wilkinson 82ca58a36e Upgrade to Byte Buddy 1.10.13
Closes gh-22454
2020-07-21 12:35:32 +01:00
Andy Wilkinson bec2942bae Upgrade to AppEngine SDK 1.9.81
Closes gh-22453
2020-07-21 12:35:31 +01:00
Andy Wilkinson b6516c9790 Upgrade to ActiveMQ 5.15.13
Closes gh-22452
2020-07-21 12:35:29 +01:00
Andy Wilkinson 8448763976 Upgrade to Spring Framework 5.2.8.RELEASE
Closes gh-22372
2020-07-21 11:38:40 +01:00
Andy Wilkinson 249e7dab01 Upgrade to Reactor Dysprosium-SR10
Closes gh-22374
2020-07-21 11:38:40 +01:00
Andy Wilkinson cb371b276f Upgrade to Spring Session Bom Corn-SR3
Closes gh-22451
2020-07-21 11:38:40 +01:00
Andy Wilkinson e8f220a749 Upgrade to Neo4j Ogm 3.2.14
Closes gh-22450
2020-07-21 11:38:40 +01:00
Andy Wilkinson 11cd2bb5c9 Upgrade to Kotlin Coroutines 1.3.8
Closes gh-22449
2020-07-21 11:38:40 +01:00
Andy Wilkinson ffe3dc766b Upgrade to Hsqldb 2.5.1
Closes gh-22448
2020-07-21 11:38:39 +01:00
Andy Wilkinson cddfb888fc Upgrade to Hibernate 5.4.18.Final
Closes gh-22447
2020-07-21 11:38:39 +01:00
Andy Wilkinson fef61aea2c Upgrade to Jetty 9.4.30.v20200611
Closes gh-22446
2020-07-21 11:38:39 +01:00
Andy Wilkinson bbf8b01741 Upgrade to Tomcat 9.0.37
Closes gh-22445
2020-07-21 11:38:39 +01:00
Andy Wilkinson 123a490a39 Upgrade to Johnzon Jsonb 1.2.8
Closes gh-22444
2020-07-21 11:38:39 +01:00