Commit Graph

4153 Commits

Author SHA1 Message Date
Madhura Bhave fd20618f4b Merge branch '2.0.x' 2018-10-22 21:55:01 -07:00
dreis2211 3fea487c7b Use Errors.hasErrors() in DefaultErrorAttributes
Closes gh-14912
2018-10-22 21:51:21 -07:00
Madhura Bhave 0dc4afdefd Merge branch '2.0.x' 2018-10-22 15:05:16 -07:00
Madhura Bhave d6991e6d91 Fix formatting violation 2018-10-22 15:02:31 -07:00
Madhura Bhave f0004c4ade Merge branch '2.0.x' 2018-10-22 14:57:10 -07:00
dreis2211 5c0d7f4ac0 Avoid creation of unnecessary collections
Closes gh-14916
2018-10-22 14:54:39 -07:00
Phillip Webb 31335bb50f Merge branch '2.0.x' 2018-10-22 14:35:03 -07:00
Phillip Webb 35221c1142 Polish 2018-10-22 14:26:01 -07:00
Phillip Webb de7eeb5014 Fix ResourceUrlEncodingFilter conditions
Fix `ResourceUrlEncodingFilter` conditions which were inadvertently
changed in commits 64f04fce and 6cc272ec and would back off if any
`FilterRegistrationBean` was found.

The updated conditions restores the behavior of Spring Boot 2.0.5 and
allows users to directly register their own `ResourceUrlEncodingFilter`
beans (as long as they don't use a `FilterRegistrationBean`).

Fixes gh-14897
2018-10-22 14:17:49 -07:00
Andy Wilkinson 660b912100 Merge branch '2.0.x' 2018-10-19 18:21:55 +01:00
Andy Wilkinson 2110215559 Provide more detailed uri tag for calls to Data REST repositories
Closes gh-14872
2018-10-19 18:19:58 +01:00
Andy Wilkinson d838787e70 Start building against Spring Data snapshots for Kay-SR12
See gh-14893
2018-10-19 17:52:52 +01:00
Andy Wilkinson 4e27d17b7e Starting building against Spring Session snapshots for Bean-RELEASE
See gh-14733
2018-10-19 17:50:07 +01:00
Andy Wilkinson 6b84fac8f6 Start building against Spring Kafka snapshots for 2.2.0.RELEASE
See gh-14892
2018-10-19 17:50:07 +01:00
Andy Wilkinson 21100d83ae Start building against Spring Integration snapshots for 5.1.0.RELEASE
See gh-14889
2018-10-19 17:50:07 +01:00
Andy Wilkinson e504c6b193 Start building against Spring Data snapshots for Lovelace-SR2
See gh-14888
2018-10-19 17:50:07 +01:00
Andy Wilkinson ad5f308f32 Start building against Spring Batch snapshots for 4.1.0.RELEASE
See gh-14891
2018-10-19 17:50:07 +01:00
Andy Wilkinson 4d9714a0cb Start building against Micrometer snapshots for 1.1.0
See gh-14890
2018-10-19 17:50:07 +01:00
Andy Wilkinson efbc0fc2ca Merge branch '2.0.x' 2018-10-19 11:41:38 +01:00
Andy Wilkinson 76ad197584 Deallocate servlet after forcing initialization in mappings endpoint
Previously, when using Tomcat, a call to mappings endpoint would force
the initialization of any DispatcherServlets in the context. This was
done by calling allocate on Tomcat's StandardWrapper. This left the
wrapper in a state that would cause it to block for two seconds during
shutdown as the wrapper has an outstanding allocation.

This commit immediately deallocates the servlet after it has been
allocated. This ensures that the DispatcherServlet has been initialized
while also leaving the wrapper in a state that it can shut down
immediately when asked to do so.

Closes gh-14898
2018-10-19 10:43:23 +01:00
Andy Wilkinson 22e722d9f9 Polish 2018-10-18 15:51:20 +01:00
Andy Wilkinson cefc7842d6 Merge branch '2.0.x' 2018-10-18 15:38:17 +01:00
Andy Wilkinson 9b8ead825c Polish 2018-10-18 15:38:06 +01:00
Brian Clozel 5bf51f52b9 Fix WebFlux instrumentation after SPR-17395
SPR-17395 ensures that WebFlux.fn is adding a request attribute of type
`PathPattern` on the `HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE`.

A specific tag provider for WebFlux.fn is no longer necessary.

See gh-14876
2018-10-18 14:58:39 +02:00
Brian Clozel 64c9dfe7d6 Upgrade to Spring Framework 5.1.2.BUILD-SNAPSHOT
See gh-14887
2018-10-18 14:58:01 +02:00
Andy Wilkinson 1b0677bdd9 Merge branch '2.0.x' 2018-10-18 11:10:22 +01:00
Andy Wilkinson d5201070e6 Cross-link to Gradle Plugin docs rather than duplicating example
Closes gh-14878
2018-10-18 11:09:16 +01:00
Andy Wilkinson 3995c66b37 Merge branch '2.0.x' 2018-10-18 10:47:46 +01:00
Andy Wilkinson 993c75ea38 Merge branch '1.5.x' into 2.0.x 2018-10-18 10:47:35 +01:00
Andy Wilkinson 3177584588 Back off auto-config of Log4J2Metrics when context is backed by SLF4J
Closes gh-14883
2018-10-18 10:31:10 +01:00
Johnny Lim c8c3f59e93 Polish
Closes gh-14884
2018-10-18 09:36:27 +02:00
Stephane Nicoll 2a0451c461 Merge branch '2.0.x' 2018-10-17 18:06:19 +02:00
Jack Gough 94770cc0fd Force JMX hostname to 127.0.0.1
Closes gh-14836
2018-10-17 18:05:28 +02:00
Stephane Nicoll 6b3a2ac469 Upgrade to Maven Surefire Plugin 2.22.1
Closes gh-14870
2018-10-17 14:38:19 +02:00
Stephane Nicoll 40b56040d2 Upgrade to Spring Amqp 2.1.0.RELEASE
Closes gh-14869
2018-10-17 14:38:18 +02:00
Stephane Nicoll e6f5e8933a Upgrade to Influxdb Java 2.14
Closes gh-14868
2018-10-17 14:38:18 +02:00
Stephane Nicoll c5c646f841 Upgrade to Hibernate 5.3.7.Final
Closes gh-14867
2018-10-17 14:38:18 +02:00
Stephane Nicoll 57c2507db9 Upgrade to Lettuce 5.1.1.RELEASE
Closes gh-14865
2018-10-17 14:31:16 +02:00
Stephane Nicoll bc1c0dc93c Upgrade to Sendgrid 4.3.0
Closes gh-14864
2018-10-17 14:31:15 +02:00
Stephane Nicoll 5e96daab58 Upgrade to Hazelcast 3.10.6
Closes gh-14863
2018-10-17 14:31:15 +02:00
Stephane Nicoll 2c383859f0 Upgrade to Couchbase Client 2.7.0
Closes gh-14862
2018-10-17 14:31:14 +02:00
Stephane Nicoll 474da80b4d Revert "Restructure of security packages"
See gh-14412
2018-10-17 12:22:51 +02:00
Stephane Nicoll 5805c0fc0a Polish "Fix a broken table in doc"
Closes gh-14859
2018-10-17 08:47:10 +02:00
Johnny Lim 9e25fa1247 Fix a broken table in doc
See gh-14859
2018-10-17 08:46:59 +02:00
Stephane Nicoll fd0e8815b1 Polish 2018-10-16 18:00:55 +02:00
Stephane Nicoll 5f2517f889 Auto-configure AppOptics metrics
Closes gh-14819
2018-10-16 17:35:23 +02:00
Stephane Nicoll 3dc74fea4b Polish 2018-10-16 15:55:07 +02:00
Stephane Nicoll 134682a7de Add error metadata for properties removed recently 2018-10-16 15:55:07 +02:00
Andy Wilkinson bd0a41d82d Merge branch '2.0.x' 2018-10-16 13:31:35 +01:00
Andy Wilkinson d4cad5e916 Polish "Servlet path not explicitly required for EndpointRequest"
Closes gh-14503
2018-10-16 13:01:49 +01:00
Stephane Nicoll 620d88e4ed Polish
See gh-14849
2018-10-16 13:50:37 +02:00
Madhura Bhave 0fd873f0f9 Servlet path not explicitly required for EndpointRequest 2018-10-16 11:58:07 +01:00
Brian Clozel 96fc92609d Polish
Closes gh-14849
2018-10-16 12:23:04 +02:00
Daniel Fernández 56c1247bbb Add new config keys for Thymeleaf 3.0.10 features
This commit adds the following configuration properties:

* `spring.thymeleaf.render-hidden-markers-before-checkboxes`
* `spring.thymeleaf.servlet.produce-partial-output-while-processing`
2018-10-16 12:23:04 +02:00
Andy Wilkinson 98d95268e1 Align with changes to CouchbaseReactiveHealthIndicator
Closes gh-14799
2018-10-16 11:14:36 +01:00
Stephane Nicoll 9ade4898ef Polish 2018-10-16 12:03:32 +02:00
Johnny Lim 7f9671fd14 Polish
Closes gh-14843
2018-10-16 11:38:51 +02:00
Stephane Nicoll 39f8b685df Merge branch '2.0.x' 2018-10-16 11:38:39 +02:00
Johnny Lim 47daf96c48 Polish
See gh-14843
2018-10-16 11:37:02 +02:00
Andy Wilkinson c2588f4e33 Upgrade to Spring AMQP 2.0.8.RELEASE
Closes gh-14833
2018-10-16 09:44:21 +01:00
Andy Wilkinson 11afc75b83 Upgrade to Spring Security 5.0.9.RELEASE
Closes gh-14850
2018-10-16 09:44:01 +01:00
Brian Clozel 8397878857 Polish
See gh-12838
2018-10-16 10:35:25 +02:00
Andy Wilkinson d49cc20e79 Rework CouchbaseReactiveHealthIndicator to use DiagnosticsReport
Closes gh-14799
2018-10-16 09:28:42 +01:00
Stephane Nicoll 1e6851cf81 Polish "Remove usages of BasicAuthorizationInterceptor"
Closes gh-14830
2018-10-16 10:21:32 +02:00
dreis2211 8b14754cda Remove usages of BasicAuthorizationInterceptor
See gh-14830
2018-10-16 10:21:32 +02:00
Andy Wilkinson 1163d86f26 Upgrade to Spring Session Apple-SR6
Closes gh-14732
2018-10-16 09:12:40 +01:00
Hanope c3f3240e2c Fix typos
closes gh-14844
2018-10-16 01:04:28 -07:00
Phillip Webb 29707bf75a Complete restructure of security packages
Complete the restructuring of the security auto-configuration
packages by removing the direct import of web configuration from
the main security auto-configuration.

Closes gh-14412
2018-10-16 01:01:11 -07:00
Madhura Bhave f835f82582 Preliminary restructure of security packages
Restructure the security auto-configuration packages to better reflect
the part of the system that the configuration applies to.

See gh-14412
2018-10-16 01:01:10 -07:00
Rahul Narula c078d0cb8a Polish SpringBootJoranConfigurator
Closes gh-14845
2018-10-15 22:05:11 -07:00
Phillip Webb f986a30d2c Rollback to Spring Session Bean-RC1
Rollback to RC1 of Spring Session "Bean" since the GA release has been
pushed back.

See gh-14733
2018-10-15 22:03:16 -07:00
Phillip Webb b8bc4c6f3c Delete deprecated SecurityPrerequisite
Remove `SecurityPrerequisite` which was deprecated in 2.0.6.

See gh-14846
2018-10-15 22:02:09 -07:00
Phillip Webb d558a1a762 Merge branch '2.0.x' 2018-10-15 22:01:25 -07:00
Phillip Webb a12a6f2ade Polish 2018-10-15 21:24:35 -07:00
Phillip Webb 8ecb659a35 Deprecate SecurityPrerequisite
Deprecate `SecurityPrerequisite` interface since we don't support it
in Spring Boot 2.

Closes gh-14846
2018-10-15 21:00:53 -07:00
Phillip Webb 6b37d87497 Allow multiple endpoint PathMapper beans
Update `WebEndpointDiscoverer` and related classes to that multiple
`PathMapper` beans can be registered. Mappers are now tried in order
until one returns a non-null value.

Closes gh-14841
2018-10-15 18:25:42 -07:00
Phillip Webb a5dc004e0b Merge branch '2.0.x' 2018-10-15 15:43:31 -07:00
Phillip Webb cd1c2638e5 Polish 2018-10-15 15:42:15 -07:00
Andy Wilkinson 6765afa19b Upgrade to Spring Security 5.1.1.RELEASE
Closes gh-14730
2018-10-15 23:18:55 +01:00
Andy Wilkinson 9d5d81d36a Upgrade to Micrometer 1.1.0-rc1
Closes gh-14809
2018-10-15 23:12:08 +01:00
Phillip Webb f0f999a27d Merge branch '2.0.x' 2018-10-15 14:47:11 -07:00
Phillip Webb 5d219bcd19 Polish 2018-10-15 14:45:49 -07:00
Stephane Nicoll 31b0fc2368 Upgrade to Spring Integration 5.1.0.RC2
Closes gh-14731
2018-10-15 23:26:20 +02:00
Phillip Webb 765b54830b Merge branch '2.0.x' 2018-10-15 14:23:06 -07:00
Phillip Webb 734e9e4b74 Merge branch '2.0.x' 2018-10-15 14:22:44 -07:00
Stephane Nicoll 45121f225e Fix default property value 2018-10-15 23:20:38 +02:00
Phillip Webb 192340c5ee Upgrade to Spring AMQP 2.0.8.RELEASE
Closes gh-14833
2018-10-15 14:20:16 -07:00
Phillip Webb b25e222136 Retain original case when mapping endpoint paths
Update `MappingWebEndpointPathMapper` to keep the original case rather
than using a lower-case version.

Closes gh-14773
2018-10-15 14:20:16 -07:00
Stephane Nicoll e901a0bd0e Merge branch '2.0.x' 2018-10-15 23:18:26 +02:00
Stephane Nicoll 935d621a42 Fix mapping of Wavefront base properties
Closes gh-14839
2018-10-15 23:18:12 +02:00
Stephane Nicoll 94b2092218 Add base test for StepRegistryPropertiesConfigAdapter 2018-10-15 23:05:54 +02:00
Stephane Nicoll 7c6d61ee10 Update documentation to mention execution id of repackage goal
This commit updates the documentation to reference the default execution
id of the `repackage` goal when a project uses
`spring-boot-starter-parent`.

Closes gh-14835
2018-10-15 22:51:12 +02:00
Brian Clozel 2c3e8de959 Include "trace" info in whitelabel error views
This commit shows the stacktrace information in default WhiteLabel error
views for Spring MVC and Spring WebFlux.

This information is only shown if it is present in the model map, which
depends on the `server.error.include-stacktrace` configuration property.

Closes gh-12838
2018-10-15 22:22:36 +02:00
Andy Wilkinson a70aafd35a Upgrade to Reactor Bismuth-SR12
Closes gh-14838
2018-10-15 21:02:11 +01:00
Andy Wilkinson a9524d32ac Upgrade to Spring Integration 5.0.9.RELEASE
Closes gh-14834
2018-10-15 21:01:55 +01:00
Phillip Webb 3665917d44 Merge branch '2.0.x' 2018-10-15 11:32:09 -07:00
Phillip Webb c306e03112 Support '-' in endpoint names
Update the `EndpointId` constraints to allow '-' in names.

Closes gh-14773
2018-10-15 11:27:30 -07:00
Andy Wilkinson 1e2d5a1382 Auto-configure Micrometer's HumioMeterRegistry
Closes gh-14804
2018-10-15 18:10:35 +01:00
Phillip Webb 9a80e88a73 Merge branch '2.0.x' 2018-10-15 09:52:09 -07:00
Phillip Webb d8b9685635 Support '.' in endpoint names
Update the `EndpointId` constraints to allow '.' in names.

Closes gh-14773
2018-10-15 09:37:44 -07:00
Stephane Nicoll edf4045c3b Add missing tests for Kairos config adapter
Closes gh-14821
2018-10-15 17:55:07 +02:00
Stephane Nicoll ffe5e88d8e Merge branch '2.0.x' 2018-10-15 16:43:32 +02:00
Stephane Nicoll 99a45bdef8 Fix datasource prefix in multiple-datasource configuration doc
Closes gh-13195
2018-10-15 16:42:34 +02:00
Andy Wilkinson e53e8bf79f Merge branch '2.0.x' 2018-10-15 15:29:10 +01:00
Andy Wilkinson 0fedf8d2af Keep Liquibase-specific DataSource open for use by LiquibaseEndpoint
Closes gh-13832
2018-10-15 15:26:26 +01:00
Stephane Nicoll d4ec45e192 Fix javadoc generation 2018-10-15 15:12:52 +02:00
Andy Wilkinson a4eb636913 Merge branch '2.0.x' 2018-10-15 13:58:17 +01:00
Andy Wilkinson 6d98851fb5 Use Couchbase's DiagnosticsReport to determine its health
Previously, Couchbase's health was determined by retrieving the bucket info
from the cluster info. This retrieval could take over one minute in some
cases even when Couchbase is health. This latency is too large for a health
check.

The Couchbase team have recommended the of a Cluster#diagnostics instead.
This provides a much lower latency view of the cluster's health. This
commit updates CouchbaseHealthIndicator to use Cluster#diagnostics while
retaining support, in a deprecated form, for the old info-based mechanism
should anyone want to opt back into that in 2.0.x.

Closes gh-14685
2018-10-15 13:44:42 +01:00
Stephane Nicoll b7b9bf209e Upgrade to Spring Data Kay SR11
Closes gh-14728
2018-10-15 14:15:27 +02:00
Stephane Nicoll 89349c6eb9 Auto-configure KairosDB metrics
Closes gh-14821
2018-10-15 14:13:10 +02:00
Andy Wilkinson 267eff15f1 Merge branch '2.0.x' 2018-10-15 12:24:39 +01:00
Andy Wilkinson ab7c1af3ec Auto-configure SpringSecurityDialect for v5 and deprecate v4
Closes gh-14828
2018-10-15 12:18:40 +01:00
Andy Wilkinson a25e4a860c Upgrade to Thymeleaf Extras Spring Security 3.0.3.RELEASE
Closes gh-14829
2018-10-15 12:02:16 +01:00
Andy Wilkinson eaf38e9355 Upgrade to Spring Data Lovelace-SR1
Closes gh-14729
2018-10-15 11:46:27 +01:00
Stephane Nicoll 0fdf96da3b Upgrade to Spring Framework 5.0.10.RELEASE
Closes gh-14722
2018-10-15 11:26:16 +02:00
Brian Clozel d5236b91ce Polish 2018-10-15 10:59:38 +02:00
artsiom 9e5f171510 Support cachecontrol config property in WebFlux
Closes gh-14724
2018-10-15 10:59:38 +02:00
Stephane Nicoll 66af20f940 Upgrade to Spring Framework 5.0.10.RELEASE
Closes gh-14722
2018-10-15 10:51:14 +02:00
Stephane Nicoll 1103e93b2d Merge branch '2.0.x' 2018-10-15 10:50:43 +02:00
Stephane Nicoll eeb7cab661 Upgrade to Neo4j Ogm 3.1.4
Closes gh-14826
2018-10-15 10:50:06 +02:00
Stephane Nicoll f86ed38abf Upgrade to Groovy 2.5.3
Closes gh-14825
2018-10-15 10:03:42 +02:00
Stephane Nicoll 1a0d53dec0 Replace ReflectionTestUtils usage by hasFieldOrPropertyWithValue
Closes gh-14696
2018-10-15 08:25:10 +02:00
Phillip Webb cfa130b2ef Merge branch '2.0.x' 2018-10-14 19:14:04 -07:00
Hanope 535dd7470f Fix typo in EndpointIdTests
Closes gh-14822
2018-10-14 19:11:56 -07:00
Phillip Webb 3eb877425e Upgrade to Micrometer 1.0.7
Closes gh-14808
2018-10-14 19:07:50 -07:00
Phillip Webb 18319ac276 Remove deprecated Endpoint ID methods
See gh-14773
2018-10-14 13:55:13 -07:00
Phillip Webb 1bf97e9b5e Merge branch '2.0.x' 2018-10-14 13:53:28 -07:00
Phillip Webb a00ee15e16 Use lowercase default endpoint paths
Update `MappingWebEndpointPathMapper` to use the lowercase version of
the endpoint ID when no explicit path mapping has been set. An endpoint
with the ID 'myEndpoint' will now be mapped to the path 'myendpoint'.

See gh-14773
2018-10-14 13:45:05 -07:00
Phillip Webb df5dfbf4be Support mixed case endpoint includes/excludes
Update `ExposeExcludePropertyEndpointFilter` so that mixed case
endpoint IDs are supported. Prior to this commit it was not easy for
an endpoint to be missed by the filter due to the formatting of the
property value.

See gh-14773
2018-10-14 13:45:05 -07:00
Phillip Webb 674a909bab Support mixed case endpoint IDs with enabled
Update `OnEnabledEndpointCondition` so that mixed case endpoint IDs
are supported. Prior to this commit an
`InvalidConfigurationPropertyNameException` would be thrown when trying
to enabled or disable an endpoint with a camel case ID.

See gh-14773
2018-10-14 13:45:05 -07:00
Phillip Webb 138d85477d Support mixed case endpoint IDs with time-to-live
Update the endpoint time-to-live binding logic so that mixed case
endpoint IDs are supported. Prior to this commit an
`InvalidConfigurationPropertyNameException` would be thrown when using
a camel case endpoint ID.

See gh-14773
2018-10-14 13:45:04 -07:00
Phillip Webb 3105a38884 Introduce EndpointID to enforce naming rules
Add an `EndpointID` class to enforce the naming rules that we support
for actuator endpoints. We now ensure that all endpoint names contain
only letters and numbers and must begin with a lower-case letter.

Existing public classes and interfaces have been changes so that String
based `endpointId` methods are deprecated and strongly typed versions
are preferred instead. A few public classes that we're not expecting
to be used directly have been changed without deprecated methods being
introduced.

See gh-14773
2018-10-14 13:45:04 -07:00
Phillip Webb 88ac7f1d65 Polish 2018-10-14 12:43:00 -07:00
Phillip Webb c5786c218d Polish 2018-10-14 11:24:10 -07:00
Andy Wilkinson e151dbf003 Document Jersey metrics' new outcome tag and polish formatting
See gh-12482
2018-10-14 14:21:37 +01:00
Johnny Lim c1ad1f7638 Fix copyright end years
Closes gh-14816
2018-10-14 14:13:19 +01:00
Andy Wilkinson 83692a22da Polish "Use non-reflective APIs to retrieve config prop binding converters"
Closes gh-14657
2018-10-14 14:09:21 +01:00
Dave Syer 2094e54ef2 Use non-reflective APIs to retrieve config prop binding converters
See gh-14657
2018-10-14 14:09:16 +01:00
Stephane Nicoll f96d73f3cc Start building against Micrometer 1.0.7 snapshots
See gh-14808
2018-10-14 10:42:59 +02:00
Andy Wilkinson 6e5310900b Switch from thymeleaf-extras-springsecurity4 to extras-springsecurity5
Closes gh-14806
2018-10-13 19:57:04 +01:00
Andy Wilkinson 1ac48ee876 Merge branch '2.0.x' 2018-10-13 16:56:21 +01:00
Andy Wilkinson b78c7aca3e Allow ALPNServerConnectionFactory to negotiate use of HTTP/1.1
Closes gh-14444
2018-10-13 16:56:10 +01:00
Andy Wilkinson 7ad94299d6 Stop relying on server customizer ordering for Tomcat metrics binding
Closes gh-14784
2018-10-13 11:52:51 +01:00
Andy Wilkinson 2b11ee4389 Auto-configure binding of Micrometer's JettyServerThreadPoolMetrics
Closes gh-14591
2018-10-13 11:52:51 +01:00
Stephane Nicoll 6199af6c0f Polish 2018-10-13 11:19:46 +02:00
Madhura Bhave 6df9555d6a Update micrometer tests following upstream changes 2018-10-12 18:58:11 -07:00
Madhura Bhave ec6e9d205a Merge branch '2.0.x' 2018-10-12 18:24:23 -07:00
Madhura Bhave a86ba6495c Polish 2018-10-12 18:21:39 -07:00
Madhura Bhave 8f91bbeffa Polish 2018-10-12 18:14:36 -07:00
Madhura Bhave 24a8461749 Merge branch '2.0.x' 2018-10-12 17:59:43 -07:00
Madhura Bhave d2ceb8f7da Polish 2018-10-12 17:59:01 -07:00
Stephane Nicoll 8f1729e322 Merge branch '2.0.x' 2018-10-12 16:00:08 +02:00
Stephane Nicoll 798b37805d Polish "Add support for @ResponseStatus in DefaultErrorAttributes"
Closes gh-14744
2018-10-12 15:57:57 +02:00
Michele Mancioppi 17919749db Add support for @ResponseStatus in DefaultErrorAttributes
This commit adds support for @ResponseStatus in DefaultErrorAttributes
mimicking the semantics of @ResponseStatus in SpringMVC.

Throwables annotated with @ResponseStatus handled by
DefaultErrorAttributes will result in the following error attributes:
* 'status' set as the return value of the HttpStatus#value()
  defined as @ResponseStatus#value()
* 'error' set to the default reason phrase of the HttpStatus
  defined as @ResponseStatus#value()
* 'message' defined as the value of @ResponseStatus#reason(),
  or the default HttpStatus's reason phrase if left unspecified

See gh-14744
2018-10-12 15:47:07 +02:00
Stephane Nicoll baf83aec0d Polish "Allow ClassPathResources to be filtered by FilteredClassLoader"
Closes gh-14774
2018-10-12 15:37:25 +02:00
Roy Jacobs d3ca1a7b0e Allow ClassPathResources to be filtered by FilteredClassLoader
See gh-14774
2018-10-12 15:15:16 +02:00
Stephane Nicoll 29c0aa4445 Merge branch '2.0.x' 2018-10-12 14:31:34 +02:00
Stephane Nicoll c0a5e985c2 Upgrade to Thymeleaf 3.0.10.RELEASE
Closes gh-14797
2018-10-12 14:30:42 +02:00
Stephane Nicoll 0ff1b25f52 Polish "Improve Micrometer histogram properties support"
Closes gh-14139
2018-10-12 14:23:21 +02:00
Alexander Abramov c1c79ab1c2 Improve Micrometer histogram properties support
This commit adds configuration properties for Micrometer histogram
settings: "minimumExpectedValue" and "maximumExpectedValue".

See gh-14139
2018-10-12 14:23:21 +02:00
Brian Clozel 5607fcae85 Record URI pattern tag for WebFlux Fn metrics
This commit records URI tags for Spring WebFlux Fn applications for
`http.server.requests` metrics. This is possible since SPR-17098.

Closes gh-12757
2018-10-12 13:57:32 +02:00
Andy Wilkinson 19232ad87a Merge branch '2.0.x' 2018-10-12 11:25:17 +01:00
Andy Wilkinson 861587ec78 Allow @ConditionalOnEnabledEndpoint to be used on any component
Closes gh-14787
2018-10-12 11:24:33 +01:00
Brian Clozel 2588a71ac4 Auto-Configure HTTP ResourceFactories on servers
This commit auto-configures HTTP resource factories on both Reactor
Netty and Jetty server instances. This creates `ReactorResourceFactory`
and `JettyResourceFactory` beans when necessary - those beans can be
reused and applied by the client auto-configuration in order to share
resources between client and server for optimal performance.

The server auto-configuration has the highest precedence, so from now
on, the auto-configured ResourceFactory bean on the client side will be
skipped if a reactive server is configured.

Closes gh-14495
2018-10-12 11:32:55 +02:00
Stephane Nicoll 11efe92ce7 Polish "Configure Cassandra JMX Reporting"
Closes gh-14778
2018-10-12 10:41:47 +02:00
Phillip Webb d102e0d7f7 Introduce Ordered Filter and WebFilter interfaces
Add `Ordered` variants of `javax.servlet.Filter` and
`org.springframework.web.server.WebFilter` mainly so that we can
deprecate `FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER`.

Closes gh-14793
2018-10-11 23:13:23 -07:00
Phillip Webb d6df7cf324 Update copyright year for changed files 2018-10-11 22:39:43 -07:00
Phillip Webb 683e9532d6 Handle servlet startup failures consistently
Ensure that all servlet containers handle servlet startup failures
consistently and throw a `WebServerException` that wraps the original
cause.

Both Undertow and Jetty already dealt with startup failures in this
way, but Tomcat did not. The `TomcatEmbeddedContext` has now been
changed to no longer call `super.loadOnStartup` but instead re-implement
a version of that method that wraps and rethrows the original exception
(as long as `failCtxIfServletStartFails` is `true`, which it now is by
default).

Closes gh-14790
2018-10-11 22:31:40 -07:00
Phillip Webb 4823114e1c Polish 2018-10-11 22:30:49 -07:00
Phillip Webb 3da25c6d36 Remove TomcatEmbeddedContext.overrideLoadOnStart
Remove the reflection tests used to support the older variant of
`overrideLoadOnStart` that returned a void. Since we no longer support
that older version we can simply the code.

Closes gh-14789
2018-10-11 20:22:58 -07:00
Phillip Webb 74d48fb7a7 Merge branch '2.0.x' 2018-10-11 20:20:15 -07:00
Phillip Webb 21ebb94d49 Respect Tomcat's failCtxIfServletStartFails flag
Ensure that if the user has set `failCtxIfServletStartFails` to `true`
using a `ContextCustomizers` any Servlet init exceptions stop the
application from running.

Closes gh-14448
2018-10-11 20:12:01 -07:00
Phillip Webb b09057a73c Fix checkstyle violation
Fix unused import violation introduced during merge.
2018-10-11 17:55:41 -07:00
Phillip Webb 01f7805c19 Merge branch '2.0.x' 2018-10-11 16:19:29 -07:00
Phillip Webb b1399db994 Add a warning about `webDriver` scope to the docs
Update the reference documentation with a warning about the `webDriver`
scope that we create.

Closes gh-13093
2018-10-11 16:17:24 -07:00
Phillip Webb 0d35af1813 Add "Encrypting Properties" documentation
Update the reference documentation with a section about encrypting
properties and a link to Spring Cloud Vault.

Closes gh-13618
2018-10-11 16:03:42 -07:00
Phillip Webb 1c3987d55a Fix documentation of devtools Gradle scope
Update the reference documentation to suggest that devtools uses a
custom `developmentOnly` scope, rather than `compileOnly`.

Closes gh-14451
2018-10-11 15:42:56 -07:00
Phillip Webb 30ab4f9691 Polish "Stop MetricsEndpoint from summing up same metrics"
See gh-14497
2018-10-11 15:31:40 -07:00
pmehra 950480dc1c Stop MetricsEndpoint from summing up same metrics
Update `MetricsEndpoint` so that only the first matching meter is used
when calculating the sum of of statistics.

Prior this this commit the endpoint would consider all Meters. This
caused incorrect statistics when multiple back-end systems were being
used since the registries contained in the `CompositeMeterRegistry`
would be  iterated, and the same effective metric would be counted more
than once.

Closes gh-14497
2018-10-11 15:18:35 -07:00
Madhura Bhave ff35d14170 Change order of loggingCodecCustomizer
It is set to 0 so that users' customizers can be positioned before and
after it.

Fixes gh-14723
2018-10-11 13:40:57 -07:00
Stephane Nicoll 237ea1d6ee Upgrade to Reactor Californium-SR1
Closes gh-14788
2018-10-11 20:33:12 +02:00
Andy Wilkinson 5e3b5ae14f Polish
See gh-14780 and gh-14467
2018-10-11 17:25:54 +01:00
Andy Wilkinson 5f0d7dd6c7 Merge branch '2.0.x' 2018-10-11 17:20:35 +01:00
Andy Wilkinson 2a2908e74e Order MeterFilters and MeterRegistryCustomizers
Closes gh-14780
2018-10-11 17:15:47 +01:00
Brian Clozel 43966c7f93 Configure WebFlux HiddenHttpMethodFilter with property
This commit adds a new configuration property
`"spring.webflux.hiddenmethod.filter.enable"` that enables/disables the
`HttpHiddenMethodFilter` in Spring WebFlux.

Closes gh-14520
2018-10-11 18:15:27 +02:00
artsiom 8f3b58fa98 Replace ReflectionTestUtils usage by hasFieldOrPropertyWithValue
Closes gh-14783
2018-10-11 17:49:37 +02:00
Stephane Nicoll d37df3d718 Add support for customizing Flyway's configuration
Closes gh-14786
2018-10-11 17:45:20 +02:00
Stephane Nicoll e789bc0bb7 Use FluentConfiguration to configure Flyway
This commit stops binding the Flyway object directly to the environment
as mutating it will no longer be supported in Flyway 6.

This commit mirrors Flyway's configuration in FlywayProperties for the
most part.

Closes gh-14776
2018-10-11 17:45:15 +02:00
Andy Wilkinson 1d2f069580 Allow HttpTrace instances to be created
Previously, the API required to create HttpTrace instances was
package-private. This made it difficult to implement an
HttpTraceRepository that persists the HttpTrace instances
rather than holding them in memory as it inhibited recreation of the
instances when they read from the persistent store.

This commit adds public constructors to HttpTrace and related classes
to enable recreation of an HttpTrace. The package-private methods for
mutating properties have not been made public to ensure that the
public API remains immutable.

Closes gh-14726
2018-10-11 14:26:23 +01:00
Andy Wilkinson 459d2943e7 Polish 2018-10-11 12:29:49 +01:00
Andy Wilkinson 85a4fb389d Merge branch '2.0.x' 2018-10-11 11:51:56 +01:00
Andy Wilkinson a296a805c5 Tolerate different quoting of annotation attributes on Java 8 and 9+
Closes gh-13594
2018-10-11 11:51:34 +01:00
Stephane Nicoll 3f4fbe32ff Merge branch '2.0.x' 2018-10-11 11:56:13 +02:00
Stephane Nicoll 81377e2fd5 Invoke Flyway#setCallbacks only if necessary
Closes gh-14775
2018-10-11 11:50:53 +02:00
Andy Wilkinson 9d09a385ba Merge branch '2.0.x' 2018-10-11 10:40:55 +01:00
Andy Wilkinson 6b22cc1581 Revert "Upgrade to Netty 4.1.30.Final"
This reverts commit c9cf78bb69.

See gh-14752
2018-10-11 10:38:33 +01:00
Phillip Webb 85f86243c9 Order class filter checks and exit early
Update the logic in `OnClassCondition` so that filtering exits on the
first missing class. Also refactor the implementation to save
unnecessary `Set` creation when there is just a single class to check.

The `AutoConfigureAnnotationProcessor` has also been updated to order
classes so that any starting `org.springframework` are considered last.
The assumption being that other classes are more likely to be missing.

Closes gh-12131
2018-10-10 22:02:05 -07:00
Phillip Webb b1d4cf4ea8 Fix Neo4J Tests
Update Neo4J tests following SPR-17333 which has broken our previous
method of simulating Embedded Neo4J.

Closes gh-14779
2018-10-10 17:51:41 -07:00
Phillip Webb 33c2d24560 Support ConfigurationProperties BindHandler advise
Allow custom `BinderHandler` advise to be applied to the `Binder` used
for `@ConfigurationProperties`.  This mechanism has been added to allow
Spring Cloud Stream to manipulate `Bindable` instances before binding
occurs.

NOTE: This commit introduces a breaking change to the `BindHandler`
interface since the `onStart` method now returns a `Bindable` rather
than a `boolean`.

Closes gh-14745
2018-10-10 12:40:11 -07:00
Phillip Webb 8da295998b Polish 2018-10-10 12:20:03 -07:00
Phillip Webb 60719bd982 Upgrade to Dropwizard Metrics 4.0.3
Closes gh-14428
2018-10-10 10:00:45 -07:00
Phillip Webb 94798062ab Configure Cassandra JMX Reporting
Allow Cassandra JMX reporting to be configured via a property, and
disable it by default since it won't work with Dropwizard metrics 4.

Also update some of our own tests to explicitly disable it.

Closes gh-14778
2018-10-10 10:00:44 -07:00
Stephane Nicoll 1a140a80d8 Improve logger-name value hint definition
This commit improve the logger-name value hint by adding a group
attribute that can be defined to specify whether logging groups should
be considered.

Closes gh-14748
2018-10-10 18:40:10 +02:00
Andy Wilkinson 923b48bae0 Exclude duplicate javax.activation classes from web services starter
In 2.3.1, the JAX-B API now depends on javax.activation-api. This has
caused duplicate Activation classes to appear in the starter due to
dependencies on both javax.activation:activation:1.1 and on
javax.activation:javax.activation-api:1.2. This commit removes the
duplicate classes by excluding the former in favour of the latter.

See gh-14754
2018-10-10 16:51:47 +01:00
Andy Wilkinson 526a66f0ad Upgrade to Sqlite Jdbc 3.25.2
Closes gh-14769
2018-10-10 16:35:16 +01:00
Andy Wilkinson 7d3493ba47 Upgrade to Selenium Htmlunit 2.33.0
Closes gh-14768
2018-10-10 16:35:16 +01:00
Andy Wilkinson 8660bd1500 Upgrade to Mockito 2.23.0
Closes gh-14767
2018-10-10 16:35:16 +01:00
Andy Wilkinson 6d0bae5fb0 Upgrade to Kotlin 1.2.71
Closes gh-14766
2018-10-10 16:35:16 +01:00
Andy Wilkinson 7e494b5616 Upgrade to Infinispan 9.4.0.Final
Closes gh-14765
2018-10-10 16:35:16 +01:00
Andy Wilkinson 2fe9ed85cc Upgrade to Glassfish Jaxb 2.3.1
Closes gh-14764
2018-10-10 15:17:42 +01:00
Andy Wilkinson 8425b52b42 Upgrade to Flyway 5.2.0
Closes gh-14763
2018-10-10 15:17:42 +01:00
Andy Wilkinson c36655961f Upgrade to Elasticsearch 6.4.2
Closes gh-14762
2018-10-10 15:17:42 +01:00
Andy Wilkinson cdf0b556f0 Upgrade to Ehcache3 3.6.1
Closes gh-14761
2018-10-10 15:17:42 +01:00
Andy Wilkinson 36bedff9f4 Upgrade to Commons Lang3 3.8.1
Closes gh-14760
2018-10-10 15:17:42 +01:00
Andy Wilkinson 7e449de2e4 Upgrade to Byte Buddy 1.9.1
Closes gh-14759
2018-10-10 15:17:42 +01:00
Andy Wilkinson d422f4d295 Upgrade to Javax Jaxws 2.3.1
Closes gh-14758
2018-10-10 15:17:42 +01:00
Andy Wilkinson ccb9a93754 Upgrade to Netty Tcnative 2.0.17.Final
Closes gh-14757
2018-10-10 15:17:42 +01:00
Andy Wilkinson 6be81a9a31 Upgrade to Saaj Impl 1.5.0
Closes gh-14756
2018-10-10 15:17:42 +01:00
Stephane Nicoll 73ad17d2cb Use standard SpringBeanJobFactory to create Quartz Job instances
A recent update to SpringBeanJobFactory provides the same features as
our AutowireCapableBeanJobFactory override so this commit removes it in
favour of the standard factory.

Closes gh-14772
2018-10-10 16:01:59 +02:00
Stephane Nicoll c5122fb365 Merge branch '2.0.x' 2018-10-10 15:44:12 +02:00
Hanope 29b453d8b0 Fix typo
Closes gh-14770
2018-10-10 15:43:29 +02:00
Andy Wilkinson 4ede33e09b Merge branch '2.0.x' 2018-10-10 13:08:13 +01:00
Andy Wilkinson c897ff959f Upgrade to Ehcache3 3.5.3
Closes gh-14755
2018-10-10 13:06:01 +01:00
Andy Wilkinson 88c2f36ff1 Upgrade to Javax Jaxb 2.3.1
Closes gh-14754
2018-10-10 13:06:01 +01:00
Andy Wilkinson 72db995336 Upgrade to Javax Json 1.1.3
Closes gh-14753
2018-10-10 13:06:00 +01:00
Andy Wilkinson c9cf78bb69 Upgrade to Netty 4.1.30.Final
Closes gh-14752
2018-10-10 13:05:59 +01:00
Andy Wilkinson 27ae772064 Upgrade to Rabbit Amqp Client 5.4.3
Closes gh-14751
2018-10-10 13:05:58 +01:00
Andy Wilkinson 3debf4f68c Merge branch '2.0.x' 2018-10-10 13:01:24 +01:00
Andy Wilkinson ddb8694ae2 Merge branch '1.5.x' into 2.0.x 2018-10-10 13:00:17 +01:00
Stephane Nicoll c91d9bfda8 Polish "Add encoding support for git and build properties"
Closes gh-10771
2018-10-10 13:43:44 +02:00
hengyunabc f7a4a56fba Add encoding support for git and build properties
See gh-10771
2018-10-10 13:43:44 +02:00
Andy Wilkinson 73c6cc1b5d Merge branch '2.0.x' 2018-10-10 12:43:22 +01:00
Andy Wilkinson 839e686c9e Fix Checkstyle violation 2018-10-10 12:43:06 +01:00
Andy Wilkinson 646c20ed6a Merge branch '2.0.x' 2018-10-10 12:22:00 +01:00
Andy Wilkinson f9b6c1ab4d Include more information in NoSuchBeanDefinition failure analysis
Closes gh-13594
2018-10-10 12:21:46 +01:00
Andy Wilkinson 467169aaaf Merge branch '2.0.x' 2018-10-10 12:20:58 +01:00
Andy Wilkinson 9e14fc6b8b Cope with hanging call to connection.start() in JmsHealthIndicator
Previously, if the call to connection.start() hung, JmsHealthIndicator
would also hang and then never respond.

This commit introduces the use of an additional thread that waits for
up to 5 seconds for the connection to start. If the call to start
does not complete within that time, the connection is closed. The
call to close causes the call to start to throw an exception, thereby
stopping the hang and allowing the indicator to report that the
broker is down.

Closes gh-10809
2018-10-10 12:20:34 +01:00
Stephane Nicoll 5a2a2e1ebe Complete documentation of logger-name with out-of-box logging groups
Closes gh-14456
2018-10-10 11:31:12 +02:00
Madhura Bhave b18751ebd9 Provide loggingCodecCustomizer only if property is set
Fixes gh-14723
2018-10-09 14:41:17 -07:00
Andy Wilkinson 37c60b6603 Merge branch '2.0.x' 2018-10-09 17:47:18 +01:00
Andy Wilkinson 51a1309ab7 Document need to use spring.data.rest rather than spring.data.web
Closes gh-14413
2018-10-09 17:46:55 +01:00
Andy Wilkinson 3f7a01fd27 Use ApplicationContextRunner in SpringDataWebAutoConfigurationTests
See gh-14413
2018-10-09 17:46:55 +01:00
Stephane Nicoll 0fba98ca73 Fix logging.group target type
Closes gh-14743
2018-10-09 18:18:05 +02:00
Stephane Nicoll caf7f09296 Document standard "sql" and "web" log groups in the metadata
Closes gh-14740
2018-10-09 18:13:23 +02:00
Stephane Nicoll 716b04721c Merge branch '2.0.x' 2018-10-09 17:08:56 +02:00
Stephane Nicoll 6e6c22c0ae Polish "Remove duplicate -l option for init command"
Closes gh-1446
2018-10-09 17:08:10 +02:00
Ruslan Molchanov 71cf472116 Remove duplicate -l option for init command
See gh-14460
2018-10-09 17:08:10 +02:00
Andy Wilkinson fa47073d11 Merge branch '2.0.x' 2018-10-09 15:09:15 +01:00
Andy Wilkinson c6fdb4f0f2 Improve documentation of Quartz DataSource customization
Closes gh-12780
2018-10-09 15:05:25 +01:00
Andy Wilkinson 602f23c3eb Merge branch '2.0.x' 2018-10-09 14:37:25 +01:00
Hanope 8b08f04e39 Correct TIP typo in the documentation
Closes gh-14735
2018-10-09 14:36:16 +01:00
Andy Wilkinson 83e1a61510 Merge branch '2.0.x' 2018-10-09 14:06:18 +01:00
Andy Wilkinson 73122fa8f3 Improve documentation of supported JSON mapping libraries
Closes gh-14703
2018-10-09 14:04:48 +01:00
Stephane Nicoll 3b0f00dc20 Document how to enable Hibernate 2nd level cache with JCache
Closes gh-14734
2018-10-09 14:54:38 +02:00
Andy Wilkinson f2446f78df Align Session Redis tests with changes in latest Apple snapshots
See gh-14732
2018-10-09 12:39:08 +01:00
Stephane Nicoll a22d089cdc Use a dedicated hook point to customize InfluxDB's HTTP client
This commit introduces a dedicated hook point for InfluxDB's http client
builder and retains backward compatibility, in a deprecated fashion, for
looking up a OkHttpClient.Builder bean.

Closes gh-14709
2018-10-09 13:33:14 +02:00
Andy Wilkinson 20e57de73f Start building against Spring Session snapshots for Bean-RELEASE
See gh-14733
2018-10-09 11:38:01 +01:00
Andy Wilkinson 5c67bbd2b4 Start building against Spring Integration snapshots for 5.1.0.RC2
See gh-14731
2018-10-09 11:37:13 +01:00
Andy Wilkinson 6c4d2e140b Start building against Spring Security 5.1.1 snapshots
See gh-14730
2018-10-09 11:36:37 +01:00
Andy Wilkinson f1ae192dcb Start building against Spring Data snapshots for Lovelace-SR1
See gh-14729
2018-10-09 11:35:50 +01:00
Andy Wilkinson 1b4a60e65c Start building against Spring Session snapshots for Apple-SR6
See gh-14732
2018-10-09 11:33:34 +01:00
Andy Wilkinson e2b589547c Start building against Spring Data snapshots for Kay-SR11
See gh-14728
2018-10-09 11:32:21 +01:00
dreis2211 6a66a333ae Fix actuator endpoint tables in docs
Closes gh-14712
2018-10-09 08:27:35 +02:00
Andy Wilkinson 508bfda9ad Start building against Spring Framework 5.0.10 snapshots
See gh-14722
2018-10-08 20:08:24 +01:00
Andy Wilkinson 04d69f10e0 Merge branch '2.0.x' 2018-10-08 16:29:37 +01:00
Andy Wilkinson 07dd689c9c Polish 2018-10-08 16:29:21 +01:00
dreis2211 e6313fd96f Fix @Cacheable typo
Closes gh-14720
2018-10-08 16:28:05 +01:00
Andy Wilkinson b413333abb Merge branch '2.0.x' 2018-10-08 16:10:21 +01:00
Andy Wilkinson 9afd6f53e5 Document need for -parameters compilation with @SpyBean and @Cacheable
Closes gh-13945
2018-10-08 16:10:15 +01:00
Andy Wilkinson c4ba05f092 Merge branch '2.0.x' 2018-10-08 15:59:37 +01:00
Andy Wilkinson 4f51a83ab3 Add a note recommending the use of containers' multipart upload
Closes gh-2958
2018-10-08 15:58:48 +01:00
Andy Wilkinson 2216b78f1e Merge branch '2.0.x' 2018-10-08 15:53:09 +01:00
Andy Wilkinson d3b3c8c64e Honour management.metrics.web.server.auto-time-requests with WebFlux
Closes gh-13895
2018-10-08 15:52:50 +01:00
Andy Wilkinson 3f1b3db25a Merge branch '2.0.x' 2018-10-08 15:07:28 +01:00
Andy Wilkinson 1f34da9025 Document application plugin's need for mainClassName to be set
Closes gh-14250
2018-10-08 15:06:37 +01:00
Andy Wilkinson 749fa96a8b Polish 2018-10-08 13:34:25 +01:00
Andy Wilkinson 1e0f2b652e Merge branch '2.0.x' 2018-10-08 12:41:16 +01:00
Andy Wilkinson 5d3f30ee94 Honour SSL key and trust store providers when configuring Netty
Closes gh-14714
2018-10-08 12:39:09 +01:00
Andy Wilkinson 1afdfef83a Merge branch '2.0.x' 2018-10-08 12:20:11 +01:00
Andy Wilkinson d6d59edb35 Merge branch '1.5.x' into 2.0.x 2018-10-08 12:19:52 +01:00
Stephane Nicoll 7da3396555 Merge branch '2.0.x' 2018-10-08 10:45:49 +02:00
dreis2211 55ec016bac Remove unused fields in tests
Closes gh-14707
2018-10-08 10:40:04 +02:00
Andy Wilkinson 43c0d42dc2 Merge branch '2.0.x' 2018-10-06 13:06:53 +01:00
Andy Wilkinson bbdd6cc9cb Merge branch '1.5.x' 2018-10-06 13:06:37 +01:00
Andy Wilkinson 8259c6397e Merge branch '2.0.x' 2018-10-06 12:59:42 +01:00
Andy Wilkinson ca329d3d03 Update Jersey indicator class to one that requires the Servlet API
Previously, if WebFlux and Jersey were on the classpath, but there was
no Servlet API (and no embedded container) on the classpath, the web
application type would be prevented from being reactive. The absence
of the Servlet API would then prevent the web application type from
being servlet so it would be none.

By contrast, if Spring MVC was on the classpath in place of Jersey
the absence of the Servlet API would allow the web application type to
be reactive. This happened because the Spring MVC indicator class is
DispatcherServlet which requires the Servlet API.

This commit updates the Jersey indicator class to be ServletContainer.
This class is both an HttpServlet and a Filter so it too requires the
Servlet API and, therefore, further aligns the deduction behaviour for
Jersey and Spring MVC.

Closes gh-14701
2018-10-06 12:59:25 +01:00
Madhura Bhave 670aaf7875 Make prometheus push gateway available to javadoc generation
See gh-14353
2018-10-05 19:24:38 -07:00
Phillip Webb 20ecf73cd1 Polish "Add Prometheus push gateway support"
Rework Prometheus push gateway support so that the central class can
be used outside of auto-configuration. The shutdown flags have also
been replaced with a single "shutdown-operation" property since it's
unlikely that both "push" and "delete" will be required.

It's also possible now to supply a `TaskScheduler` to the manager.

See gh-14353
2018-10-05 18:12:41 -07:00
David J. M. Karlsen 4e71981f77 Add Prometheus push gateway support
Add support for Prometheus push gateway so that short lived processes
(for example batch jobs) can still submit metrics to Prometheus.

Closes gh-14353
2018-10-05 18:12:19 -07:00
Stephane Nicoll 35752a54d2 Adapt to latest change in Micrometer 1.1 2018-10-05 23:42:16 +02:00
Phillip Webb 1d8e4a8f5c Make devtools set spring.messages.reloadable=true
Update `DevToolsPropertyDefaultsPostProcessor` to automatically set
the recently introduced `spring.messages.reloadable` property to
`true`.

Closes gh-14699
2018-10-05 13:59:26 -07:00
Phillip Webb 01b8667dd7 Update copyright year for changed files 2018-10-05 13:40:07 -07:00
Phillip Webb 2cdd3dd20f Move to micrometer SNAPSHOT 2018-10-05 13:39:49 -07:00
Phillip Webb 5c7a4523ea Merge '2.0.x' 2018-10-05 13:34:12 -07:00
Phillip Webb 6aedb69443 Update copyright year for changed files 2018-10-05 13:31:33 -07:00
Andy Wilkinson 80d27f7129 Make micrometer-jersey2's classes available to javadoc generation
See gh-12482
2018-10-05 21:31:06 +01:00
Phillip Webb 456d1af443 Polish 2018-10-05 13:30:24 -07:00
Andy Wilkinson 72e2313fe8 Polish "Auto-configure Micrometer's Jersey 2 server instrumentation"
Closes gh-12482
2018-10-05 16:40:57 +01:00
Michael Weirauch dd126faf5a Auto-configure Micrometer's Jersey 2 server instrumentation
See gh-12482

Co-authored-by: Michael J. Simons <michael@simons.ac>
2018-10-05 16:07:10 +01:00
Stephane Nicoll 40de371a52 Fix build failure 2018-10-05 16:50:41 +02:00