Commit Graph

3866 Commits

Author SHA1 Message Date
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