Brian Clozel
5e83192d7d
Upgrade to Reactor Californium RC1
...
Closes gh-14323
2018-09-07 09:07:40 +02:00
Madhura Bhave
62cb87b40b
Merge branch '2.0.x'
2018-09-06 15:46:07 -07:00
Madhura Bhave
ccdbc0aa06
Polish "Remove redundancy from actuator documentation"
...
Closes gh-14206
2018-09-06 15:41:08 -07:00
kuldeepsidhu88
abf5e63b54
Remove redundancy from actuator documentation
...
See gh-14206
2018-09-06 15:40:46 -07:00
Phillip Webb
04710373bf
Add @Author attribution
...
See gh-11077
2018-09-06 13:42:29 -07:00
Phillip Webb
bc357225b5
Polish MockitoPostProcessor
...
Closes gh-11077
2018-09-06 13:31:35 -07:00
Andreas Neiser
a5b3a2646b
Test @MockBean/@SpyBean with @Primary
...
Add additional tests to ensure that `@MockBean` and `@SpyBean`
work consistently when combined with `@Primary`.
See gh-11077
2018-09-06 13:31:33 -07:00
Phillip Webb
c777614d8f
Support @MockBean/@SpyBean with @Primary
...
Update `MockitoPostProcessor` so that `@MockBean` and `@SpyBean`
work consistently when combined with `@Primary`.
See gh-11077
Co-authored-by: Andreas Neiser <andreas.neiser@gmail.com>
2018-09-06 13:24:41 -07:00
Phillip Webb
82b27c60a4
Drop MockitoPostProcessor factory method
...
Remove factory method previously used to create the mock instance.
Since commit 0e00a49dcc
, the method is not longer needed.
See gh-11077
2018-09-06 13:22:46 -07:00
Brian Clozel
a32cd1965e
Switch to Reactor Californium-BUILD-SNAPSHOT
...
In preparation for gh-14323
2018-09-06 20:39:32 +02:00
Andy Wilkinson
ad4179cc43
Merge branch '2.0.x'
2018-09-06 16:38:55 +01:00
Andy Wilkinson
6c865f9b43
Polish
...
See gh-1176
2018-09-06 16:38:27 +01:00
Stephane Nicoll
4d031999ce
Polish "Fix use of deprecated Mongo API"
...
Closes gh-14318
2018-09-06 16:44:56 +02:00
Mark Paluch
b97892ff88
Fix use of deprecated Mongo API
...
We now use com.mongodb.MongoClientSettings to configure the reactive
MongoDB driver. This is a breaking change as
MongoClientSettingsBuilderCustomizer and user-provided
MongoClientSettings beans referenced the package the settings type
from com.mongodb.async.client.
MongoClient.getSettings() is deprecated and still in use within tests
until a replacement is available.
See gh-14318
2018-09-06 16:44:55 +02:00
Stephane Nicoll
f3ece97d9d
Add spring-framework.version alias for spring.version
...
Closes gh-12544
2018-09-06 15:31:28 +02:00
Stephane Nicoll
a170bfcc76
Deprecate micrometer meter's enabled flags
...
This commit deprecates the few 'enabled' flags that control whether
certain meter binders are registered in the context.
Metrics auto-configuration for the JVM, Logback and System-related
information have been moved to individual auto-configurations so that
they can be excluded rather than using the now deprecated flag.
This harmonizes our policy with regards to disabling behaviour,
especially since other similar auto-configurations do not have such
flag.
Closes gh-13408
2018-09-06 15:08:39 +02:00
Andy Wilkinson
79a964e563
Merge branch '2.0.x'
2018-09-06 13:11:50 +01:00
Andy Wilkinson
53372d5fd7
Document the use of --args to pass arguments to bootRun
...
Closes gh-1176
2018-09-06 13:08:40 +01:00
Stephane Nicoll
45ef926a90
Merge branch '2.0.x'
2018-09-06 12:18:12 +02:00
Stephane Nicoll
ff8b8c55c6
Remove reference to "management.metrics.binders.integration.enabled"
...
Closes gh-14319
2018-09-06 12:17:57 +02:00
Phillip Webb
0e725543d5
Merge branch '2.0.x'
2018-09-05 13:43:16 -07:00
Phillip Webb
a2cea6a45a
Upgrade amqp-client to 5.4.1
...
See gh-14259
2018-09-05 13:41:50 -07:00
Phillip Webb
ec27137632
Merge branch '1.5.x' into 2.0.x
2018-09-05 13:40:48 -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
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
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
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
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
Stephane Nicoll
45204d7ee0
Harmonize JAXB version in dependency management
...
Closes gh-14308
2018-09-05 10:35:28 +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
Johnny Lim
49c760d275
Update @since tag
...
This commit updates @since tag in CloudServiceConnectorsAutoConfiguration
as it has been renamed in cfd0ab7646
.
Closes gh-14297
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