Commit Graph

15524 Commits

Author SHA1 Message Date
Stephane Nicoll
fd0293cd5c Merge pull request #12106 from jkschneider:simple-enable
* pr/12106:
  Polish "Restore behavior of management.metrics.export.simple.enabled"
  Restore behavior of management.metrics.export.simple.enabled
2018-02-19 10:44:54 +01:00
Stephane Nicoll
1dab83adaa Polish "Restore behavior of management.metrics.export.simple.enabled"
Closes gh-12106
2018-02-19 10:44:09 +01:00
Jon Schneider
da759f29d0 Restore behavior of management.metrics.export.simple.enabled
See gh-12106
2018-02-19 10:08:22 +01:00
Andy Wilkinson
19ce68d2d8 Prefix endpoint's path to controller endpoint mappings with no path
Previously, if a controll endpoint included a mapping with no path,
it would be mapped to the root of the application rather than the
root of the endpoint's path.

This commit updates the handler mappings for both reactive and Servlet
web applications to treat a mapping with no paths as being a mapping
with a single empty path. This ensures that a path with the endpoint's
path prepended is used for the mapping.

Closes gh-12104
2018-02-18 19:53:57 +00:00
Andy Wilkinson
da5bebf574 Revert "Use Jersey BOM in dependency management"
This reverts commit da7bf05c87.

Closes gh-12103
2018-02-18 09:52:19 +00:00
Stephane Nicoll
7ace46e7e3 Merge pull request #12098 from sbraconnier:master
* pr/12098:
  Add JODConverter support
2018-02-17 10:38:10 +01:00
Simon Braconnier
1a238bae29 Add JODConverter support
Closes gh-12098
2018-02-17 10:34:23 +01:00
Phillip Webb
1d83e87bcd Validate @ConfigurationProperties on @Bean methods
Refactor `ConfigurationPropertiesBindingPostProcessor` to allow JSR-303
validation on `@ConfigurationProperties` defined at the `@Bean` method
level.

JSR-303 validation is now applied when a JSR-303 implementation is
available and `@Validated` is present on either the configuration
properties class itself or the `@Bean` method that creates it.

Standard Spring validation is also supported using a validator bean
named `configurationPropertiesValidator`, or by having the configuration
properties implement `Validator`.

The commit also consolidates tests into a single location.

Fixes gh-10803
2018-02-16 18:11:54 -08:00
Phillip Webb
9e75680e6f Polish 2018-02-16 18:11:54 -08:00
Madhura Bhave
d2039128b5 Merge branch '1.5.x' 2018-02-16 16:55:55 -08:00
Madhura Bhave
75e82e1b2c Fix tests to use GET to bypass CsrfFilter 2018-02-16 16:49:38 -08:00
Madhura Bhave
48d8a4a117 Merge branch '1.5.x' 2018-02-16 14:52:21 -08:00
Madhura Bhave
4e61136948 Enable CSRF protection by default
See gh-11758
2018-02-16 14:43:50 -08:00
Brian Clozel
db7268b841 Fix TestRestTemplate request factory management
This commit fixes two issues in `TestRestTemplate`:

* it improves the detection of the underlying request factory, using
reflection to look inside the intercepting request factory if
interceptors were configured

* it avoids reusing the same request factory when creating a new
`TestRestTemplate` with `withBasicAuth`. Sharing the same instance would
result in sharing authentication state (HTTP cookies). Since the
original request factory can't be detected consistently, a new one is
selected automatically

See gh-8697
2018-02-16 22:36:20 +01:00
Madhura Bhave
51de220b55 Enable CSRF protection by default
Fixes gh-11758
2018-02-16 13:31:51 -08:00
Andy Wilkinson
c5f4f45fe9 Add Spring IDE's Boot support to Eclipe setup
Closes gh-12081
2018-02-16 21:01:23 +00:00
Andy Wilkinson
d1714a5c2a Upgrade to Hazelcast 3.9.3
Closes gh-12094
2018-02-16 20:32:14 +00:00
Andy Wilkinson
e450332a7c Merge pull request #12068 from Jon Schneider
* gh-12068:
  Polish "Add auto-configuraton for exporting metrics to Wavefront"
  Add auto-configuration for exporting metrics to Wavefront
2018-02-16 20:30:52 +00:00
Andy Wilkinson
c1c162ab0c Polish "Add auto-configuraton for exporting metrics to Wavefront"
Closes gh-12068
2018-02-16 20:30:31 +00:00
Jon Schneider
142dbb2213 Add auto-configuration for exporting metrics to Wavefront
See gh-12068
2018-02-16 20:00:45 +00:00
Andy Wilkinson
46eb88c299 Use Spring Session's bom for its dependency management
Closes gh-11853
2018-02-16 17:40:40 +00:00
Andy Wilkinson
17c7f027e0 Add details of the request mapping conditions to mappings endpoint
Closes gh-12080
2018-02-16 17:36:06 +00:00
Andy Wilkinson
2c19257d6d Add HandlerMethod and HandlerFunction details to mappings endpoint
Closes gh-11864
2018-02-16 17:08:47 +00:00
Brian Clozel
7ed4273fc3 Fix Redis Cache tests after key prefix changes
Update Redis Cache tests after changes in DATAREDIS-715.
2018-02-16 14:43:45 +01:00
Stephane Nicoll
99466e7fa6 Polish 2018-02-16 14:04:44 +01:00
Stephane Nicoll
e2cb5349ba Merge micrometer docs
Closes gh-11930
2018-02-16 13:53:53 +01:00
Brian Clozel
03a6f97e76 TestRestTemplate should not override request factory
Previously `TestRestTemplate` would override the configured
`ClientHttpRequestFactory` if the Apache HTTP client library was on
classpath.

This commit fixes two issues:

1. The existing `ClientHttpRequestFactory` is overridden *only* if it is
using the Apache HTTP client variant, in order to wrap it with the
`TestRestTemplate` custom support

2. Calling `withBasicAuth` will no longer directly use the request
factory returned by the internal `RestTemplate`; if client interceptors
are configured, the request factory is wrapped with an
`InterceptingClientHttpRequestFactory`. If we don't unwrap it,
interceptors are copied/applied twice in the newly created
`TestRestTemplate` instance. For that, we need to use reflection as the
underlying request factory is not accessible directly.

Closes gh-8697
2018-02-16 12:29:47 +01:00
Andy Wilkinson
7872cda8c1 Try building against Spring Security 5.0.2 snapshots again
See gh-11870
2018-02-16 10:03:57 +00:00
Andy Wilkinson
fe4c8f95ed Rename ReactiveWebServerAutoConfiguration
Closes gh-12086
2018-02-16 10:02:35 +00:00
Andy Wilkinson
e72506c353 Protect TomcatMetrics auto-config against early MeterBinder init
Closes gh-11916
2018-02-16 09:07:12 +00:00
Andy Wilkinson
72740f6b59 Merge pull request #12082 from Vedran Pavic
* gh-12082:
  Use Jersey BOM in dependency management
2018-02-16 08:26:17 +00:00
Vedran Pavic
da7bf05c87 Use Jersey BOM in dependency management
Closes gh-12082
2018-02-16 08:25:20 +00:00
Brian Clozel
7a97764539 Update to Reactor Bismuth SNAPSHOTs 2018-02-16 08:45:47 +01:00
Andy Wilkinson
a8899feea3 Merge branch '1.5.x' 2018-02-15 16:23:17 +00:00
Andy Wilkinson
85f45adb9a Upgrade to Plexus Utils 3.0.24
Closes gh-12065
2018-02-15 16:21:25 +00:00
Andy Wilkinson
87953b32b1 Merge pull request #12073 from Sébastien Deleuze
* gh-12073:
  Polish "Add Kotlin support reference documentation"
  Add Kotlin support reference documentation
2018-02-15 15:56:46 +00:00
Andy Wilkinson
d96c570664 Polish "Add Kotlin support reference documentation"
Closes gh-12073
2018-02-15 15:55:48 +00:00
sdeleuze
889a06b65b Add Kotlin support reference documentation
See gh-12073
2018-02-15 15:55:42 +00:00
Brian Clozel
0c1aac14a0 Move server.display-name configuration property
The `server.display-name` configuration property is used to configure
the application display name for Servlet-based applications.

This commit moves that property to:
`server.servlet.application-display-name` and keeps the same defaults.

Closes gh-8624
2018-02-15 15:28:28 +01:00
Andy Wilkinson
1dd7aa22b3 Merge pull request #12070 from imgx64
* gh-12070:
  Polish "Document git command to clone the repo on Windows"
  Document git command to clone the repo on Windows
2018-02-15 12:31:42 +00:00
Andy Wilkinson
dcc8a8b5c7 Polish "Document git command to clone the repo on Windows"
See gh-12070
2018-02-15 12:30:57 +00:00
imgx64
f80aa58cc3 Document git command to clone the repo on Windows
Closes gh-12070
2018-02-15 12:30:42 +00:00
Andy Wilkinson
83626c7c12 Polish metrics export auto-configuration tests 2018-02-15 10:46:11 +00:00
Andy Wilkinson
b3c1b25274 Revert "Start building against Spring Security 5.0.2 snapshots"
This reverts commit 4179ed5a35.

See gh-11870
2018-02-15 08:49:38 +00:00
Andy Wilkinson
a1ba2de06b Merge branch '1.5.x' 2018-02-14 17:22:52 +00:00
Andy Wilkinson
145d8d2673 Defer removal of Connectors until after ServletContext initialization
Previously, we removed the Connectors from Tomcat's Service before
the Context was started. The removal of the Connectors is required as
it prevents Tomcat from accepting requests before we're ready to
handle them.

Part of starting the Context is creating and initializing the
ServletContext. ServerProperties uses a ServletContextInitializer to
set the session tracking modes and Tomcat rejects the SSL tracking
mode if there is no SSL-enabled connector available. With the previous
arrangement this led to a failure as the Connectors had been removed
so the SSL-enabled connector could not be found.

This commit updates the embedded Tomcat container to defer the
removal of the Connectors until after the context has been started
but still at a point that is before the Connectors themselves would
have been started.

Closes gh-12058
2018-02-14 17:04:55 +00:00
Andy Wilkinson
c587549a68 Switch from webjars-locator to webjars-locator-core
Closes gh-12060
2018-02-14 16:16:55 +00:00
Brian Clozel
1f8d489e5a Improve reference doc for WebTestClient
Closes gh-11203
2018-02-14 15:39:48 +01:00
Andy Wilkinson
17258eeea3 Upgrade to Selenium 3.9.1
Closes gh-12057
2018-02-14 09:27:42 +00:00
Andy Wilkinson
3963303034 Upgrade to Selenium Htmlunit 2.29.2
Closes gh-12056
2018-02-14 09:27:41 +00:00