Commit Graph

16456 Commits

Author SHA1 Message Date
Stephane Nicoll 284fe969e0 Merge branch '2.0.x' 2018-04-30 16:43:02 +02:00
Stephane Nicoll fc8b21100b Merge pull request #12996 from yaman-jain:docs_spell_check
* pr/12996:
  Fix typo
2018-04-30 16:42:47 +02:00
Yaman Jain 50ca33ecd2 Fix typo
Closes gh-12996
2018-04-30 16:42:22 +02:00
Stephane Nicoll 0ba9b49d8b Merge branch '1.5.x' into 2.0.x 2018-04-30 16:42:04 +02:00
Stephane Nicoll 6047a2c0b0 Fix typo
See gh-12996
2018-04-30 16:41:34 +02:00
Stephane Nicoll bb614b5968 Merge pull request #12216 from Mon
* pr/12216:
  Polish "Add cache actuator endpoint"
  Add cache actuator endpoint
2018-04-30 16:34:36 +02:00
Stephane Nicoll fb8a5a9864 Polish "Add cache actuator endpoint"
This commit improves the initial proposal by providing a by name read
operation that returns the detail of a particular cache. It also adds
more tests and complete API documentation for the feature.

Closes gh-12216
2018-04-30 16:34:00 +02:00
Johannes Edmeier 1a57673345 Add cache actuator endpoint
This commits adds an actuator endpoint which lists the caches per
context and cacheManager and provides a delete operation to clear the
caches. As the statistics are exposed via the metrics endpoint they are
not included

See gh-12216
2018-04-30 16:34:00 +02:00
Andy Wilkinson 0699f65969 Merge branch '2.0.x' 2018-04-30 12:26:38 +01:00
Andy Wilkinson 584479b7f4 Merge pull request #13001 from Sébastien Deleuze
* gh-13001:
  Upgrade to Kotlin 1.2.41
2018-04-30 12:25:42 +01:00
Sebastien Deleuze 933f0bbca8 Upgrade to Kotlin 1.2.41
Includes KT-23973 critical regression fix.
2018-04-30 12:25:00 +01:00
Stephane Nicoll 22b99a90de Polish
See gh-12906
2018-04-28 10:36:41 +02:00
Madhura Bhave c7a11e1192 Merge branch '2.0.x' 2018-04-27 16:28:41 -07:00
Madhura Bhave de66451d9b Update README with additional modules 2018-04-27 16:27:08 -07:00
Madhura Bhave acc1793e96 Merge branch '2.0.x' 2018-04-27 13:19:46 -07:00
Madhura Bhave 0385bd4131 Use spring.session.timeout for Spring Session timeout
Fallback to server.servlet.session.timeout for backwards compatibility.

Fixes gh-12906
2018-04-27 13:16:17 -07:00
Andy Wilkinson 0f2241a122 Merge branch '2.0.x' 2018-04-27 14:01:03 +01:00
Andy Wilkinson d448c5ac49 Use openjdk:10.0.1-10-jdk Docker image for JDK 10-based CI
Closes gh-12988
2018-04-27 14:00:51 +01:00
Brian Clozel 1ef0098ab5 Add WebClient metrics support
This commit adds support for Actuator Metrics for WebClient.
This support mirrors the current behavior for `RestTemplate`, reusing
the same metric name `"http.client.requests"` and tags.

`WebClient` is instrumented by a `MetricsWebClientFilterFunction` which
is applied by a `WebClientCustomizer`. This instrumentation happens
automatically only if you create an instance of `WebClient` using an
auto-configured `WebClient.Builder` bean.

This infrastructure is reusing de facto the `MeterFilter` that has been
added for `RestTemplate` in order to limit the "uri" tag cardinality.

Closes gh-12228
2018-04-27 13:54:14 +02:00
Stephane Nicoll 621874708d Merge branch '2.0.x' 2018-04-27 10:20:18 +02:00
Stephane Nicoll 36fb078935 Merge branch '1.5.x' into 2.0.x 2018-04-27 10:19:45 +02:00
Stephane Nicoll 587e3f4046 Polish
See gh-12796
2018-04-27 10:18:34 +02:00
Stephane Nicoll c8843947fe Polish 2018-04-27 10:14:51 +02:00
Stephane Nicoll 1a41ff941a Polish 2018-04-27 10:14:31 +02:00
Johnny Lim b45c5f1a27 Polish
See gh-12981
2018-04-27 09:34:32 +02:00
Stephane Nicoll 4d0fe5bbe6 Merge branch '2.0.x' 2018-04-27 09:33:48 +02:00
Stephane Nicoll a4840ed70a Merge pull request #12981 from izeye:polish-20180427
* pr/12981:
  Polish
2018-04-27 09:33:29 +02:00
Johnny Lim b941c5f1a6 Polish
Closes gh-12981
2018-04-27 09:29:16 +02:00
Madhura Bhave 59b7c50c3c Merge branch '2.0.x' 2018-04-26 15:55:38 -07:00
Madhura Bhave f2d8ca8b3a Fix failing NettyReactiveWebServerFactoryTests
NettyReactiveWebServerFactoryTests.portInUseExceptionIsThrownWhenPortIsAlreadyInUse
started failing on CI following this change in reactor netty:
e6634c27f6
Instead of a `BindException`, a `NativeIoException` is thrown. Since that Exception
is for internal use only, we throw a generic `WebServerException`
instead of the `PortInUseException`.
2018-04-26 15:39:08 -07:00
Madhura Bhave dafe8823cc Merge branch '2.0.x' 2018-04-26 13:46:06 -07:00
Madhura Bhave 24ce3ecb43 Fix typo in docs 2018-04-26 13:43:51 -07:00
Madhura Bhave 6bebb931e5 Merge branch '2.0.x' 2018-04-26 12:21:51 -07:00
Madhura Bhave 228c85fe67 Improve List and Map binding documentation
Closes gh-12444
2018-04-26 12:18:49 -07:00
Stephane Nicoll 11d583ab46 Merge branch '2.0.x' 2018-04-26 16:45:03 +02:00
Stephane Nicoll fbe88c483e Prevent rabbitmq starter to bring webflux on the classpath
This commit excludes `com.rabbitmq:http-client` from `spring-rabbit` as
the former brings spring webflux for an optional feature. This also
prevents Spring Boot to consider that a web server should be started as
all the necessary pieces are unexpectedly present.

Closes gh-12853
2018-04-26 16:44:42 +02:00
Stephane Nicoll 25414d1b58 Merge branch '2.0.x' 2018-04-25 17:20:30 +02:00
Stephane Nicoll ae499c2c44 Merge pull request #12960 from sdeleuze:custom-metadata
* pr/12960:
  Polish "Document Kotlin custom metadata generation"
  Document Kotlin custom metadata generation
2018-04-25 17:20:18 +02:00
Stephane Nicoll 9cf8080a17 Polish "Document Kotlin custom metadata generation"
Closes gh-12960
2018-04-25 17:19:55 +02:00
sdeleuze c24e7a5930 Document Kotlin custom metadata generation
See gh-12960
2018-04-25 17:19:38 +02:00
Stephane Nicoll af6bbca376 Merge pull request #12331 from TYsewyn:feature/actuator-integration-graph
* pr/12331:
  Polish "Add actuator endpoint for exposing the Spring Integration graph"
  Add actuator endpoint for exposing the Spring Integration graph
2018-04-25 17:12:08 +02:00
Stephane Nicoll 03cf4fbb10 Polish "Add actuator endpoint for exposing the Spring Integration graph"
Closes gh-12331
2018-04-25 16:16:43 +02:00
Tim Ysewyn 8c67ef1079 Add actuator endpoint for exposing the Spring Integration graph
See gh-12331
2018-04-25 16:16:43 +02:00
Andy Wilkinson 3b80b3dd93 Merge branch '2.0.x' 2018-04-25 15:10:35 +01:00
Andy Wilkinson 1679fd87c8 Merge branch '1.5.x' into 2.0.x 2018-04-25 15:10:02 +01:00
Andy Wilkinson df2372cd93 Avoid Kafka 0.10 destabilising the Windows build
Closes gh-12963
2018-04-25 15:03:40 +01:00
Stephane Nicoll 518f41a4ae Improve @ConditionalOnEnabledEndpoint to be used on any component
This commit adds an `endpoint` attribute so that the condition can be
used on arbitrary components, not only endpoints or extensions.

Closes gh-12945
2018-04-25 13:54:04 +02:00
Stephane Nicoll b090280b0c Improve Couchbase auto-configuration
This commit improves the couchbase auto-configuration so that it is
easier to customize the way the connection to the couchbase server is
initiated.

See gh-11146
2018-04-25 13:35:49 +02:00
Andy Wilkinson 66872a0f96 Merge branch '2.0.x' 2018-04-25 11:58:45 +01:00
Andy Wilkinson a358f3f0e8 Merge branch '1.5.x' into 2.0.x 2018-04-25 11:58:31 +01:00