Commit Graph

17176 Commits

Author SHA1 Message Date
Stephane Nicoll 3493341201 Polish 2018-09-05 09:25:48 +02:00
Madhura Bhave 9c82d5c382 Make ApplicationContextServerWebExchangeMatcher and subclasses thread-safe
Fixes gh-14161
2018-09-04 17:06:24 -07:00
Phillip Webb cafff43022 Update copyright header of changed files 2018-09-04 16:19:05 -07:00
Phillip Webb 9af6b3422f Polish 2018-09-04 16:18:47 -07:00
Phillip Webb 45613f8c3c Merge branch '1.5.x' into 2.0.x 2018-09-04 15:12:22 -07:00
Phillip Webb a50686b404 Surface additional rabbit SSL factory properties
Add `validate-server-certificate` and `verify-hostname` properties to
`spring.rabbitmq.ssl` to allow additional SSL configuration.

Closes gh-14259
2018-09-04 15:07:53 -07:00
Johnny Lim ca57e58ee5 Polish
See gh-14293
2018-09-04 08:52:13 +02:00
Stephane Nicoll 77a5259317 Merge pull request #14291 from izeye:metrics-endpoint-metric
* pr/14291:
  Use InvalidEndpointRequestException for MetricsEndpoint
2018-09-04 08:48:32 +02:00
Johnny Lim 3eef927499 Use InvalidEndpointRequestException for MetricsEndpoint
Closes gh-14291
2018-09-04 08:33:33 +02:00
Kedar Joshi 72ebfb0332 Update default compressible media types
Closes gh-14278
2018-09-03 19:13:09 +02:00
Stephane Nicoll 42bf594d96 Polish condition name
See gh-14285
2018-09-03 12:16:18 +02:00
Stephane Nicoll ba18fb529f Merge pull request #14285 from eneiascs:ws-auto-configuration-list
* pr/14285:
  Polish "Fix WSDL locations condition to work with a list"
  Fix WSDL locations condition to work with a list
2018-09-03 11:16:26 +02:00
Stephane Nicoll ddeae9b58e Polish "Fix WSDL locations condition to work with a list"
Closes gh-14285
2018-09-03 11:09:44 +02:00
Eneias Cordeiro da Silva 80358f7fbf Fix WSDL locations condition to work with a list
See gh-14285
2018-09-03 11:06:34 +02:00
Stephane Nicoll 6078865372 Merge branch '1.5.x' into 2.0.x 2018-09-03 10:00:31 +02:00
Stephane Nicoll ca7f961cf0 Merge pull request #14284 from PascalSchumacher:patch-1
* pr/14284:
  Fix indent of Jolokia maven dependency declaration in doc
2018-09-03 09:59:05 +02:00
Pascal Schumacher afeaa90d1a Fix indent of Jolokia maven dependency declaration in doc
Closes gh-14284
2018-09-03 09:58:28 +02:00
Stephane Nicoll 8950c3ebb4 Polish
See gh-14271
2018-09-03 08:51:51 +02:00
Stephane Nicoll 00233cd57e Merge branch '1.5.x' into 2.0.x 2018-09-02 09:03:42 +02:00
Stephane Nicoll 0960f796fa Merge pull request #14274 from EddieOlson:fix-typo
* pr/14274:
  Fix typo
2018-09-02 09:03:08 +02:00
Eddie Olson 7398b7dfa0 Fix typo
Closes gh-14274
2018-09-02 09:02:47 +02:00
Stephane Nicoll ea2fb620b4 Clarify structure of prefixes
Closes gh-14258
2018-08-31 15:23:53 +02:00
Stephane Nicoll 6d637bc53b Add missing condition
Closes gh-14264
2018-08-31 11:34:32 +02:00
Phillip Webb b6301712e9 Merge branch '1.5.x' into 2.0.x 2018-08-30 16:00:13 -07:00
Phillip Webb 9543fcf44d Upgrade to spring-javaformat 0.0.6 2018-08-30 15:59:27 -07:00
Phillip Webb 2e2f91d4a0 Merge branch '1.5.x' into 2.0.x 2018-08-30 15:59:02 -07:00
Phillip Webb 17de1571f5 Update copyright year 2018-08-30 15:52:58 -07:00
Phillip Webb a085541d26 Polish 2018-08-30 15:52:58 -07:00
Stephane Nicoll 385216ad45 Merge pull request #14173 from nosan:gh-13913
* pr/14173:
  Polish "Limit metrics collection of incoming requests"
  Limit metrics collection of incoming requests
2018-08-30 13:03:55 +02:00
Stephane Nicoll 0625443d27 Polish "Limit metrics collection of incoming requests"
Closes gh-14173
2018-08-30 12:59:07 +02:00
Dmytro Nosan 81a6701914 Limit metrics collection of incoming requests
See gh-14173
2018-08-30 12:26:06 +02:00
Stephane Nicoll f9081a2c23 Revert "Polish some joining collectors"
See gh-14221
2018-08-29 17:37:33 +02:00
Stephane Nicoll 3155abae5a Merge pull request #14221 from dreis2211:polish-joining-collectors
* pr/14221:
  Polish some joining collectors
2018-08-28 17:18:04 +02:00
dreis2211 afda71e419 Polish some joining collectors
Closes gh-14221
2018-08-28 17:17:46 +02:00
Stephane Nicoll 3997b3ae5e Polish 2018-08-28 16:21:17 +02:00
Stephane Nicoll ff11166af8 Restore RabbitMQ advanced starter as it is compatible with Spring Boot 2 2018-08-28 09:14:20 +02:00
Stephane Nicoll 352a6671e8 Merge pull request #14213 from dreis2211:collapse-identical-catch-blocks
* pr/14213:
  Collapse identical catch blocks
2018-08-27 18:20:29 +02:00
dreis2211 70add0617a Collapse identical catch blocks
Closes gh-14213
2018-08-27 18:18:06 +02:00
Stephane Nicoll af426e383f Review slice documentation to clarify the scope and alternative options
Closes gh-13810
2018-08-24 18:05:05 +02:00
Stephane Nicoll f53e6c701f Improve actuator documentation about the types supported for endpoints
Closes gh-13896
2018-08-24 17:08:29 +02:00
Stephane Nicoll f5482a33a3 Document custom DispatcherServlet requirement
Closes gh-14145
2018-08-24 16:38:24 +02:00
Stephane Nicoll 9e5395f0a1 Merge pull request #14184 from izeye:polish-20180823-2nd
* pr/14184:
  Polish
2018-08-24 11:49:17 +02:00
Johnny Lim fb71174c24 Polish
Closes gh-14184
2018-08-24 11:48:41 +02:00
Stephane Nicoll be00c1db63 Fix dependency between cache and hibernate
This commit fixes the ordering between `CacheAutoConfiguration` and
`HibernateJpaAutoConfiguration` so that the auto-configured
`CacheManager` is configured before Hibernate starts.

Closes gh-14181
2018-08-23 16:15:42 +02:00
Stephane Nicoll 5e7be50265 Restore trace request param behaviour with error controller
This commits restores the behaviour of Spring Boot 1.x with regards to
the "trace" request param used to add the stacktrace to the model.

This was inadvertently changed so that the stacktrace would be added
if the parameter wasn't set.

Closes gh-14171
2018-08-23 11:34:16 +02:00
Stephane Nicoll 9938d1f4b6 Order IntegrationAutoConfiguration properly
This commit makes sure that the auto-configuration for Spring
Integration runs after the datasource has been auto-configured if
necessary as there is an optional part that can initialize the jdbc
schema.

Closes gh-14175
2018-08-23 10:27:25 +02:00
Stephane Nicoll 7c3d863cf7 Merge pull request #14153 from hiroakiy:fix-string-concat
* pr/14153:
  Polish "Fix String concatenation in a loop"
  Fix String concatenation in a loop
2018-08-22 10:48:20 +02:00
Stephane Nicoll 000cb94323 Polish "Fix String concatenation in a loop"
Closes gh-14153
2018-08-22 10:47:05 +02:00
Hiroaki Yoshida 43acc37587 Fix String concatenation in a loop
See gh-14153
2018-08-22 10:46:14 +02:00
Madhura Bhave 55406d91d2 Consider dash & underscore when equating indexed elements
Fixes gh-14136
2018-08-21 12:53:25 -07:00