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
15,435 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

15435 Commits

Author SHA1 Message Date
Andy Wilkinson 682612efa3 Revert "Start building against Spring Framework 5.0.4 snapshots" 
This reverts commit 9dd7b0689d.
 2018-02-13 16:24:26 +00:00
Andy Wilkinson e1ab62668f Merge branch '1.5.x' 2018-02-13 15:05:28 +00:00
Andy Wilkinson d59000ceb1 Change ownership when log file is created by launch script 
Closes gh-11951
 2018-02-13 14:54:35 +00:00
Andy Wilkinson 9dd7b0689d Start building against Spring Framework 5.0.4 snapshots 
This reverts commit f24c92c658 which is
no longer necessary as SPR-16456 has no been fixed.

See gh-11894
 2018-02-13 13:43:47 +00:00
Stephane Nicoll fd13202b69 Merge pull request #12017 from jkschneider:micrometer-config 
* pr/12017:
  Polish "Remove unnecessary config options for metrics"
  Remove unnecessary config options for JDBC, Rabbit, and Cache metrics
 2018-02-13 14:42:46 +01:00
Stephane Nicoll b28cabdb12 Polish "Remove unnecessary config options for metrics" 
Closes gh-12017"
 2018-02-13 14:36:52 +01:00
Jon Schneider 49f21a2264 Remove unnecessary config options for JDBC, Rabbit, and Cache metrics 
See gh-12017
 2018-02-13 14:36:52 +01:00
Andy Wilkinson db4ffbbc4b Expose constants for Spring application JSON property names 
Closes gh-12012
 2018-02-13 13:22:50 +00:00
Andy Wilkinson ce9b2b8266 Auto-configure Micrometer’s Tomcat metrics 
Closes gh-11916
 2018-02-13 12:47:25 +00:00
Andy Wilkinson 01b1c1d947 Perform failure analysis of MissingRequiredConfigurationException 
Closes gh-12010
 2018-02-13 11:35:18 +00:00
Stephane Nicoll 718bc72fb8 Merge pull request #11997 from qinnnyul:add-health-indicator-for-reactive-mongo 
* pr/11997:
  Polish "Add health indicator for reactive MongoDB"
  Add health indicator for reactive MongoDB
 2018-02-13 11:33:03 +01:00
Stephane Nicoll 28f5392787 Polish "Add health indicator for reactive MongoDB" 
Closes gh-11997
 2018-02-13 11:22:04 +01:00
Yulin Qin eee2694648 Add health indicator for reactive MongoDB 
See gh-11997
 2018-02-13 11:22:04 +01:00
Andy Wilkinson a02fdc755e Stop MeterRegistries when context is closed 
Closes gh-12006
 2018-02-13 09:34:11 +00:00
Stephane Nicoll 9696737dce Merge pull request #12019 from izeye:polish-modifier-order 
* pr/12019:
  Polish "Polish modifier order"
  Polish modifier order
 2018-02-13 09:50:36 +01:00
Stephane Nicoll d468a0714e Polish "Polish modifier order" 
Closes gh-12019
 2018-02-13 09:50:20 +01:00
Johnny Lim 87bf0b26df Polish modifier order 
See gh-12019
 2018-02-13 09:49:59 +01:00
Stephane Nicoll 114ece56b8 Merge pull request #12011 from igor-suhorukov:master 
* pr/12011:
  Polish "Remove redundant casts"
  Remove redundant casts
 2018-02-13 09:34:19 +01:00
Stephane Nicoll 31da4cc35d Polish "Remove redundant casts" 
Closes gh-12011
 2018-02-13 09:34:08 +01:00
igor-suhorukov 71351de694 Remove redundant casts 
See gh-12011
 2018-02-13 09:33:49 +01:00
Phillip Webb 74cede5cdc Migrate integration tests to context runner 
Migrate `IntegrationAutoConfigurationTests` to use the
`ApplicationContextRunner`.
 2018-02-12 17:49:54 -08:00
Phillip Webb 728b522307 Include scope support on ApplicationContextAssert 
Update `ApplicationContextAssert` with support for scopes. Allows
tests to consider the all ancestors, or limit assertions to just the
current context.

Fixes gh-12015
 2018-02-12 17:49:54 -08:00
Phillip Webb d6858ae162 Fix ConfigurationPropertySources parent attach 
Update `ConfigurationPropertySources` so that the underlying sources
are checked when attaching. Prior to this commit, in a parent/child
setup the `ConfigurationPropertySources` adapter may already present
on the parent. This means the attaching is skipped but the managed
sources are incorrect.

Fixes gh-12013
 2018-02-12 17:49:53 -08:00
Phillip Webb 7ab587a067 Add initializer support 
Add `ApplicationContextInitializer` support to
`ApplicationContextRunner`.
 2018-02-12 17:49:53 -08:00
Phillip Webb 3bec55e16c Formatting 2018-02-12 17:49:53 -08:00
Madhura Bhave 3880bdb908 Add example for customizing webflux security 
Closes gh-11928
 2018-02-12 16:26:30 -08:00
Madhura Bhave 16a499b2fa Cloud Foundry health should always show details 
Fixes gh-12014
 2018-02-12 15:28:06 -08:00
Phillip Webb f34aa6f4d8 Migrate to Spring Integration Micrometer support 
Remove custom `SpringIntegrationMetrics` and instead provide
auto-configuration to the direct Micrometer support added in Spring
Integration 5.0.2.

Closes gh-11985
 2018-02-12 13:24:29 -08:00
Andy Wilkinson b0e86bd7ac Align New Relic and Signal FX tests with those for other exporters 
Closes gh-11970
 2018-02-12 20:43:56 +00:00
Andy Wilkinson 384a4ed6a9 Use metrics export.*.enabled properties to control auto-configuration 
Closes gh-11978
 2018-02-12 20:18:11 +00:00
Madhura Bhave 85aeb5c00d Fix path in tests 2018-02-12 10:19:52 -08:00
Phillip Webb 0348889fd7 Polish 2018-02-12 10:03:06 -08:00
Andy Wilkinson e49d50fe9d Improve testing of metrics auto-configuration 
Closes gh-11970
 2018-02-12 17:05:05 +00:00
Stephane Nicoll ebbdfe72da Merge pull request #12004 from izeye:polish-20180213 
* pr/12004:
  Polish
 2018-02-12 17:11:00 +01:00
Johnny Lim 5a9865dabb Polish 
Closes gh-12004
 2018-02-12 17:10:43 +01:00
Stephane Nicoll c97a9a0cb2 Merge branch '1.5.x' 2018-02-12 17:08:09 +01:00
Stephane Nicoll 2f6d05dc51 Fix parsing of String value in json 
Closes gh-11992
 2018-02-12 17:05:32 +01:00
Brian Clozel 2be0c46562 Remove TestRestTemplate constructors taking template args 
As discussed in gh-11872, `TestRestTemplate` constructor variants taking
a `RestTemplate` argument are confusing since the main goal of that
class is to mutate `RestTemplate`.

This commit removes all those constructor variants and replaces them
with `RestTemplateBuilder` arguments when possible.

Closes gh-11872
 2018-02-12 16:57:15 +01:00
Stephane Nicoll eec3eed5f5 Mention how to configure the web application type in tests 
Closes gh-11025
 2018-02-12 14:32:46 +01:00
Stephane Nicoll 51de8ae6be Polish doc 
See gh-11803
 2018-02-12 14:15:44 +01:00
Stephane Nicoll ce36529ef8 Fix javadoc generation 2018-02-12 14:09:57 +01:00
Stephane Nicoll ca5ebea24b Polish 2018-02-12 14:07:58 +01:00
Stephane Nicoll 9aa751a949 Make an explicit link to MongoDataAutoConfiguration 
Closes gh-12001
 2018-02-12 14:03:43 +01:00
Stephane Nicoll 7473642f58 Harmonize endpoints exclude property 
Closes gh-11914
 2018-02-12 14:00:40 +01:00
Andy Wilkinson 037b6d8ba2 Auto-configure Micrometer's New Relic and SignalFX support 
Closes gh-11803
 2018-02-12 12:00:38 +00:00
Andy Wilkinson 1b156fc2c3 Polish 2018-02-12 11:26:53 +00:00
Andy Wilkinson 6d1d9eb816 Polish 2018-02-12 10:53:30 +00:00
Andy Wilkinson bc814d2039 Prevent authenticated principal from clashing with argument of same name 
Closes gh-11988
 2018-02-12 10:46:19 +00:00
Stephane Nicoll 1772a154d7 Make sure that failsafe uses target/classes 
This commit configures the failsafe plugin to use the classes directory
rather than the produced jar file as the latter can be a repackaged jar
by default.

Closes gh-11974
 2018-02-12 11:35:39 +01:00
Stephane Nicoll fba2615a82 Merge pull request #11953 from pkostrzewa:gh-8029 
* pr/11953:
  Polish "Improve FailureAnalyzer for embedded datasource"
  Improve FailureAnalyzer for embedded datasource
 2018-02-12 11:11:50 +01:00