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

1103 Commits

Author SHA1 Message Date
Madhura Bhave
6855c5556d EndpointRequest should consider server.servlet.path 
Fixes gh-12934
 2018-05-04 16:03:31 -07:00
Phillip Webb
5b3cb8a698 Update copyright header year for changed files 2018-05-04 15:59:26 -07:00
Phillip Webb
6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Stephane Nicoll
23c49116ff Merge branch '2.0.x' 2018-05-04 16:57:27 +02:00
Stephane Nicoll
18b1e8da60 Merge branch '1.5.x' into 2.0.x 2018-05-04 16:57:12 +02:00
Phillip Webb
b6a2a46f78 Merge branch '2.0.x' 2018-05-03 23:54:42 -07:00
Phillip Webb
2d70a7ae5e Polish caught exception names 
Prefer `ex` over `e`.
 2018-05-03 22:43:32 -07:00
Phillip Webb
41efea51a7 Polish ternary expressions 
Consistently format ternary expressions and always favor `!=` as the
the check.
 2018-05-03 22:43:12 -07:00
Phillip Webb
8c0c0ee55a Merge branch '2.0.x' 2018-05-03 12:44:58 -07:00
Phillip Webb
e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Stephane Nicoll
36a377764f Merge branch '2.0.x' 2018-05-03 15:53:32 +02:00
Stephane Nicoll
700ec6b840 Polish "Complete SSL configuration for Kafka" 
Closes gh-13031
 2018-05-03 15:50:33 +02:00
Toshiaki Maki
d208641c59 Complete SSL configuration for Kafka 
See gh-13031
 2018-05-03 15:38:49 +02:00
Stephane Nicoll
921c037956 Merge branch '2.0.x' 2018-05-03 11:47:33 +02:00
Stephane Nicoll
69ab956e8b Stop assuming datasource creation failure originates from auto-config 
There are documented way to reuse bits of the infrastructure in user
config to offer similar datasource configuration. If that fails, the
regular failure there will kick in.

This commit improves `DataSourceBeanCreationFailureAnalyzer` to not
misguide users that the auto-configuration has failed. Rather, it
describes what has failed in a more generic way.

Closes gh-12947
 2018-05-03 11:46:27 +02:00
Gary Russell
8cf34238d3 Start building against Spring Kafka 2.2.0 snapshots 
Closes gh-13007
 2018-05-02 16:15:08 +02:00
Stephane Nicoll
4eeddbd889 Merge branch '2.0.x' 2018-05-02 16:08:03 +02:00
Stephane Nicoll
d6244889f5 Add default value for "spring.flyway.locations" 
See gh-12193
 2018-05-02 16:07:38 +02:00
Andy Wilkinson
0526594a3c Merge branch '2.0.x' 2018-05-02 12:26:23 +01:00
Andy Wilkinson
f019d5c85b Merge branch '1.5.x' into 2.0.x 2018-05-02 12:22:04 +01:00
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