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

483 Commits

Author SHA1 Message Date
Stephane Nicoll
0819822eb6 Merge branch '2.0.x' 2018-05-02 10:42:03 +02:00
Stephane Nicoll
fbf8f57773 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:41:24 +02:00
Stephane Nicoll
9f7be62687 Backport polish commit "22b99a90" 2018-05-01 11:33:26 -07:00
Stephane Nicoll
0fcffae0d9 Merge branch '2.0.x' 2018-04-30 16:50:51 +02:00
Johnny Lim
d8700522d3 Rename nested *AutoConfiguration classes to *Configuration 
Closes gh-12989
 2018-04-30 16:50:18 +02:00
Stephane Nicoll
22b99a90de Polish 
See gh-12906
 2018-04-28 10:36:41 +02:00
Madhura Bhave
acc1793e96 Merge branch '2.0.x' 2018-04-27 13:19:46 -07:00
Madhura Bhave
0385bd4131 Use spring.session.timeout for Spring Session timeout 
Fallback to server.servlet.session.timeout for backwards compatibility.

Fixes gh-12906
 2018-04-27 13:16:17 -07:00
Stephane Nicoll
4d0fe5bbe6 Merge branch '2.0.x' 2018-04-27 09:33:48 +02:00
Johnny Lim
b941c5f1a6 Polish 
Closes gh-12981
 2018-04-27 09:29:16 +02:00
Stephane Nicoll
b090280b0c Improve Couchbase auto-configuration 
This commit improves the couchbase auto-configuration so that it is
easier to customize the way the connection to the couchbase server is
initiated.

See gh-11146
 2018-04-25 13:35:49 +02:00
Brian Clozel
e39e125aa2 Merge branch '2.0.x' 2018-04-23 13:54:42 +02:00
Brian Clozel
e3e404f9f9 Fix optional ContentNegotiationStrategy for Actuator 
Since https://jira.spring.io/browse/SPR-16624, the contract for
`ContentNegotiationStrategy` has been refined and should never return an
empty list if it's got no preference for a media type, but it should
rather respond with a `"*/*"` instead.

This commit fixes the `OptionalPathExtensionContentNegotiationStrategy`
defined in the Spring MVC auto-configuration to have that behavior.

Fixes gh-12900
 2018-04-23 13:48:42 +02:00
Stephane Nicoll
719fcb4038 Merge branch '2.0.x' 2018-04-20 07:20:24 +02:00
dreis2211
a930835b92 Replace <code> tags where possible 
Closes gh-12922
 2018-04-20 07:19:31 +02:00
Vedran Pavic
7b9c5a3dc3 Use Jersey BOM in dependency management 
Closes gh-12847
 2018-04-12 15:58:32 +02:00
Stephane Nicoll
38bd4bd58c Stop associating an Executor bean to Quartz 
This commits make sure that the Quartz auto-configuration no longer
associates an `Executor` bean if present in the context as Quartz offers
properties to tune it, which would mutate and lead to unexpected
results.

Closes gh-12823
 2018-04-12 15:48:20 +02:00
Stephane Nicoll
e4e56bbcc3 Migrate to ApplicationContextRunner 2018-04-12 15:48:20 +02:00
Phillip Webb
ba85cefce3 Polish 2018-04-09 14:50:03 -07:00
Stephane Nicoll
6692301d51 Polish "Replace Couchbase's deprecated methods" 
Closes gh-12655
 2018-04-09 16:17:46 +02:00
Yulin Qin
3236306e53 Replace Couchbase's deprecated methods 
See gh-12655
 2018-04-09 13:22:22 +02:00
Stephane Nicoll
92d9479765 Gracefully handle exclusion of DataSourceAutoConfiguration 
This commit makes sure that an auto-configuration that requires
`DataSourceProperties` will not break if `DataSourceAutoConfiguration`
has been explicitly excluded.

Closes gh-12512
 2018-04-09 10:34:23 +02:00
Madhura Bhave
2f5ab50367 Add @QuartzDataSource for quartz auto-configuration 
Closes gh-12755
 2018-04-05 16:49:04 -07:00
Phillip Webb
41dc70146a Polish "Prevent warnings when running embedded Artemis" 
Closes gh-12680
 2018-04-04 21:10:35 -07:00
Benjamin Graf
19818b752c Prevent warnings when running embedded Artemis 
Configure AddressSettings for DLQ and ExpiryQueue for the embedded
Artemis broker to prevent warnings from being logged.

Closes gh-12680
 2018-04-04 21:03:04 -07:00
Phillip Webb
685babc829 Polish "Use lambdas for map entry iteration where possible" 
Closes gh-12626
 2018-04-04 19:36:18 -07:00
igor-suhorukov
69bc19e0ca Use lambdas for map entry iteration where possible 
See gh-12626
 2018-04-04 19:36:10 -07:00
Phillip Webb
598e9bb842 Polish 2018-04-04 18:01:25 -07:00
Phillip Webb
d49a1024bd Merge branch '1.5.x' 2018-04-04 15:35:20 -07:00
Phillip Webb
6fb4fba43a Merge branch '1.5.x' 2018-04-04 12:17:57 -07:00
Madhura Bhave
8e81f0c23d Fix conditions report message for same short name 
If two auto-configuration classes with the same name are present,
the conditions report message now uses the fully qualified name for
both instead of the short name.

Fixes gh-11710
 2018-04-02 12:57:28 -07:00
Phillip Webb
7649eb6230 Allow auto-configure sort with incomplete chain 
Update `AutoConfigurationSorter` so that all `@AutoConfigureBefore` and
`@AutoConfigureAfter` classes are considered even if they are ultimately
not part of the requested set.

Prior to this commit, given classes ordered with annotations such that
A -> B -> C a call to sort only [A, B] could return the incorrect order.

Fixes gh-12660
 2018-03-29 18:00:38 -07:00
Stephane Nicoll
4b4a8acb9d Group auto-configuration import selectors together 
This commit updates Spring Boot's DeferredImportSelector implementations
to group imports in a consistent set. This makes sure ordering is
applied consistently.

Closes gh-12366
 2018-03-29 17:41:35 -07:00
Phillip Webb
98a2a91d16 Polish 2018-03-29 14:00:13 -07:00
Stephane Nicoll
d456e1de49 Polish contribution 
Closes gh-12590
 2018-03-29 08:53:17 +02:00
Johnny Lim
74f9a84ea9 Make intermediate classes in type hierarchy of public class public 
See gh-12590
 2018-03-29 08:51:46 +02:00
Stephane Nicoll
13f45e6434 Remove misleading Jersey configuration property 
This commit removes an override of a `ResourceConfig` property that was
set as an init parameter property (and therefore ignored).

Closes gh-3557
 2018-03-28 13:53:26 +02:00
Stephane Nicoll
ccbfcbedf0 Add support for org.jooq.RecordUnmapperProvider 
Closes gh-12560
 2018-03-28 13:42:54 +02:00
Stephane Nicoll
42e81e987b Fix @EnableIntegrationManagement 
Restore proper use of `defaultCountsEnabled` that was inadvertently
changed to `countsEnabled`

Closes gh-12594
 2018-03-27 18:57:41 +02:00
Stephane Nicoll
553b184248 Polish "Use Supplier variants of Assert methods" 
Closes gh-12630
 2018-03-26 17:59:35 +02:00
dreis2211
3b0f6e7168 Use Supplier variants of Assert methods 
See gh-12630
 2018-03-26 17:58:17 +02:00
Stephane Nicoll
62cc4e9552 Polish "Remove value in @ConditionalOnMissingBean if possible" 
Closes gh-12604
 2018-03-26 17:47:00 +02:00
Johnny Lim
c100510222 Remove value in @ConditionalOnMissingBean if possible 
See gh-12604
 2018-03-26 17:38:46 +02:00
Johnny Lim
625bf93598 Polish 
See gh-12584
 2018-03-26 17:33:25 +02:00
Stephane Nicoll
9cac45d514 Polish "Add Redis Sentinel database support" 
Closes gh-12556
 2018-03-26 12:37:37 +02:00
Alen Turkovic
1f80079c49 Add Redis Sentinel database support 
See gh-12556
 2018-03-26 12:33:16 +02:00
igor-suhorukov
21628a9a59 Polish 
Closes gh-12553
 2018-03-20 09:08:21 -04:00
Andy Wilkinson
72e36eadae Polish 2018-03-17 15:28:05 +00:00
Andy Wilkinson
6c77b012f0 Polish "Follow project convention for lambda expression" 
Csee gh-12527
 2018-03-17 15:23:50 +00:00
igor-suhorukov
261264cef3 Follow project convention for lambda expression 
Closes gh-12527
 2018-03-17 15:22:37 +00:00