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

18359 Commits

Author SHA1 Message Date
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
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