fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,725 Commits 22 Branches 339 Tags
Commit Graph

745 Commits

Author SHA1 Message Date
Phillip Webb
1b91c0ceb7 Merge branch '2.0.x' 2018-07-29 09:29:57 +01:00
Phillip Webb
0ec22c8bf9 Polish copyright date on changed files 2018-07-29 09:29:29 +01:00
Phillip Webb
80da9cf5eb Merge branch '2.0.x' 2018-07-29 09:28:56 +01:00
Phillip Webb
aeb885192e Polish ternary expressions 2018-07-29 09:24:46 +01:00
Phillip Webb
ce9c053cbf Fix checkstyle issues on master 
Fix checkstyle issues following 2.0.x merge and
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:36:04 +01:00
Phillip Webb
a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +01:00
Phillip Webb
63b609827e Fix checkstyle method order issues 
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:53 +01:00
Phillip Webb
e6a68b39a3 Fix checkstyle javadoc issues 
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
Phillip Webb
7fc455654a Fix checkstyle ternary issues 
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
Stephane Nicoll
dea1e29683 Merge branch '2.0.x' 2018-07-27 01:56:52 +02:00
Johnny Lim
8a9224b78c Polish NoSuchBeanDefinitionFailureAnalyzer 
Closes gh-13923
 2018-07-27 01:55:38 +02:00
Stephane Nicoll
ec2e3c4c0e Merge branch '2.0.x' 2018-07-27 01:03:37 +02:00
dreis2211
bfbf57b0eb Fix typo 
Closes gh-13919
 2018-07-27 01:03:01 +02:00
Stephane Nicoll
4b3c40ff10 Merge branch '2.0.x' 2018-07-27 00:47:09 +02:00
Stephane Nicoll
37f1146c31 Fix formatting 2018-07-27 00:45:31 +02:00
Madhura Bhave
db1d3fa282 Merge branch '2.0.x' 2018-07-26 12:36:40 -07:00
Madhura Bhave
c775ff8f60 Fix import 2018-07-26 12:33:52 -07:00
Madhura Bhave
6fe366bd64 Merge branch '2.0.x' 2018-07-26 12:19:57 -07:00
Madhura Bhave
6bd438a737 Document @ConditionalOnProperty limitation with collections 
Closes gh-7483
 2018-07-26 12:19:06 -07:00
Madhura Bhave
78cb802f98 Merge branch '2.0.x' 2018-07-26 11:39:42 -07:00
Madhura Bhave
57515dfa78 Fix typo 2018-07-26 11:38:23 -07:00
dreis2211
4bb78d5a48 Fix unchecked assignment in AutoConfigurationImportSelector 
Closes gh-13908
 2018-07-26 17:06:04 +02:00
Phillip Webb
b5b60c2053 Merge branch '2.0.x' 2018-07-26 13:23:07 +01:00
Phillip Webb
9a9111af21 Support path discovery for main dispatcher servlet 
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
 2018-07-26 11:35:12 +01:00
Stephane Nicoll
bdf028a2e6 Merge branch '2.0.x' 2018-07-25 15:39:01 +02:00
Stephane Nicoll
99f33d5070 Start building against Spring Data Kay snapshots 
See gh-13890
 2018-07-25 15:34:52 +02:00
Andy Wilkinson
1ab98ca33f Start building against Spring HATEOAS 0.25.0 snapshots 
See gh-13742
 2018-07-25 15:21:20 +02:00
Stephane Nicoll
56542ef809 Start building against Spring Integration 2.1.0 snapshots 
See gh-13891
 2018-07-25 14:50:14 +02:00
Madhura Bhave
eefa0ada9f Allow property overrides for OIDC Configuration Provider 
Closes gh-13869
 2018-07-24 15:11:05 -07:00
Madhura Bhave
5011bc6451 Merge branch '2.0.x' 2018-07-24 14:28:01 -07:00
Madhura Bhave
6032b454b0 Polish 2018-07-24 14:11:01 -07:00
Madhura Bhave
f5617601aa Polish "Register OAuth2AuthorizedClientRepository bean" 
Closes gh-13870
 2018-07-24 13:31:03 -07:00
artsiom
2dcf19938d Register OAuth2AuthorizedClientRepository bean 2018-07-24 13:30:36 -07:00
Stephane Nicoll
c98bb40136 Adapt NoSuchBeanDefinitionFailureAnalyzer to framework change 
This commit adapts to a Spring Framework change based on SPR-11419 and
SPR-15338. Rather than throwing an exception when injecting a List or
Map of a candidate bean that is not present, an empty collection/map is
injected.
 2018-07-24 13:36:38 +02:00
Stephane Nicoll
5fb2060566 Polish "Add configuration for Tomcat's cachingAllowed property" 
Closes gh-13614
 2018-07-24 11:20:35 +02:00
Rob Tompkins
200ac6db30 Add configuration for Tomcat's cachingAllowed property 
See gh-13614
 2018-07-24 11:18:33 +02:00
Stephane Nicoll
dcd230fc00 Merge branch '2.0.x' 2018-07-24 10:38:48 +02:00
Stephane Nicoll
7d2e25f6f8 Merge branch '1.5.x' into 2.0.x 2018-07-24 10:37:31 +02:00
dreis2211
d0918f87b2 Fix OAuth2WebSecurityConfigurationTests 
Closes gh-13872
 2018-07-24 09:57:42 +02:00
Andy Wilkinson
70dbcba7b6 Merge branch '2.0.x' 2018-07-20 17:04:25 +01:00
Andy Wilkinson
daad992c96 Merge branch '1.5.x' into 2.0.x 2018-07-20 17:03:59 +01:00
Stephane Nicoll
11d9a7c30d Merge branch '2.0.x' 2018-07-20 15:51:28 +02:00
Stephane Nicoll
fc0a687ee0 Migrate test to ApplicationContextRunner 2018-07-20 15:51:14 +02:00
Madhura Bhave
d958e83799 Merge branch '2.0.x' 2018-07-19 15:48:29 -07:00
Madhura Bhave
56235187d0 Fix typo 2018-07-19 15:47:14 -07:00
Andy Wilkinson
a33dd8b9cb Merge branch '2.0.x' 2018-07-19 20:43:58 +01:00
Andy Wilkinson
10b91602e9 Increase connect and read timeouts when testing against Cassandra 2018-07-19 20:43:39 +01:00
Stephane Nicoll
bc7db86c8c Consistently apply exclude on auto-configuration 
Previously, exclude of an import selector was applied only locally. In
other words, if one import selector imports `AcmeAutoConfiguration` and
another one exclude it, it would still be imported because exclude were
applied separately

This commit collects the outcome of all auto-configuration import
selectors and then apply exclusions in a single pass.

Closes gh-12586
 2018-07-19 14:08:10 +02:00
Stephane Nicoll
184cd0c708 Avoid CGLIB requirement in MessageSourceAutoConfiguration 
Closes gh-13824
 2018-07-19 13:58:19 +02:00
Madhura Bhave
ceaac98847 Update docs with OIDC provider configuration 
See gh-13210
 2018-07-18 12:27:13 -07:00