Stephane Nicoll
b5e113c64f
Merge branch '2.0.x'
6 years ago
Stephane Nicoll
ce63db2e42
Upgrade to Spring Framework 5.0.9
...
Closes gh-14325
6 years ago
Stephane Nicoll
49b4913d48
Upgrade to Spring Framework 5.1.0.RC3
...
Closes gh-14324
6 years ago
Andy Wilkinson
bb370db9cc
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
c1c5354fcf
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
124705080b
Tolerate context root redirect not being configurable on Tomcat 7
...
Closes gh-13821
6 years ago
Stephane Nicoll
0dafc37f76
Merge branch '2.0.x'
6 years ago
Stephane Nicoll
b7e1a2ea6c
Add reference to Rollbar starter
...
Closes gh-14343
6 years ago
Andy Wilkinson
a2f29f90af
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
4b23d847d8
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
7a000e68cd
Work around null return from getMetaAnnotationTypes during doc generation
6 years ago
Andy Wilkinson
4ae057694f
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
aa45f3c702
Merge branch '1.5.x' into 2.0.x
6 years ago
Andy Wilkinson
db903c2176
Align defaults in ServerProperties with defaults at runtime
...
Closes gh-13821
6 years ago
Stephane Nicoll
93a16aa887
Merge branch '2.0.x'
6 years ago
Stephane Nicoll
8771f2d0a0
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
7d54eda6f1
Fix tests
6 years ago
Stephane Nicoll
b5064cba71
Merge branch '2.0.x'
6 years ago
Stephane Nicoll
88edf22216
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
0b07c026af
Fix version of amqp-client
...
Closes gh-14259
6 years ago
Stephane Nicoll
59110e6cb8
Merge branch '2.0.x'
6 years ago
Stephane Nicoll
61344f7d9c
Upgrade to Reactor Bom Bismuth-SR11
...
Closes gh-14322
6 years ago
Stephane Nicoll
128ed77a69
Start building against Spring Framework 5.0 snapshots
...
See gh-14325
6 years ago
Stephane Nicoll
320e337ecf
Merge branch '1.5.x' into 2.0.x
6 years ago
Stephane Nicoll
cb2873df77
Start building against Spring Framework 4.3 snapshots
...
See gh-14326
6 years ago
Brian Clozel
5e83192d7d
Upgrade to Reactor Californium RC1
...
Closes gh-14323
6 years ago
Madhura Bhave
62cb87b40b
Merge branch '2.0.x'
6 years ago
Madhura Bhave
bc19d4fc3b
Merge pull request #14206 from kuldeepsidhu88
...
* gh-14206:
Polish "Remove redundancy from actuator documentation"
Remove redundancy from actuator documentation
6 years ago
Madhura Bhave
ccdbc0aa06
Polish "Remove redundancy from actuator documentation"
...
Closes gh-14206
6 years ago
kuldeepsidhu88
abf5e63b54
Remove redundancy from actuator documentation
...
See gh-14206
6 years ago
Phillip Webb
04710373bf
Add @Author attribution
...
See gh-11077
6 years ago
Phillip Webb
64be6ae564
Merge branch 'gh-11077'
6 years ago
Phillip Webb
bc357225b5
Polish MockitoPostProcessor
...
Closes gh-11077
6 years ago
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
6 years ago
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>
6 years ago
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
6 years ago
Brian Clozel
a32cd1965e
Switch to Reactor Californium-BUILD-SNAPSHOT
...
In preparation for gh-14323
6 years ago
Andy Wilkinson
ad4179cc43
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
6c865f9b43
Polish
...
See gh-1176
6 years ago
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
6 years ago
Stephane Nicoll
4d031999ce
Polish "Fix use of deprecated Mongo API"
...
Closes gh-14318
6 years ago
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
6 years ago
Stephane Nicoll
f3ece97d9d
Add spring-framework.version alias for spring.version
...
Closes gh-12544
6 years ago
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
6 years ago
Andy Wilkinson
79a964e563
Merge branch '2.0.x'
6 years ago
Andy Wilkinson
53372d5fd7
Document the use of --args to pass arguments to bootRun
...
Closes gh-1176
6 years ago
Stephane Nicoll
45ef926a90
Merge branch '2.0.x'
6 years ago
Stephane Nicoll
ff8b8c55c6
Remove reference to "management.metrics.binders.integration.enabled"
...
Closes gh-14319
6 years ago
Phillip Webb
0e725543d5
Merge branch '2.0.x'
6 years ago
Phillip Webb
a2cea6a45a
Upgrade amqp-client to 5.4.1
...
See gh-14259
6 years ago