Commit Graph

27490 Commits

Author SHA1 Message Date
Phillip Webb
d49a1024bd Merge branch '1.5.x' 2018-04-04 15:35:20 -07:00
Phillip Webb
6b59814cbc Switch error views to use SimpleEvaluationContext
Update `ErrorMvcAutoConfiguration` to use `SimpleEvaluationContext`
rather than `StandardEvaluationContext`.

Fixes gh-12507
2018-04-04 15:34:02 -07:00
Phillip Webb
696aedaef8 Merge branch '1.5.x' 2018-04-04 14:51:16 -07:00
Phillip Webb
624a5f8260 Apply URL decoding for nested jar entry names
Update `JarURLConnection` to apply URL decoding to nested jar entry
names.

Fixes gh-12765
2018-04-04 14:49:06 -07:00
Brian Clozel
799e1ba077 Upgrade to Netty 4.1.23.Final
Closes gh-12764
2018-04-04 23:07:46 +02:00
Phillip Webb
4bb3930d38 Merge branch '1.5.x' 2018-04-04 12:39:36 -07:00
Phillip Webb
f08c496858 Upgrade to Spring Integration 4.3.15
Closes gh-12692
2018-04-04 12:33:45 -07:00
Phillip Webb
3563baf36b Update to Spring Data Ingalls SR11
Closes gh-12695
2018-04-04 12:33:04 -07:00
Phillip Webb
6fb4fba43a Merge branch '1.5.x' 2018-04-04 12:17:57 -07:00
Phillip Webb
dd0866000f Revert "Add text/plain error response support"
This reverts commit 23892e33d6.
2018-04-04 12:06:13 -07:00
Phillip Webb
7242ddae3c Polish 2018-04-04 12:05:08 -07:00
Andy Wilkinson
aa27334671 Run deployment tests on JDK 9 and 10 where possible
Closes gh-10414
2018-04-04 14:48:58 +01:00
Andy Wilkinson
e44bfbea4a Merge branch '1.5.x' 2018-04-04 14:15:52 +01:00
Andy Wilkinson
c4923d6273 Ignore existing output when asserting captured log output
Closes gh-12734
2018-04-04 14:14:45 +01:00
Andy Wilkinson
7b39cdd5c4 Merge branch '1.5.x' 2018-04-04 13:49:18 +01:00
Andy Wilkinson
ac88a60071 Ensure error is sent before Writer or OutputStream is used
Previously, ErrorPageFilter's ErrorResponseWrapper would delaying
sending an error back to the client. In cases where the response's
Writer or OutputStream was accessed and flushed or closed, this could
lead to the wrong response status being sent.

This commit updates ErrorResponseWrapper so that it will send any
capture error to the client before returning the response's Writer or
OutputStream. This ensures that closing the Writer or OutputStream
does not cause the response to be committed with the default response
status rather than the previously captured error status.

Such responses will now include the correct status, but will not be
forwarded to the error controller. Such forwarding is not possible
due to the response already having been committed.

Closes gh-11814
2018-04-04 13:49:08 +01:00
Andy Wilkinson
b951397a7c Upgrade to Spring REST Docs 2.0.1.RELEASE
Closes gh-12681
2018-04-04 12:50:37 +01:00
Brian Clozel
f6d16c8b99 Align WebFluxTags uri support on WebMvcTags
This commit ensures that `WebFluxTags` not only relies on
`BEST_MATCHING_PATTERN_ATTRIBUTE` or request URI to provide the "uri"
tag information.

To avoid cardinality explosion, HTTP not found and redirects are
assigned fixed uri tags.

Closes gh-12685
2018-04-04 11:46:10 +02:00
Stephane Nicoll
ad6a888e47 Polish 2018-04-04 11:29:37 +02:00
Stephane Nicoll
f99752283f Fix relaxed binding examples
Closes gh-12750
2018-04-04 11:29:18 +02:00
Stephane Nicoll
bf06854218 Merge branch '1.5.x' 2018-04-04 11:24:20 +02:00
Stephane Nicoll
1805cc5696 Clarify optional use of ComponentScan
Closes gh-12739
2018-04-04 11:16:11 +02:00
Madhura Bhave
30e3cf4c01 Make sure property mapping exception are swallowed 2018-04-03 16:12:24 -07:00
Madhura Bhave
e5f8078749 Support dots in System environment properties
Fixes gh-12728
2018-04-03 14:37:06 -07:00
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