Commit Graph

9833 Commits

Author SHA1 Message Date
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
Andy Wilkinson a568f0fd07 Upgrade to Activemq 5.15.13
Closes gh-22443
2020-07-21 11:38:39 +01:00
Andy Wilkinson 76457321a8 Upgrade to Byte Buddy 1.10.13
Closes gh-22442
2020-07-21 11:38:38 +01:00
Andy Wilkinson b24797d31a Upgrade to Mysql 8.0.21
Closes gh-22441
2020-07-21 11:38:38 +01:00
Andy Wilkinson b621cfc8e6 Upgrade to Jakarta Servlet 4.0.4
Closes gh-22440
2020-07-21 11:38:38 +01:00
Andy Wilkinson fdbb464375 Upgrade to Netty 4.1.51.Final
Closes gh-22439
2020-07-21 11:38:38 +01:00
Andy Wilkinson 9aef4c5cf4 Upgrade to Micrometer 1.3.10
Closes gh-22438
2020-07-21 11:38:38 +01:00
Andy Wilkinson c52ff06741 Upgrade to Dropwizard Metrics 4.1.11
Closes gh-22437
2020-07-21 11:38:38 +01:00
Andy Wilkinson 1a63d78679 Upgrade to Db2 Jdbc 11.5.4.0
Closes gh-22436
2020-07-21 11:38:37 +01:00
Andy Wilkinson 09d3bf0655 Upgrade to Hazelcast 3.12.8
Closes gh-22435
2020-07-21 11:38:37 +01:00
Andy Wilkinson 9836aa1afe Upgrade to Appengine Sdk 1.9.81
Closes gh-22434
2020-07-21 11:38:37 +01:00