Commit Graph

16316 Commits

Author SHA1 Message Date
Stephane Nicoll d14cd2cbae Upgrade to Spring Framework 5.0.5.RELEASE
Closes gh-12340
2018-04-03 23:00:25 +02:00
Stephane Nicoll f424297fef Upgrade to Reactor Bismuth SR8
Closes gh-12698
2018-04-03 22:59:43 +02:00
Stephane Nicoll 8210e3d85e Merge branch '1.5.x' 2018-04-03 22:59:02 +02:00
Stephane Nicoll 249af7d5aa Upgrade to Spring Framework 4.3.15
Closes gh-12344
2018-04-03 22:58:13 +02:00
Madhura Bhave fa4a3ab308 Don't force snapshot update for integration tests
See if that fixes intermittent NoClassDefFoundError.

See gh-12689
2018-04-03 12:04:20 -07:00
Andy Wilkinson e5f27c60f2 Merge branch '1.5.x' 2018-04-03 17:37:32 +01:00
Andy Wilkinson 288e71b6c1 Upgrade to GemFire 8.2.9
Closes gh-12748
2018-04-03 17:37:01 +01:00
Andy Wilkinson 195a66f009 Upgrade to Hibernate Validator 6.0.9.Final
Closes gh-12746
2018-04-03 16:05:11 +01:00
Andy Wilkinson d5caddf4ca Upgrade to Rxjava 1.3.8
Closes gh-12745
2018-04-03 16:05:10 +01:00
Andy Wilkinson 16f5f8d53c Upgrade to Lettuce 5.0.3.RELEASE
Closes gh-12744
2018-04-03 16:05:09 +01:00
Andy Wilkinson e20fcf0e17 Merge branch '1.5.x' 2018-04-03 16:01:29 +01:00
Andy Wilkinson dee8750aff Stop Jetty in Jetty8JettyEmbeddedServletContainerFactoryTests
Closes gh-12734
2018-04-03 15:53:00 +01:00
Andy Wilkinson edc00eef24 Ensure that Tomcat is completely stopped when its initialization fails
Closes gh-12736
2018-04-03 15:53:00 +01:00
Andy Wilkinson 30de75c75c Ensure that Jetty is completely stopped when it fails to start
Closes gh-12735
2018-04-03 15:53:00 +01:00
Stephane Nicoll 6c61cbf5f7 Merge pull request #12711 from ruifigueira:feature/test-property-values-doc
* pr/12711:
  Remove outdated reference to `EnvironmentTestUtils`
2018-04-03 14:12:18 +02:00
Rui Figueira 958aa5db55 Remove outdated reference to `EnvironmentTestUtils`
Documentation still refers to the now deprecated `EnvironmentTestUtils`
class instead of `TestPropertyValues` for setting environment values in
tests.

This commit replaces it with `TestPropertyValues` and provides an
equivalent code example.

Closes gh-12711
2018-04-03 14:10:35 +02:00
Andy Wilkinson 72cf471e83 Merge branch '1.5.x' 2018-04-03 10:55:06 +01:00
Andy Wilkinson 399455f65a Merge pull request #12715 from Wenwei Liao
* gh-12715:
  Polish "Use modifiable set for @ServletComponentScan with no packages"
  Use modifiable set for @ServletComponentScan with no packages
2018-04-03 10:50:36 +01:00
Andy Wilkinson 6078fdaed8 Polish "Use modifiable set for @ServletComponentScan with no packages"
Closes gh-12715
2018-04-03 10:47:28 +01:00
Wenwei Liao 7bec780281 Use modifiable set for @ServletComponentScan with no packages
Previously, when a project contained multiple `@ServletComponentScan`
annotated classes in classpath, and at least one annotation don't
explicitly specify `basePackages` and `basePackageClass` attribute,
the application could fail to start with an
UnsupportedOperationException. The failure occurred due to the
creating of an unmodifiable set when no base packages are configured
and a subsequent attempt to add base packages to that sit.

This commit fixes the issue by removing the use of an unmodifiable set
when `@ServletComponentScan` with no base packages in processed before
any other `@ServletComponentScan` annotations.

See gh-12715
2018-04-03 10:47:18 +01:00
Stephane Nicoll b6f9b46be8 Only create a WebTestClient with WebFlux
This commit updates WebTestClientAutoConfiguration to only create a
WebTestClient when running a WebFlux-based application as mocking the
context only works with that mode at the moment.

Closes gh-12318
2018-04-03 11:31:37 +02:00
Stephane Nicoll 5bf4a5fa98 Merge pull request #12683 from jkschneider:gh-12676
* pr/12683:
  Polish "Remove HierarchicalNameMapper as a configured @Bean"
  Remove HierarchicalNameMapper as a configured @Bean
2018-04-03 11:23:48 +02:00
Stephane Nicoll 7dbeaaa932 Polish "Remove HierarchicalNameMapper as a configured @Bean"
Closes gh-12683
2018-04-03 11:23:05 +02:00
Jon Schneider 8572a091b8 Remove HierarchicalNameMapper as a configured @Bean
HierarchicalNameMapper is not a component that can be shared amongst
multiple monitoring systems.

See gh-12683
2018-04-03 11:14:43 +02:00
Stephane Nicoll 7c36c00331 Fix default HierarchicalNameMapper implementation for Graphite
Closes gh-12557
2018-04-03 10:39:14 +02:00
Stephane Nicoll 958f3d5bf5 Merge pull request #12725 from izeye:destroy-method
* pr/12725:
  Remove destroyMethod attribute in @Bean for MeterRegistry
2018-04-03 10:14:19 +02:00
Johnny Lim 4ab439856c Remove destroyMethod attribute in @Bean for MeterRegistry
Closes gh-12725
2018-04-03 10:14:13 +02:00
Andy Wilkinson 3568019118 Merge branch '1.5.x' 2018-04-03 09:07:38 +01:00
Andy Wilkinson 2fd177f923 Upgrade to Spring Security 4.2.5.RELEASE
Closes gh-12731
2018-04-03 09:06:36 +01:00
Andy Wilkinson 3b2ecd7884 Upgrade to Groovy 2.4.15
Closes gh-12730
2018-04-03 09:06:36 +01:00
Stephane Nicoll 373e741a79 Merge pull request #12722 from attilapapai:master
* pr/12722:
  Add space between right parentheses and next word
2018-04-03 10:05:56 +02:00
Attila Pápai 95385cecba Add space between right parentheses and next word
Closes gh-12722
2018-04-03 10:05:32 +02:00
Stephane Nicoll 18a860d969 Merge pull request #12697 from graben:docu-fix
* pr/12697:
  Fix outdated import statements
2018-04-03 09:59:03 +02:00
Benjamin Graf 101a42c572 Fix outdated import statements
Closes gh-12697
2018-04-03 09:58:15 +02:00
Madhura Bhave 8e81f0c23d Fix conditions report message for same short name
If two auto-configuration classes with the same name are present,
the conditions report message now uses the fully qualified name for
both instead of the short name.

Fixes gh-11710
2018-04-02 12:57:28 -07:00
Madhura Bhave 270ee6dd2c Configure RequestContextFilter in mgmt context
Closes gh-12546
2018-04-02 11:16:46 -07:00
Phillip Webb a657a28f58 Fix properties unicode value decoding
Fix a range error when checking for unicode hex chars.

Fixes gh-12716
2018-04-02 10:12:42 -07:00
Phillip Webb 6831628f6f Merge branch '1.5.x' 2018-04-02 09:52:16 -07:00
Phillip Webb a20df82067 Polish 2018-04-02 09:51:42 -07:00
Phillip Webb 47a56616ae Merge branch '1.5.x' 2018-04-02 09:51:03 -07:00
Phillip Webb ecfc8d73f1 Be defensive when clearing caches for restart
Update `Restarter` to be much more defensive when attempting to clear
caches. We now use `clearCache()` methods whenever possible, and only
fall back to field access when absolutely necessary. In addition field
access now ignore any exceptions.

Fixes gh-12719
2018-04-02 09:43:03 -07:00
Stephane Nicoll c90806477c Fix outdated reference to DurationUnit
Closes gh-12708
2018-04-02 16:06:03 +02:00
Madhura Bhave 821af30277 Add missing javadoc for Bindable
Closes gh-12643
2018-03-30 12:48:15 -07:00
Andy Wilkinson f108224b22 Start building against Spring Data Kay SR6 snapshots
See gh-12696
2018-03-30 08:38:22 +01:00
Andy Wilkinson feda2d7873 Merge branch '1.5.x' 2018-03-30 08:37:02 +01:00
Andy Wilkinson 4e0afaf4c2 Start building against Spring Data Ingalls SR11 snapshots
See gh-12695
2018-03-30 08:36:21 +01:00
Andy Wilkinson 24da1dc97e Start building against Spring Security 5.0.4 snapshots
See gh-12694
2018-03-30 08:34:13 +01:00
Andy Wilkinson 29c03da7df Start building against Spring Integration 5.0.4 snapshots
See gh-12693
2018-03-30 08:30:45 +01:00
Andy Wilkinson 40afe3c659 Merge branch '1.5.x' 2018-03-30 08:29:26 +01:00
Andy Wilkinson 87da2e70d9 Start building against Spring Integration 4.3.15 snapshots
See gh-12692
2018-03-30 08:28:11 +01:00