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,208 Commits 23 Branches 348 Tags 292 MiB
Commit Graph

18208 Commits

Author SHA1 Message Date
Madhura Bhave f0d7533e0b Merge branch '2.0.x' 2018-09-04 17:09:52 -07:00
Madhura Bhave 9c82d5c382 Make ApplicationContextServerWebExchangeMatcher and subclasses thread-safe 
Fixes gh-14161
 2018-09-04 17:06:24 -07:00
Phillip Webb 9d1b3a2b49 Merge branch '2.0.x' 2018-09-04 16:25:17 -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
Madhura Bhave 75937f5b5c Make jmsListenerContainerFactory @ConditionalOnSingleCandidate 
Closes gh-12700
 2018-09-04 16:06:18 -07:00
Phillip Webb 59b5c54489 Upgrade to Rabbit AMQP Client to 5.4.0 
Closes gh-14303
 2018-09-04 15:21:06 -07:00
Phillip Webb 0cd64ea690 Merge branch '2.0.x' 2018-09-04 15:15:57 -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
Andy Wilkinson 8ee4775820 Polish 2018-09-04 20:46:35 +01:00
Brian Clozel 2af8a9617b Revert temporary workaround for reactor resources 
This switches back the Reactor resources on global by default.

See gh-14058
See SPR-17199
 2018-09-04 15:37:39 +02:00
Stephane Nicoll 3e745eefc0 Upgrade to Spring Batch 4.1.0.M3 
Closes gh-14296
 2018-09-04 15:18:54 +02:00
Stephane Nicoll 1ceb076035 Harmonize Metrics test 
This commit harmonizes metrics test to rely on `MetricRun.simple()`
rather than configuring a simple `MeterRegistry` manually. Rather than
applying related auto-configurations automatically, `MetricsRun` only
enable the absolute minimum.

See gh-14255
 2018-09-04 15:04:02 +02:00
Stephane Nicoll c0e45b7333 Adapt to Spring Framework API change 2018-09-04 14:09:57 +02:00
Stephane Nicoll cb7de2a963 Allow binding number to DataSize 
Closes gh-14294
 2018-09-04 11:04:22 +02:00
Stephane Nicoll 9496e87b07 Merge pull request #14234 from qct:max-header 
* pr/14234:
  Polish "Align max HTTP header size configuration"
  Align max HTTP header size configuration
 2018-09-04 10:53:54 +02:00
Stephane Nicoll 8771b34c15 Polish "Align max HTTP header size configuration" 
Closes gh-14234
 2018-09-04 10:51:54 +02:00
qct dbbb378650 Align max HTTP header size configuration 
See gh-14234
 2018-09-04 10:51:36 +02:00
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