Commit Graph

9900 Commits

Author SHA1 Message Date
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
Andy Wilkinson da59518d2c Upgrade to Caffeine 2.8.5
Closes gh-22433
2020-07-21 11:38:37 +01:00
Andy Wilkinson a87bf7a25a Upgrade to Couchbase Client 2.7.16
Closes gh-22431
2020-07-21 11:19:37 +01:00
Andy Wilkinson 8b8fcb16dc Upgrade to Spring Framework 5.1.17.RELEASE
Closes gh-22370
2020-07-21 10:41:36 +01:00
Andy Wilkinson 636b4a9a81 Upgrade to Reactor Californium-SR20
Closes gh-22371
2020-07-21 10:40:51 +01:00
Andy Wilkinson 6315fe3a61 Upgrade to Spring Session Bom Bean-SR11
Closes gh-22430
2020-07-21 10:40:25 +01:00
Andy Wilkinson 3f8a0b516f Upgrade to Neo4j Ogm 3.1.20
Closes gh-22429
2020-07-21 10:40:24 +01:00
Andy Wilkinson 9baefc5993 Upgrade to Jetty 9.4.30.v20200611
Closes gh-22428
2020-07-21 10:40:22 +01:00
Andy Wilkinson 50b05ac652 Upgrade to Tomcat 9.0.37
Closes gh-22427
2020-07-21 10:40:21 +01:00
Andy Wilkinson 1113d5cc23 Upgrade to Activemq 5.15.13
Closes gh-22426
2020-07-21 10:40:19 +01:00
Andy Wilkinson 775231e3e9 Upgrade to Mysql 8.0.21
Closes gh-22425
2020-07-21 10:40:18 +01:00
Andy Wilkinson 83ca02f16d Upgrade to Netty 4.1.51.Final
Closes gh-22424
2020-07-21 10:40:17 +01:00
Andy Wilkinson dd9c9fa7be Upgrade to Micrometer 1.1.15
Closes gh-22423
2020-07-21 10:40:16 +01:00
Andy Wilkinson c166b5b23e Upgrade to Appengine Sdk 1.9.81
Closes gh-22422
2020-07-21 10:40:15 +01:00
Andy Wilkinson 43fd27bb71 Upgrade to Jackson 2.9.10.20200621
Closes gh-22421
2020-07-21 10:40:13 +01:00
Andy Wilkinson c90dc87b0b Upgrade to Couchbase Client 2.7.16
Closes gh-22420
2020-07-21 10:40:12 +01:00
Andy Wilkinson 5795caea81 Reinstate jetty-jndi exclusion in spring-boot-starter-jetty
Fixes gh-22241
2020-07-21 09:30:18 +01:00
Andy Wilkinson accc1f1ca8 Merge branch '2.2.x' into 2.3.x
Closes gh-22410
2020-07-20 13:58:19 +01:00
Andy Wilkinson 21f733b89b Merge branch '2.1.x' into 2.2.x
Closes gh-22409
2020-07-20 13:49:53 +01:00
Andy Wilkinson 179d2c79d6 Avoid trivialising what the reader's learning about
Closes gh-22408
2020-07-20 13:45:41 +01:00
Stephane Nicoll 50000cfb25 Upgrade to R2DBC Arabba-SR6
Closes gh-22394
2020-07-17 15:43:25 +02:00
Stephane Nicoll 0710a251bf Start building against Spring Kafka 2.5.4 snapshots
See gh-22390
2020-07-17 14:03:26 +02:00
Stephane Nicoll 80cd96a892 Start building against Spring Integration 5.3.2 snapshots
See gh-22389
2020-07-17 14:02:32 +02:00
Stephane Nicoll 13511b1b30 Start building against Spring Data Neumann-SR2 snapshots
See gh-22388
2020-07-17 14:01:41 +02:00
Stephane Nicoll 7388d8b8f3 Start building against Spring AMQP 2.2.9 snapshots
See gh-22387
2020-07-17 14:00:43 +02:00
Stephane Nicoll bb7b2e197c Start building against Spring Kafka 2.3.10 snapshots
See gh-22386
2020-07-17 13:43:36 +02:00
Stephane Nicoll 8589449052 Start building against Spring Integration 5.2.8 snapshots
See gh-22385
2020-07-17 13:43:07 +02:00
Stephane Nicoll 4e554b8c2b Start building against Spring Data Moore-SR9 snapshots
See gh-22384
2020-07-17 13:42:38 +02:00
Stephane Nicoll 0e4b6d3203 Start building against Spring AMQP 2.2.9 snapshots
See gh-22383
2020-07-17 13:42:11 +02:00
Stephane Nicoll 4a0031a21e Start building against Spring Data Lovelace-SR18 snapshots
See gh-22382
2020-07-17 13:22:02 +02:00
Stephane Nicoll b50720aa69 Start building against Reactor Dysprosium-SR10 snapshots
See gh-22376
2020-07-17 10:38:59 +02:00
Stephane Nicoll 22f57926e3 Start building against Spring Framework 5.2.8 snapshots
See gh-22375
2020-07-17 10:37:45 +02:00
Stephane Nicoll 819ff56e94 Start building against Reactor Dysprosium-SR10 snapshots
See gh-22374
2020-07-17 10:29:49 +02:00
Stephane Nicoll 84303e682c Start building against Spring Framework 5.2.8 snapshots
See gh-22372
2020-07-17 10:29:17 +02:00
Stephane Nicoll 2658ea76e6 Start building against Reactor Californium-SR20 snapshots
See gh-22371
2020-07-17 10:17:46 +02:00
Stephane Nicoll c31917daa0 Start building against Spring Framework 5.1.17 snapshots
See gh-22370
2020-07-17 10:17:17 +02:00
Stephane Nicoll 30b5168fed Polish "Restructure "Building Container Images" section"
See gh-22296
2020-07-16 16:15:50 +02:00
Sebastiaan Fernandez c50a5b395b Restructure "Building Container Images" section
See gh-22296
2020-07-16 16:07:32 +02:00
dreis2211 267283e3cd Handle null items as advertized in the Javadoc
See gh-22344
2020-07-16 14:17:53 +02:00
Scott Frederick bc88af8e53 Restore accidentally deleted line 2020-07-15 15:14:23 -05:00
Scott Frederick 210282260e Fail on bootBuildImage with launch script
This commit adds a check to the support code for the Gradle plugin
bootBuildImage task to ensure that the jar file that will be passed
to a builder is readable and has a valid directory. This prevents a
situation where the jar file cannot be read because it is prepended
with a launch script, and the builder does not receive any files to
process.

Notes have also been added to the Gradle plugin documentation to warn
against using a bootJar launchScript configuration and bootBuildImage
together, as well as caveats about launchScript that match the Maven
plugin documentation.

Fixes gh-22223
2020-07-15 14:58:11 -05:00
Andy Wilkinson 259ea65388 Merge branch '2.2.x' into 2.3.x
Closes gh-22339
2020-07-15 10:49:01 +01:00
Andy Wilkinson d9882f2c88 Clarify the effects of ordering auto-configuration classes
Closes gh-22337
2020-07-15 10:48:01 +01:00
dreis2211 de30e5c6ac Avoid unnecessary allocations in ConditionMessage for NORMAL style
See gh-22330
2020-07-14 18:12:17 +02:00
Stephane Nicoll 603e65a629 Polish 2020-07-14 16:57:42 +02:00
dreis2211 021d9b59cb Cleanup temporary files after Maven plugin execution
See gh-22112
2020-07-14 15:08:19 +01:00
dreis2211 60e7146326 Reduce started threads in OnClassCondition
Prior to this commit, OnClassCondition started a thread even if the number of
passed autoconfiguration class candidates never exceeded 1. This commit only
starts a thread if there is actually work to split in half.

See gh-22294
2020-07-14 14:59:53 +01:00
Andy Wilkinson 196d20537a Merge branch '2.2.x' into 2.3.x
Closes gh-22325
2020-07-14 11:38:34 +01:00
Andy Wilkinson 9558779dd4 Replace ConfigurationPropertiesBeanDefinitionValidator with a FailureAnalyzer
Previously, regular bean definitions for configuration properties classes
that attempt to use constructor binding were detected in a bean factory
post-processor, ConfigurationPropertiesBeanDefinitionValidator. This
validation examined every standard bean definition and failed if it
encountered one for a class that should have used constructor binding.
There were two downsides to this approach:

1. Reflection used to identify if the bean should be using constructor
   binding triggered class loading that could prevent subsequent
   instrumentation by a load-time weaver.
2. The cost of the validation was incurred when there was no
   misconfiguration to report.

This commit replaces ConfigurationPropertiesBeanDefinitionValidator
with a failure analyzer. This failure analyzer only runs once a failure
has occurred and the application context is not going to complete
refresh. This avoids causing problems with subsequent instrumentation
and also avoids the cost of validation and error reporting unless there
is an error.

Fixes gh-20798
2020-07-14 11:37:54 +01:00
Andy Wilkinson f52cdf10b3 Update WebServerInitEvent docs to reflect ordering w.r.t. refresh
Closes gh-22277
2020-07-13 12:51:07 +01:00
Andy Wilkinson f18b657ff9 Fix handling of DOCKER_HOST that begins with unix://
Fixes gh-22300
2020-07-10 15:31:55 +01:00
Andy Wilkinson 794ded5286 Test the Gradle plugin against Gradle 6.5.1
Closes gh-22292
2020-07-09 16:01:52 +01:00
Andy Wilkinson df67816e55 Try to make ConfigurationPropertySourcesTests perf tests more robust
Previously, the tests used absolute values to verify that the work
had completed sufficiently quickly. This led to flaky tests in
environments where the performance can be variable such as CI.

This commit tries to make the tests more robust by comparing the
performance to a baseline and requiring it to be twice as fast.

Closes gh-22137
2020-07-09 12:36:06 +01:00
Andy Wilkinson b24f17b35c Rework spring-boot-docs to be a full-blown java project
Previously, spring-boot-docs used the java-base-plugin and then added
configuration on top. This has proven to be error prone, with the most
recent problem being that the tests were not being compiled and run.

This commit changes approach and applies the java plugin to the project
instead of the java-base plugin. Now, rather than adding the necessary
configuration to the base, the unwanted pieces of the java plugin's
configuration – specifically the jar and javadoc tasks – are disabled
instead. The DeployedPlugin has also been updated so that it does not
create a publication from the java component for projects that have a
disabled jar task.

Closes gh-22284
2020-07-09 11:21:03 +01:00
Andy Wilkinson c765df6e5d Merge branch '2.2.x' into 2.3.x
Closes gh-22282
2020-07-09 10:37:01 +01:00
Andy Wilkinson afa5b12bdb Make reactive Jetty auto-config back off without jetty-servlet
Fixes gh-22275
2020-07-09 10:36:32 +01:00
Scott Frederick 1e2176b6c9 Improve Redis URL validation
This commit improves the validation of URLs provided in the property
'spring.redis.url' used to auto-configure a Spring Data Redis
connection. In particular, only the URL schemes 'redis://' and
'rediss://' are allowed, and any other scheme will result in a
configuration error. A failure analyzer is also provided to improve
diagnostics for common mis-configurations detected by this validation.

Fixes gh-21999
2020-07-08 14:50:26 -05:00
Andy Wilkinson d84aeef529 Merge branch '2.2.x' into 2.3.x
Closes gh-22264
2020-07-08 18:00:07 +01:00
Andy Wilkinson 66987533d1 Link to application properties section from externalized config list
Closes gh-22262
2020-07-08 17:58:35 +01:00
Andy Wilkinson 502ccb6586 Honor spring.autoconfigure.exclude in test slices
Previously, the import selector for `@ImportAutoConfiguration` did not
consider the spring.autoconfigure.exclude property when determining
which auto-configurations to exclude. This meant that tests using a
slice that included a particular auto-configuration would include it
even if the application's configuration excluded it via
spring.autoconfigure.exclude. Confusingly, this could result in a
sliced test using an auto-configuration that would be excluded in a
broader `@SpringBootTest`.

This commit updates the ImportAutoConfigurationImportSelector to
consider the spring.autoconfigure.exclude property so that sliced tests
will use a subset of the auto-configurations that a `@SpringBootTest`
would use.

Fixes gh-21736
2020-07-08 17:22:32 +01:00
Andy Wilkinson 1b85ce0769 Streamline OAuth2 resource server auto-config class conditions
Fixes gh-22233
2020-07-07 12:22:27 +01:00
Andy Wilkinson b8bc219b25 Merge branch '2.2.x' into 2.3.x
Closes gh-22251
2020-07-07 11:52:34 +01:00
Andy Wilkinson 4e79bb1cff Disable bean method proxying in SpringBootJdbcConfiguration
Closes gh-22231
2020-07-07 11:51:07 +01:00
Andy Wilkinson da319f5f59 Merge branch '2.2.x' into 2.3.x
Closes gh-22249
2020-07-07 11:43:03 +01:00
Andy Wilkinson 14f24dbecc Merge branch '2.1.x' into 2.2.x
Closes gh-22248
2020-07-07 11:42:43 +01:00
Andy Wilkinson 26f591264c Fix handling of NestedServletException with no root cause
Fixes gh-22169
2020-07-07 11:34:25 +01:00
Andy Wilkinson 24e1a1dddf Merge branch '2.2.x' into 2.3.x
Closes gh-22246
2020-07-07 10:53:45 +01:00
Andy Wilkinson a8d3f9af31 Polish "Rename NoneOfNestedConditions to NoneNestedConditions in example docs"
See gh-22207
2020-07-07 10:46:32 +01:00
Clayton Walker 7fee70a625 Rename NoneOfNestedConditions to NoneNestedConditions in example docs
See gh-22207
2020-07-07 10:46:20 +01:00
Andy Wilkinson 96e6b74894 Merge branch '2.2.x' into 2.3.x
Closes gh-22243
2020-07-07 09:56:21 +01:00
Andy Wilkinson a0f1424393 Polish "Fix unwrapping of captured PrintStream in test support's OutputCapture"
See gh-22214
2020-07-07 09:54:52 +01:00
XenoAmess 75a64bd901 Fix unwrapping of captured PrintStream in test support's OutputCapture
See gh-22214
2020-07-07 09:53:34 +01:00
Andy Wilkinson 28128a9577 Add support for ChronoUnit.WEEKS when using PeriodUnit
Fixes gh-22225
2020-07-06 19:57:26 +01:00
Andy Wilkinson d1f074858e Correct class name of StringToPeriodConverterTests 2020-07-06 15:59:32 +01:00
Andy Wilkinson 2007490ce7 Merge branch '2.2.x' into 2.3.x
Closes gh-22234
2020-07-06 14:24:53 +01:00
Andy Wilkinson 4301580095 Improve testing of PropertyPlaceholderAutoConfiguration
Since Spring Framework 4.3.0.RC2, a default embedded value resolver
has been registered with the bean factory when one is not otherwise
configured. This meant that placeholders in `@Value` would be resolved
with or without PropertyPlaceholderAutoConfiguration defining a
PropertySourcesPlaceholderConfigurer bean. However, placeholders in
bean definitions would only be resolved if a
PropertySourcesPlaceholderConfigurer was defined.

This commit updates PropertyPlaceholderAutoConfigurationTests to align
with this change in Framework. We now test that placeholders are
resolved in `@Value` annotations with or without the auto-configuration
and that placeholders in bean definitions are only resolved with the
auto-configured.

Closes gh-22230
2020-07-06 14:24:36 +01:00
anshlykov 683a7a851f Update to Maven Shade Plugin 3.2.4
See gh-22227
2020-07-06 09:51:08 +01:00
Andy Wilkinson dfea2f432a Polish
See gh-21921
2020-07-06 09:41:39 +01:00
Brian Clozel 86d8366ee2 Polish support for reactive Elasticsearch healthcheck
Fixes gh-21042
2020-07-03 15:25:18 +02:00
Aleksander Lech 203878a16f Add support for reactive Elasticsearch healthcheck
Prior to this commit, configuring a reactive Elasticsearch client would
auto-configure an Actuator Health check using a synchronous client, with
the default configuration properties (so tarting localhost:9200).

This would lead to false reports of unhealthy Elasticsearch clusters
when using reactive clients.

This commit reproduces the logic for MongoDB repositories: if a reactive
variant is available, it is selected for the health check
infrastructure.

See gh-21042
2020-07-03 15:16:38 +02:00
Andy Wilkinson 79770b9615 Use source sets to determine configurations deprecated for resolution
Fixes gh-22200
2020-07-02 15:14:00 +01:00
Andy Wilkinson f6b3666b16 Merge branch '2.2.x' into 2.3.x
Closes gh-22197
2020-07-02 10:40:54 +01:00
Andy Wilkinson 21453b5016 Ignore scoped targets when finding matching beans
Fixes gh-22038
2020-07-02 10:39:56 +01:00
Andy Wilkinson 81d6751ba7 Use ApplicationContextRunner in ConditionalOnSingleCandidateTests 2020-07-02 10:10:28 +01:00
Eddú Meléndez 54e0a61b42 Reinstate metrics for Kafka Streams
See gh-21921
2020-07-01 14:03:11 +01:00
Andy Wilkinson d64337013f Upgrade to Spring Kafka 2.5.3.RELEASE
Closes gh-22185
2020-07-01 14:01:39 +01:00
Andy Wilkinson 9360ba168b Upgrade to Reactor Dysprosium-SR9
Closes gh-21938
2020-07-01 11:51:54 +01:00
Andy Wilkinson a13acf9f2b Upgrade to Reactor Dysprosium-SR9
Closes gh-21937
2020-07-01 11:49:39 +01:00
Andy Wilkinson 9317135690 Improve error handling when builder image isn't a builder
Fixes gh-22179
2020-07-01 11:42:36 +01:00
Andy Wilkinson 0e1ded6893 Merge branch '2.2.x' into 2.3.x
Closes gh-22175
2020-06-30 17:39:52 +01:00
dreis2211 8c0e302f2e Accept empty filter dispatcher types in auto-configurations
Prior to this commit, the usage of EnumSet.copyOf resulted in exceptions when
the underlying collection was empty.

See gh-22138
2020-06-30 17:39:21 +01:00
Andy Wilkinson 4566ac5c25 Add package info to o.s.b.autoconfigure.elasticsearch.rest
Closes gh-22147
2020-06-30 17:01:21 +01:00
Andy Wilkinson 75fc140e2d Merge branch '2.2.x' into 2.3.x
Closes gh-22167
2020-06-30 14:09:57 +01:00
Andy Wilkinson 3922fb7164 Polish "Avoid NPE when binder is closed before started event"
See gh-22141
2020-06-30 13:26:30 +01:00
im47cn b34c268547 Avoid NPE when binder is closed before started event
Previously, if TomcatMetricsBinder destroy() was called before it had
received an ApplicationStartedEvent an NPE would be thrown due to
TomcatMetrics being null. This NPE was then caught and logged at
warning level by the disposable bean adapter.

This prevents the NPE by checking that the TomcatMetrics instance is
null before calling close() on it.

See gh-22141
2020-06-30 13:23:58 +01:00
Andy Wilkinson f86831da9c Use TCCL at time of access for resource loading
Fixes gh-22119
2020-06-30 10:51:13 +01:00
Madhura Bhave f19f2b8714 Merge branch '2.2.x' into 2.3.x
Closes gh-22155
2020-06-29 17:08:37 -07:00
May c1b9d3c226 Simplify logic in ErrorPage's equals method
See gh-22082
2020-06-29 17:06:49 -07:00
Johnny Lim 43aee1bddd Polish
See gh-22090
2020-06-29 16:35:23 -07:00
Madhura Bhave 62f5e44324 Fix typo 2020-06-29 16:29:09 -07:00
Madhura Bhave 7a81cea513 Update layers.idx file example in docs
Fixes gh-21510
2020-06-29 16:25:23 -07:00
Scott Frederick 9a083584b8 Improve validation of layertools input
This commit improves the validation performed on the user
input provided to the layertools jarmode to provide more
clear error messages when the input is not correct and
reduce the chance of ambiguity.

Fixes gh-22042
2020-06-26 11:51:07 -05:00
Andy Wilkinson a2f7ce0564 Merge branch '2.2.x' into 2.3.x
Closes gh-22102
2020-06-25 10:32:32 +01:00
Andy Wilkinson 5475f10657 Remove WebClient's in-memory buffer size limit for endpoint tests
Previously, the thread dump endpoint's response could exceed
WebClient's in-memory buffer limt when there were a large number of
threads or the threads had large stacks.

This commit disables WebClient's in-memory buffer size limit so that
the test passing is not dependent on the number of active threads and
their stack sizes.

Closes gh-22101
2020-06-25 10:21:43 +01:00
Scott Frederick 72f37c41fb Merge branch '2.2.x' into 2.3.x
Fixes gh-22061 in 2.3.2
2020-06-24 13:37:16 -05:00
Scott Frederick b27303704f Fix RedisReactiveHealthIndicator in clustered configuration
Prior to Spring Data Redis version 2.2.8, the contents of the
Properties object returned from the
ReactiveRedisConnection.ServerCommands.info API were the same
for clustered and non-clustered Redis configurations, containing a set
of key/value pairs. This allowed ReactiveRedisHealthIndicator to get
a version property using a well-known key. Starting with Spring Data
Redis 2.2.8, the info property keys contain a host:port prefix in a
clustered Redis configuration. This prevented
ReactiveRedisHealthIndicator from getting the version property as
before and resulted in the health always being reported as DOWN.

This commit adjusts ReactiveRedisHealthIndicator to detect the
clustered configuration from Spring Data Redis and find the version
property for one of the reported cluster nodes.

Fixes gh-22061
2020-06-24 13:34:22 -05:00
Andy Wilkinson fc2e3770de Merge branch '2.2.x' into 2.3.x
Closes gh-22087
2020-06-24 10:52:55 +01:00
Andy Wilkinson 3fed27fd90 Merge branch '2.1.x' into 2.2.x
Closes gh-22085
2020-06-24 10:17:57 +01:00
Andy Wilkinson 0b4533659f Use Groovy's bom in spring-boot-dependencies
Closes gh-22084
2020-06-24 10:17:06 +01:00
Andy Wilkinson 6215336602 Upgrade to Testcontainers 1.14.3
Closes gh-22069
2020-06-23 10:50:18 +01:00
Andy Wilkinson 345d33c6a1 Upgrade to Maven Shade Plugin 3.2.4
Closes gh-22068
2020-06-23 10:50:17 +01:00
Andy Wilkinson 2d779adca6 Upgrade to Maven Resolver 1.4.2
Closes gh-22067
2020-06-23 10:50:15 +01:00
Andy Wilkinson 12d3f14e15 Use bom plugin to configure spring-boot-parent
Closes gh-21439
2020-06-23 10:43:59 +01:00
Phillip Webb 03b0a373ab Merge branch '2.2.x' into 2.3.x
Closes gh-22063
2020-06-22 23:15:48 -07:00
Phillip Webb e6eb02603c Polish 'Inherit show-details property in health groups'
Rework the inheritance so that the property metadata JSON more
accurately reflects the default value.

See gh-22022
2020-06-22 23:01:37 -07:00
Leo Li 10de88884f Inherit show-details property in health groups
Update `Group` properties so that the `showDetails` value does not
inherit `Show.NEVER`. Prior to this commit, the `Group` properties
would not correctly inherit a `showDetails` value from the main
`management.endpoint.health.show-details` property.

See gh-22022
2020-06-22 22:54:34 -07:00
Phillip Webb f296f57401 Rename ImageReferenceParser to Regex
Rename `ImageReferenceParser` to `Regex` and remove state. The regular
expressions are now used directly by the `ImageName` and
`ImageReference` classes with the values accessed directly from the
`Matcher`.

See gh-21495
2020-06-22 22:36:46 -07:00
Phillip Webb 9843888714 Merge branch '2.2.x' into 2.3.x
Closes gh-22059
2020-06-22 12:14:35 -07:00
Phillip Webb 3b3a49db1f Polish 'Fix infinite loop in FieldValues'
See gh-22040
2020-06-22 12:01:04 -07:00
Konrado85 39a853c57b Fix infinite loop in FieldValues
Update `FieldValues` test object so that it doesn't cause an infinite
loop if it is actually created.

See gh-22040
2020-06-22 11:58:22 -07:00
Andy Wilkinson 73aa8f1434 Enforce spring-boot-parent's platform dependencies
Closes gh-22047
2020-06-22 09:59:21 +01:00
dreis2211 a6e8561391 Catch more generic FileSystemException in NamedPipeSocket
See gh-22035
2020-06-19 15:41:20 -05:00
Johnny Lim b218a89862 Remove Javadoc throw for ConfigurationPropertyName.ofIfValid()
See gh-22018
2020-06-19 14:14:57 +02:00
Stephane Nicoll d5385a7b64 Merge branch '2.2.x' into 2.3.x
Closes gh-22023
2020-06-19 11:37:52 +02:00
Stephane Nicoll 9b803af3c3 Polish "Document how to exclude an annotation processor with Maven"
See gh-22000
2020-06-19 11:36:25 +02:00
Marco Pens 627c0b1031 Document how to exclude an annotation processor with Maven
See gh-22000
2020-06-19 11:35:48 +02:00
Andy Wilkinson 136c9b1af8 Merge branch '2.2.x' into 2.3.x
Closes gh-22020
2020-06-19 08:23:15 +01:00
Andy Wilkinson 1e97ff834e Only consider current context when finding lifecycle processor
Previously, LifecycleAutoConfiguration would check the current context
and all of its ancestors for a lifecycle processor bean, only
configuring a custom processor if one was not found. Every context
has a lifecycle processor so this check meant that lifecycle processing
timeout could not be customized in any context with a parent.

This commit updates the auto-configuration to only check the current
context.

Closes gh-22014
2020-06-19 08:19:57 +01:00
Andy Wilkinson 41173f7c40 Polish "Use Awaitility instead of Thread.sleep"
See gh-21988
2020-06-19 08:18:01 +01:00
Tomek Szmytka c13385ea74 Use Awaitility instead of Thread.sleep
See gh-21988
2020-06-19 08:17:53 +01:00
Scott Frederick 28643e4d2d Validate image references before passing to CNB builder
Prior to this commit, an image name or run image name derived from
the project name or provided by the user would be passed to the CNB
builder without validation by the Maven plugin build-image goal or
Gradle plugin bootBuildImage task. This could lead to error messages
from the plugins that are difficult to understand and diagnose.

This commit makes parsing of the image names more strict, based on
the grammar implemented by the Docker go library. This provides
validation of the image names before passing them to the builder,
with a more descriptive error message when parsing and validation
fails.

Fixes gh-21495
2020-06-18 15:09:57 -05:00
Andy Wilkinson 67604a5416 Only process main metadata as it already includes additional metadata
Previously, the configuration property table generation was reading
both the main metadata and the additional metadata from each project.
This was unnecessary as the annotation processor will have already
merged the additional metadata into the main metadata before writing
it to disk. Processing both the main and additional metadata led to
a clash as the metadata overlapped. When the entry in the additional
metadata won the clash, the resulting entry in the configuration
property table would lose any details that aren't contained in the
additional metadata.

This commit updates the property table generation code to only use
the main metadata files.

Fixes gh-21131
2020-06-18 15:49:34 +01:00
Andy Wilkinson ce907b129c Merge branch '2.2.x' into 2.3.x
Closes gh-22010
2020-06-18 11:03:32 +01:00
Andy Wilkinson 1b62abab9a Configure context on SizeAndTimeBasedRollingPolicy
Previously, when file-based logging was enabled, Logback would output
the following during logging system initialization:

LOGBACK: No context given for c.q.l.core.rolling.SizeAndTimeBasedRollingPolicy

This commit updates the default logback configuration to set the
context on the SizeAndTimeBasedRollingPolicy that it creates.

Fixes gh-21056
2020-06-18 11:01:26 +01:00