root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
18,189 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

18189 Commits

Author SHA1 Message Date
Stephane Nicoll 7de965319b Merge pull request #14293 from izeye:polish-20180904 
* pr/14293:
  Polish
 2018-09-04 08:54:05 +02:00
Johnny Lim 5427d778fe Polish 
Closes gh-14293
 2018-09-04 08:52:55 +02:00
Stephane Nicoll 3d732e86f4 Merge branch '2.0.x' 2018-09-04 08:52:35 +02:00
Johnny Lim ca57e58ee5 Polish 
See gh-14293
 2018-09-04 08:52:13 +02:00
Stephane Nicoll e0ee4f22a5 Merge branch '2.0.x' 2018-09-04 08:49:04 +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
Brian Clozel 1a20e7efa1 Merge branch '2.0.x' 2018-09-03 21:05:18 +02:00
Kedar Joshi 72ebfb0332 Update default compressible media types 
Closes gh-14278
 2018-09-03 19:13:09 +02:00
Stephane Nicoll 3dfece779c Upgrade to Kotlin 1.2.61 
Closes gh-14290
 2018-09-03 14:10:30 +02:00
Stephane Nicoll 960acb0cbf Merge branch '2.0.x' 2018-09-03 12:16:32 +02:00
Stephane Nicoll 42bf594d96 Polish condition name 
See gh-14285
 2018-09-03 12:16:18 +02:00
Stephane Nicoll 461fed3d7c Merge pull request #14251 from ayudovin:throwing-exception-on-invalid-syntax-in-json 
* pr/14251:
  Throw an exception on invalid syntax in SPRING_APPLICATION_JSON
 2018-09-03 11:28:24 +02:00
artsiom 11f0f668ff Throw an exception on invalid syntax in SPRING_APPLICATION_JSON 
Closes gh-14251
 2018-09-03 11:28:02 +02:00
Stephane Nicoll 5a1aefc76f Merge branch '2.0.x' 2018-09-03 11:17:59 +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 143ca5d1fa Merge branch '2.0.x' 2018-09-03 10:00:54 +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 467b635a18 Merge pull request #14271 from izeye:polish-20180901 
* pr/14271:
  Polish
 2018-09-03 08:53:26 +02:00
Johnny Lim d510bc71b1 Polish 
Closes gh-14271
 2018-09-03 08:53:07 +02:00
Stephane Nicoll 7dff13b632 Merge branch '2.0.x' 2018-09-03 08:52:46 +02:00
Stephane Nicoll 8950c3ebb4 Polish 
See gh-14271
 2018-09-03 08:51:51 +02:00
Stephane Nicoll 314cd34716 Merge branch '2.0.x' 2018-09-02 09:04:08 +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
Madhura Bhave f3dbd946de Document how to test secure mockmvc tests 
See gh-14227
 2018-08-31 12:47:25 -07:00
Stephane Nicoll 8b753297c3 Merge branch '2.0.x' 2018-08-31 15:24:11 +02:00
Stephane Nicoll ea2fb620b4 Clarify structure of prefixes 
Closes gh-14258
 2018-08-31 15:23:53 +02:00
Stephane Nicoll 4634811c7c Polish 2018-08-31 14:45:17 +02:00
Stephane Nicoll 7bee9dfc22 Harmonize HTTP client metrics 
This commit harmonizes the auto-configurations for RestTemplate and
WebClient in a single `HttpClientMetricsAutoConfiguration`. Doing so
allows to give a better scope for the shared `MeterFilter`.

As a result`WebClientMetricsAutoConfiguration` has moved to the `client`
package.

Closes gh-14269
 2018-08-31 14:45:03 +02:00
Stephane Nicoll 2fc557a5a9 Improve WebSocket documentation for reactive applications 
Closes gh-14069
 2018-08-31 11:53:51 +02:00
Stephane Nicoll 374cf2c781 Merge branch '2.0.x' 2018-08-31 11:35:03 +02:00
Stephane Nicoll 6d637bc53b Add missing condition 
Closes gh-14264
 2018-08-31 11:34:32 +02:00
Madhura Bhave b16927ce91 Add @WithMockUser to tests 
See gh-14227
 2018-08-30 18:55:02 -07:00
Madhura Bhave 8f946260d2 Update copyright year for changed files 2018-08-30 16:56:37 -07:00
Madhura Bhave 0384a88b57 Include web security config classes in @WebMvcTest 
Security config classes are not included when the
secure flag is set to false.

Closes gh-6514
 2018-08-30 16:47:31 -07:00
Madhura Bhave d91c71b508 Deprecate secure flag on @WebMvcTest 
Closes gh-14227
 2018-08-30 16:47:31 -07:00
Phillip Webb 174f53e1cf Merge branch '2.0.x' 2018-08-30 16:02:25 -07: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 6c26315cd1 Merge branch '2.0.x' 2018-08-30 13:08:42 +02: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