Stephane Nicoll
0dafc37f76
Merge branch '2.0.x'
2018-09-07 14:50:04 +02:00
Stephane Nicoll
b7e1a2ea6c
Add reference to Rollbar starter
...
Closes gh-14343
2018-09-07 14:49:25 +02:00
Andy Wilkinson
a2f29f90af
Merge branch '2.0.x'
2018-09-07 11:31:12 +01:00
Andy Wilkinson
4b23d847d8
Merge branch '1.5.x' into 2.0.x
2018-09-07 11:31:00 +01:00
Andy Wilkinson
7a000e68cd
Work around null return from getMetaAnnotationTypes during doc generation
2018-09-07 11:30:19 +01:00
Andy Wilkinson
4ae057694f
Merge branch '2.0.x'
2018-09-07 11:09:06 +01:00
Andy Wilkinson
aa45f3c702
Merge branch '1.5.x' into 2.0.x
2018-09-07 10:53:15 +01:00
Andy Wilkinson
db903c2176
Align defaults in ServerProperties with defaults at runtime
...
Closes gh-13821
2018-09-07 10:51:39 +01:00
Stephane Nicoll
93a16aa887
Merge branch '2.0.x'
2018-09-07 10:49:20 +02:00
Stephane Nicoll
8771f2d0a0
Merge branch '1.5.x' into 2.0.x
2018-09-07 10:49:06 +02:00
Stephane Nicoll
7d54eda6f1
Fix tests
2018-09-07 10:47:20 +02:00
Stephane Nicoll
b5064cba71
Merge branch '2.0.x'
2018-09-07 10:15:28 +02:00
Stephane Nicoll
88edf22216
Merge branch '1.5.x' into 2.0.x
2018-09-07 10:15:14 +02:00
Stephane Nicoll
0b07c026af
Fix version of amqp-client
...
Closes gh-14259
2018-09-07 10:13:49 +02:00
Stephane Nicoll
59110e6cb8
Merge branch '2.0.x'
2018-09-07 09:44:54 +02:00
Stephane Nicoll
61344f7d9c
Upgrade to Reactor Bom Bismuth-SR11
...
Closes gh-14322
2018-09-07 09:44:05 +02:00
Stephane Nicoll
128ed77a69
Start building against Spring Framework 5.0 snapshots
...
See gh-14325
2018-09-07 09:43:05 +02:00
Stephane Nicoll
320e337ecf
Merge branch '1.5.x' into 2.0.x
2018-09-07 09:42:35 +02:00
Stephane Nicoll
cb2873df77
Start building against Spring Framework 4.3 snapshots
...
See gh-14326
2018-09-07 09:41:06 +02:00
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
bc19d4fc3b
Merge pull request #14206 from kuldeepsidhu88
...
* gh-14206:
Polish "Remove redundancy from actuator documentation"
Remove redundancy from actuator documentation
2018-09-06 15:41:34 -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
64be6ae564
Merge branch 'gh-11077'
2018-09-06 13:36:45 -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
8477c6b8c5
Merge pull request #14318 from mp911de:mongo-client-settings
...
* pr/14318:
Polish "Fix use of deprecated Mongo API"
Fix use of deprecated Mongo API
2018-09-06 16:45:18 +02: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
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