Phillip Webb
ec27137632
Merge branch '1.5.x' into 2.0.x
2018-09-05 13:40:48 -07:00
Phillip Webb
a9e8116a99
Only check for Mockito once
...
Update `MockReset` so that checking for Mockito only happens once.
Closes gh-14260
2018-09-05 13:25:18 -07:00
Phillip Webb
02f2f62a4d
Upgrade amqp-client to 4.8
...
Closes gh-14259
2018-09-05 13:22:07 -07:00
Phillip Webb
8c34e053f5
Update copyright header of changed files
2018-09-05 13:09:03 -07:00
Phillip Webb
c3de4c84f2
Polish
2018-09-05 12:54:20 -07:00
Stephane Nicoll
0252e5452b
Merge pull request #14304 from pankajtandon:add-third-party-stripe-starter
...
* pr/14304:
Polish "Add reference to Stripe Payment Gateway Service starter"
Add reference to Stripe Payment Gateway Service starter
2018-09-05 17:40:21 +02:00
Stephane Nicoll
9dec5811fb
Polish "Add reference to Stripe Payment Gateway Service starter"
...
Closes gh-14304
2018-09-05 17:39:59 +02:00
pankajtandon
40e574c3c2
Add reference to Stripe Payment Gateway Service starter
...
See gh-14304
2018-09-05 17:39:31 +02:00
Andy Wilkinson
c89910c1b6
Merge branch '2.0.x'
2018-09-05 14:29:23 +01:00
Andy Wilkinson
b580dd70f8
Polish
2018-09-05 14:28:48 +01:00
Andy Wilkinson
da13871f84
Merge branch '2.0.x'
2018-09-05 14:28:11 +01:00
Andy Wilkinson
86d87ad215
Polish
2018-09-05 14:26:51 +01:00
Andy Wilkinson
7442e37154
Add JAXB API to Data JPA starter so it works out-of-the-box on Java 9+
...
Closes gh-14287
2018-09-05 14:23:18 +01:00
Stephane Nicoll
bf05238198
Merge pull request #14298 from ayudovin:make-possible-disable-backgroundpreinitializer
...
* pr/14298:
Polish "Make it possible to disable the BackgroundPreinitializer"
Make it possible to disable the BackgroundPreinitializer
2018-09-05 14:34:52 +02:00
Stephane Nicoll
304c6a02ba
Polish "Make it possible to disable the BackgroundPreinitializer"
...
Closes gh-14298
2018-09-05 14:33:54 +02:00
artsiom
5779767513
Make it possible to disable the BackgroundPreinitializer
...
See gh-14298
2018-09-05 14:32:56 +02:00
Stephane Nicoll
5f56adc334
Add activation API to WebServices samples on Java 11+
...
Closes gh-14308
2018-09-05 14:17:31 +02:00
Stephane Nicoll
1df3250d84
Merge pull request #14305 from michael-pratt:master
...
* pr/14305:
Polish
Polish "Add Health details using maps"
Add Health details using maps
2018-09-05 13:41:10 +02:00
Stephane Nicoll
7ff41e7c8c
Polish
2018-09-05 13:39:51 +02:00
Stephane Nicoll
ca8be3f6bd
Polish "Add Health details using maps"
...
Closes gh-14305
2018-09-05 13:39:18 +02:00
Michael Pratt
5c86f9eca4
Add Health details using maps
...
See gh-14305
2018-09-05 13:20:03 +02:00
Andy Wilkinson
21bc3d3ba5
Remove redundant Java 9 and 10 profile that adds JAXB API dependency
...
Closes gh-14309
2018-09-05 11:55:30 +01:00
Stephane Nicoll
45204d7ee0
Harmonize JAXB version in dependency management
...
Closes gh-14308
2018-09-05 10:35:28 +02:00
Stephane Nicoll
20d6315492
Merge branch '2.0.x'
2018-09-05 09:42:48 +02:00
Stephane Nicoll
3469142fec
Partially revert 59d911d
...
This commit restores the public `UsesUnsafeJava` and flag it as
deprecated.
Closes gh-14072
2018-09-05 09:42:18 +02:00
Stephane Nicoll
5df75e74ae
Update property description
2018-09-05 09:31:38 +02:00
Stephane Nicoll
9da0b25890
Merge branch '2.0.x'
2018-09-05 09:29:45 +02:00
Stephane Nicoll
c410f7d153
Merge branch '1.5.x' into 2.0.x
2018-09-05 09:29:29 +02:00
Stephane Nicoll
b77e3e5533
Add missing properties
...
See gh-14259
2018-09-05 09:26:57 +02:00
Stephane Nicoll
3493341201
Polish
2018-09-05 09:25:48 +02:00
Stephane Nicoll
14337a8c96
Merge pull request #14297 from izeye:patch-50
...
* pr/14297:
Update @since tag
2018-09-05 08:47:10 +02:00
Johnny Lim
49c760d275
Update @since tag
...
This commit updates @since tag in CloudServiceConnectorsAutoConfiguration
as it has been renamed in cfd0ab7646
2018-09-05 08:46:25 +02:00
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
