root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
9,943 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

9943 Commits

Author SHA1 Message Date
Stephane Nicoll 998ff2feee Merge branch '1.5.x' 2016-12-20 11:59:32 +01:00
Stephane Nicoll 851ce2286f Allow to override Couchbase's CustomConversions 
Closes gh-7700
 2016-12-20 11:59:16 +01:00
Phillip Webb 571544d1b3 Merge branch '1.5.x' 2016-12-19 18:46:03 -08:00
Phillip Webb 73a45797c0 Merge branch '1.4.x' into 1.5.x 2016-12-19 18:45:35 -08:00
Phillip Webb 616d230e72 Merge pull request #7639 from chaodhib/patch-1 
* pr/7639:
  Broaden LoggingApplicationListener ignores
 2016-12-19 18:44:59 -08:00
Chaouki Dhib 2ea4d4b1d9 Broaden LoggingApplicationListener ignores 
Update `LoggingApplicationListener` to ignore all `-D` prefixed
property values. As well as catching the Azure use-case, this update
now means Spring Boot application can start when Tomcat is missing
`CATALINA_BASE\conf\logging.properties` and sets the value `-Dnop`.

Closes gh-7639
 2016-12-19 18:44:48 -08:00
Phillip Webb f36ed673fd Make Logback 1.1.8 upgrade back compatible 
Update the fix committed in a2d46dc16c to fallback to reflection based
invocation in case earlier versions of Logback are being used.

Closes gh-7638
 2016-12-19 18:30:28 -08:00
Phillip Webb 7824171413 Allow @SpyBean to work with @Primary beans 
Update `MockitoPostProcessor` so that `@SpyBean` will automatically
pick the `@Primary` bean when multiple candidates exist.

Fixes gh-7621
 2016-12-19 18:14:51 -08:00
Phillip Webb 87547f208a Add test for @SpyBean for generic bean definition 
Add an integration test to check that @SpyBean can be used with on a
bean definition that returns a generic type.

Closes gh-7625
 2016-12-19 15:58:25 -08:00
Phillip Webb e248b67751 Polish formatting 2016-12-19 13:40:47 -08:00
Phillip Webb 1f417997f3 Merge branch '1.5.x' 2016-12-19 13:21:18 -08:00
Phillip Webb d15f3548be Polish 2016-12-19 13:12:03 -08:00
Phillip Webb 6121208cbb Polish formatting 2016-12-19 12:47:03 -08:00
Phillip Webb 4b9cba351b Merge branch '1.4.x' into 1.5.x 2016-12-19 12:36:57 -08:00
Phillip Webb bd74c3d327 Polish formatting 2016-12-19 12:25:09 -08:00
Phillip Webb e578ace7d7 Polish doc formatting 2016-12-19 10:29:42 -08:00
Stephane Nicoll f03da0b4f7 Merge branch '1.5.x' 2016-12-19 16:00:19 +01:00
Stephane Nicoll 9668006aea Merge branch '1.4.x' into 1.5.x 2016-12-19 16:00:04 +01:00
Stephane Nicoll 3237e4ab3e Add link between reference and how-to 
See gh-7652
 2016-12-19 15:59:49 +01:00
Stephane Nicoll 0e8ccbc1d9 Merge branch '1.5.x' 2016-12-19 14:06:30 +01:00
Stephane Nicoll 9104ea81e8 Expose Validator bean 
This commit improves ValidationAutoConfiguration so that a `Validator`
bean is exposed if JSR 303 is available. This has the side effect of
automatically enable Spring Data Couchbase's entity validation rather
than requiring to expose a `Validator` bean.

Closes gh-5178
 2016-12-19 14:06:17 +01:00
Stephane Nicoll b000e182a2 Merge branch '1.5.x' 2016-12-19 11:32:33 +01:00
Stephane Nicoll 28e86272e8 Merge branch '1.4.x' into 1.5.x 2016-12-19 11:30:56 +01:00
Stephane Nicoll 863f97dc11 Polish since version 
Closes gh-7412
 2016-12-19 11:30:38 +01:00
Andy Wilkinson 367de7bf71 Add support for new PATCH methods to TestRestTemplate 
Closes gh-7412
 2016-12-19 11:27:10 +01:00
Stephane Nicoll b6eccc23e6 Merge branch '1.5.x' 2016-12-19 11:06:53 +01:00
Stephane Nicoll 053783abdd Merge branch '1.4.x' into 1.5.x 2016-12-19 11:06:25 +01:00
Stephane Nicoll baaf8e01b5 Start building against Spring Framework 4.3.5 snapshots 
See gh-7601
 2016-12-19 11:04:48 +01:00
Andy Wilkinson eb2901dfd3 Merge branch '1.5.x' 2016-12-16 20:54:28 +00:00
Andy Wilkinson 647057403e Merge branch '1.4.x' into 1.5.x 2016-12-16 20:53:44 +00:00
Andy Wilkinson 80a6f42a04 Upgrade to Thymeleaf Extras Springsecurity4 2.1.3.RELEASE 
Closes gh-7686
 2016-12-16 20:20:27 +00:00
Andy Wilkinson b6a64c55e3 Upgrade to Slf4j 1.7.22 
Closes gh-7685
 2016-12-16 20:20:27 +00:00
Andy Wilkinson 3e9fdcc579 Upgrade to Jooq 3.8.6 
Closes gh-7684
 2016-12-16 20:20:27 +00:00
Andy Wilkinson dfb3493123 Upgrade to Infinispan 8.2.5.Final 
Closes gh-7683
 2016-12-16 20:20:26 +00:00
Andy Wilkinson 3ead8c03e8 Upgrade to Elasticsearch 2.4.3 
Closes gh-7682
 2016-12-16 20:20:26 +00:00
Andy Wilkinson d9a77f0372 Upgrade to Aspectj 1.8.10 
Closes gh-7681
 2016-12-16 20:20:26 +00:00
Andy Wilkinson 6736b2b2cc Upgrade to Joda Time 2.9.6 
Closes gh-7680
 2016-12-16 20:20:26 +00:00
Andy Wilkinson 0afb5f4392 Upgrade to Jest 2.0.4 
Closes gh-7679
 2016-12-16 20:20:25 +00:00
Andy Wilkinson cda3ced402 Upgrade to Hazelcast 3.6.7 
Closes gh-7678
 2016-12-16 20:20:25 +00:00
Andy Wilkinson 9f41129ebd Upgrade to Appengine 1.9.48 
Closes gh-7677
 2016-12-16 20:20:25 +00:00
Andy Wilkinson 7d87adb036 Upgrade to Caffeine 2.3.5 
Closes gh-7676
 2016-12-16 20:20:24 +00:00
Andy Wilkinson 0c8a2cc32f Upgrade to Jackson 2.8.5 
Closes gh-7675
 2016-12-16 20:20:24 +00:00
Andy Wilkinson 929316e2ed Merge branch '1.5.x' 2016-12-16 16:35:08 +00:00
Andy Wilkinson 73884d90b1 Merge pull request #7671 from Vedran Pavić 
* gh-7671:
  Upgrade Spring Session to 1.3.0.RELEASE
 2016-12-16 16:34:29 +00:00
Vedran Pavic 64eb69edd7 Upgrade Spring Session to 1.3.0.RELEASE 2016-12-16 17:07:41 +01:00
Stephane Nicoll 63697a1b9b Merge branch '1.5.x' 2016-12-16 14:58:33 +01:00
Stephane Nicoll ef3f32f493 Remove unused "hasTransactionManager" method 
Closes gh-7592
 2016-12-16 14:58:22 +01:00
Stephane Nicoll 90658c5274 Merge branch '1.5.x' 2016-12-16 14:52:28 +01:00
Stephane Nicoll f46bd35a60 Merge branch '1.4.x' into 1.5.x 2016-12-16 14:52:16 +01:00
Stephane Nicoll 69dce2881b Remove outdated (and duplicated) section 
Closes gh-7667
 2016-12-16 14:52:05 +01:00