Commit Graph

23707 Commits

Author SHA1 Message Date
Phillip Webb 985220608a Merge branch '2.1.x'
Closes gh-18720
2019-10-23 18:07:53 -07:00
Phillip Webb eda4a212fe Upgrade CI to JDK 8u232-b09
Closes gh-18715
2019-10-23 18:07:11 -07:00
Phillip Webb c5eefef90d Merge branch '2.1.x'
Closes gh-18719
2019-10-23 18:04:11 -07:00
Phillip Webb f07e01686d Upgrade CI to use JDK 11.0.5
Closes gh-18717
2019-10-23 18:03:24 -07:00
Phillip Webb 1d3b42ed30 Merge pull request #18718 from pdeneve
* pr/18718:
  Polish documentation

Closes gh-18718
2019-10-23 17:58:27 -07:00
Philippe De Neve 8f990d97ab Polish documentation
* Remove double occurrence of InfluxDbHealthIndicator.
* Fix JUnit 5 `@ExtendWith` references
* Use consistent casing of HtmlUnit.

See gh-18718
2019-10-23 17:56:00 -07:00
Phillip Webb c5138c56ff Restore AbstractRoutingDataSource health support
Update `DataSourceHealthContributorAutoConfiguration` so that any
`AbstractRoutingDataSource` beans are still included in the overall
health. Prior to this commit, a regression in Spring Boot 2.2 meant
that if a single routing bean was found an `IllegalArgumentException`
would be thrown.

In Spring Boot 2.1 all `AbstractRoutingDataSource` would be filtered
from the results, but if no results existed the following was returned:

  "details": {
    "db": {
      "status": "UNKNOWN"
    },

In Spring Boot 2.2 we now always include routing datasource beans, even
if other non-routing database beans are found. The health details
includes `"routing" : true` to help users disambiguate any results.

Fixes gh-18661
2019-10-23 15:14:51 -07:00
Phillip Webb ba30ee03df Improve health contributor null support
Update `NamedContributorsMapAdapter` to check for `null` keys or values
during construction. Also update `HealthEndpointSupport` to allow
null component entries.

See gh-18687
2019-10-23 15:14:51 -07:00
Phillip Webb 7c9ac03014 Filter empty health contributions
Update `HealthEndpointSupport` so that aggregate elements that don't
ultimately provide a contribution are filtered out. Prior to this
commit an NPE was returned when calculating the aggregate status.

Fixes gh-18687
2019-10-23 15:14:51 -07:00
Stephane Nicoll 6378863771 Merge pull request #18702 from AlexFalappa
* pr/18702:
  Make optimizedLaunch property name more consistent

Closes gh-18702
2019-10-23 18:25:31 +02:00
Alessandro Falappa 2c199b1296 Make optimizedLaunch property name more consistent
See gh-18702
2019-10-23 18:24:33 +02:00
Stephane Nicoll 8eecc911fb Merge branch '2.1.x'
Closes gh-18713
2019-10-23 18:18:08 +02:00
Stephane Nicoll b06c9f4458 Merge pull request #18705 from nkjackzhang
* pr/18705:
  Fix typos

Closes gh-18705
2019-10-23 18:17:26 +02:00
nkjackzhang 6ef39d6b91 Fix typos
See gh-18705
2019-10-23 18:16:24 +02:00
Stephane Nicoll 31a7ace38f Merge pull request #18697 from izeye
* pr/18697:
  Polish

Closes gh-18697
2019-10-23 10:10:18 +02:00
Johnny Lim 8c2d6b28f8 Polish
See gh-18697
2019-10-23 10:09:56 +02:00
Stephane Nicoll ce8360dc95 Merge pull request #18689 from dreis2211
* pr/18689:
  Fix Mockito deprecations

Closes gh-18689
2019-10-23 09:49:46 +02:00
dreis2211 8ecdf919f8 Fix Mockito deprecations
See gh-18689
2019-10-23 09:49:33 +02:00
Phillip Webb 511a2a073f Merge branch '2.1.x'
Closes gh-18695
2019-10-22 16:20:05 -07:00
Phillip Webb b61b7b078a Merge pull request #18566 from rhamedy
* pr/18566:
  Rename `max-http-post-size` server property

Closes gh-18566
2019-10-22 16:04:16 -07:00
Rafiullah Hamedy 81dc6e02e6 Rename `max-http-post-size` server property
Rename `max-http-post-size` to `max-http-form-post-size` for Jetty and
Tomcat to make it clearer that they only apply to POSTed form content.

See gh-18566
2019-10-22 16:00:43 -07:00
Phillip Webb 83d4d94e8b Cache ModifiedClassPathClassLoaders
Closes gh-18694
2019-10-22 15:25:31 -07:00
Phillip Webb 8d08d654d1 Merge branch '2.1.x'
Closes gh-18693
2019-10-22 15:18:32 -07:00
Phillip Webb 63f60fc5d9 Merge pull request #18536 from dreis2211
* pr/18536:
  Polish "Upgrade to Jetty 9.4.21.v20190926"
  Upgrade to Jetty 9.4.21.v20190926

Closes gh-18536
2019-10-22 14:57:13 -07:00
Phillip Webb d0d55d3c0a Polish "Upgrade to Jetty 9.4.21.v20190926"
See gh-18536
2019-10-22 14:54:43 -07:00
dreis2211 eae2cf170d Upgrade to Jetty 9.4.21.v20190926
See gh-18536
2019-10-22 14:53:41 -07:00
Phillip Webb 374a8cadad Merge branch '2.1.x'
Closes gh-18691
2019-10-22 13:20:42 -07:00
Phillip Webb 867c4a14cb Clarify Javadoc for ServletContextInitializer
Closes gh-18660
2019-10-22 13:16:02 -07:00
Phillip Webb 714c9b9804 Polish 2019-10-22 13:12:09 -07:00
Stephane Nicoll 89d903d89a Fix typo in devtools example
Closes gh-18679
2019-10-22 17:51:30 +02:00
Stephane Nicoll 7a8088d7a2 Merge pull request #18673 from nosan
* pr/18673:
  Polish "Apply dependsOn semantic between Liquibase and JPA"
  Apply dependsOn semantic between Liquibase and JPA

Closes gh-18673
2019-10-22 17:47:43 +02:00
Stephane Nicoll dccb842286 Polish "Apply dependsOn semantic between Liquibase and JPA"
See gh-18673
2019-10-22 17:44:04 +02:00
Dmytro Nosan bacd36f0cf Apply dependsOn semantic between Liquibase and JPA
This commits restores the dependency between Liquibase and the JPA
EntityManager even if a custom `SpringLiquibase` is configured.

See gh-18673
2019-10-22 17:43:28 +02:00
Stephane Nicoll d254c62712 Polish tests 2019-10-22 14:27:25 +02:00
Stephane Nicoll 6e6f4f763c Remove useless attribute override
This commit removes the override proxyBeanMethods as the aliased
attribute is taking precedence.
2019-10-22 14:04:20 +02:00
Stephane Nicoll 4d5d90847e Merge branch '2.1.x'
Closes gh-18682
2019-10-22 09:41:04 +02:00
Stephane Nicoll 429eec0bcf Merge pull request #18604 from wycm
* pr/18604:
  Optimize debug level logs

Closes gh-18604
2019-10-22 09:40:33 +02:00
wycm 681a94b0d5 Optimize debug level logs
See gh-18604
2019-10-22 09:36:48 +02:00
Stephane Nicoll ab2d06c0eb Merge pull request #18632 from polarbear567
* pr/18632:
  Polish "Add missing package-info files"
  Add missing package-info files

Closes gh-18632
2019-10-22 09:35:34 +02:00
Stephane Nicoll c05f88bf78 Polish "Add missing package-info files"
See gh-18632
2019-10-22 09:35:10 +02:00
Leo Li af114c93ee Add missing package-info files
See gh-18632
2019-10-22 09:30:04 +02:00
Stephane Nicoll 5b5280b0a2 Merge pull request #18637 from AlexFalappa
* pr/18637:
  Narrow type for Tomcat 'locale' and 'encoding' properties

Closes gh-18637
2019-10-22 09:24:21 +02:00
Alessandro Falappa f28af3db9f Narrow type for Tomcat 'locale' and 'encoding' properties
See gh-18637
2019-10-22 09:22:48 +02:00
Stephane Nicoll afc87b74ef Merge pull request #18675 from nosan
* pr/18675:
  Polish "Restore proxying of @Bean methods in @TestConfiguration"
  Restore proxying of @Bean methods in @TestConfiguration

Closes gh-18675
2019-10-22 09:16:01 +02:00
Stephane Nicoll fd94608f73 Polish "Restore proxying of @Bean methods in @TestConfiguration"
See gh-18675
2019-10-22 09:13:00 +02:00
Dmytro Nosan 7faa606920 Restore proxying of @Bean methods in @TestConfiguration
See gh-18675
2019-10-22 09:10:05 +02:00
Stephane Nicoll bd4dc1ef2a Merge branch '2.1.x'
Closes gh-18669
2019-10-21 09:19:50 +02:00
Stephane Nicoll 91f4300fee Merge pull request #18665 from xiaokeliu666
* pr/18665:
  Polish

Closes gh-18665
2019-10-21 09:19:28 +02:00
xiaokeliu666 57c64eb3bc Polish
See gh-18665
2019-10-21 09:15:16 +02:00
Andy Wilkinson 03f5791860 Merge branch '2.1.x'
Closes gh-18650
2019-10-18 10:37:39 +01:00