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

16316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Clozel
e0eadfe723 Merge branch '2.0.x' 2018-04-21 09:47:20 +02:00
Brian Clozel
f1b3188c3c Upgrade to Netty 4.1.24.Final 2018-04-21 09:47:02 +02:00
Madhura Bhave
c449660642 Merge branch '2.0.x' 2018-04-20 12:38:09 -07:00
Madhura Bhave
5afa7d1965 Reset URLStreamHandlerFactory instance between tests 2018-04-20 12:28:53 -07:00
Stephane Nicoll
719fcb4038 Merge branch '2.0.x' 2018-04-20 07:20:24 +02:00
Stephane Nicoll
c9e819fdeb Merge pull request #12922 from dreis2211:replace-code-tags 
* pr/12922:
  Replace <code> tags where possible
 2018-04-20 07:19:58 +02:00
dreis2211
a930835b92 Replace <code> tags where possible 
Closes gh-12922
 2018-04-20 07:19:31 +02:00
Madhura Bhave
d7abbe37cd Merge branch '2.0.x' 2018-04-19 15:00:38 -07:00
Madhura Bhave
5792042d5d Fix verify statements in tests 2018-04-19 14:59:48 -07:00
Madhura Bhave
ca41a3c1cc Merge branch '2.0.x' 2018-04-19 14:22:25 -07:00
Madhura Bhave
c93f7ddff6 Make truststore & keystore optional on SslStoreProvider 
Fixes gh-11395
 2018-04-19 14:21:57 -07:00
Madhura Bhave
c81e984b79 Merge branch '2.0.x' 2018-04-19 10:40:17 -07:00
Madhura Bhave
2e836ac74b Use token to prevent rate limiting by Github API 2018-04-19 10:39:52 -07:00
Stephane Nicoll
36e33a3b94 Merge branch '2.0.x' 2018-04-19 09:26:56 +02:00
Stephane Nicoll
5ecf33958c Merge pull request #12877 from evernat:patch-1 
* pr/12877:
  Add reference to javamelody starter
 2018-04-19 09:26:43 +02:00
evernat
91fa76a9a2 Add reference to javamelody starter 
Closes gh-12877
 2018-04-19 09:25:38 +02:00
Madhura Bhave
5d949cc736 Merge branch '2.0.x' 2018-04-18 10:48:22 -07:00
Madhura Bhave
35af166750 Fix tests 
See gh-11380
 2018-04-18 10:47:37 -07:00
Madhura Bhave
a8707c520c Merge branch '2.0.x' 2018-04-18 10:28:44 -07:00
Madhura Bhave
cab9bff4f4 Log included profiles according to the processing order 
This commit includes some refactoring of active profiles
processing. Previously, there was a LIFO Queue for adding active
profiles. Profiles that were added last, were processed first.
Because of this reverse ordering, profiles were prepended to the
environment to preserve the order in which they were logged.
This however didn't work for "included" profiles as they were
prepended to the environment even though they were processed after
the active profile. In this commit, profiles are processed in a FIFO manner
and processed as they're found.

Fixes gh-11380
 2018-04-18 10:03:12 -07:00
Stephane Nicoll
e72306b33e Merge branch '2.0.x' 2018-04-18 09:50:09 +02:00
Stephane Nicoll
4ef7ea324f Merge pull request #12895 from jnduan:master 
* pr/12895:
  Fix additional missing semicolon on sample code
  Add missing semicolon on sample code
 2018-04-18 09:49:52 +02:00
Stephane Nicoll
026d8bed5f Fix additional missing semicolon on sample code 
Closes gh-12895
 2018-04-18 09:49:15 +02:00
Jienan Duan
90ae14ec21 Add missing semicolon on sample code 
See gh-12895
 2018-04-18 09:47:54 +02:00
Stephane Nicoll
c7645604a6 Merge branch '2.0.x' 2018-04-18 09:42:08 +02:00
Stephane Nicoll
97877c2aab Merge pull request #12894 from jkschneider:webmvc-tags-perf 
* pr/12894:
  Polish "Less object instantiation in WebMvcTags"
  Less object instantiation in WebMvcTags
 2018-04-18 09:41:57 +02:00
Stephane Nicoll
2b98b11c12 Polish "Less object instantiation in WebMvcTags" 
Closes gh-12894
 2018-04-18 09:41:40 +02:00
Jon Schneider
d676147680 Less object instantiation in WebMvcTags 
See gh-12894
 2018-04-18 09:38:23 +02:00
Stephane Nicoll
c43eb89823 Make sure that finalName is read only 
Closes gh-12608
 2018-04-17 17:53:18 +02:00
Stephane Nicoll
b2f34f5c20 Remove spring.provides 
Closes gh-12435
 2018-04-17 17:46:43 +02:00
Stephane Nicoll
9b5c39a541 Merge pull request #12550 from ruifigueira:feature/hibernate-metrics 
* pr/12550:
  Polish "Add auto-configuration for Hibernate metrics"
  Add auto-configuration for Hibernate metrics
 2018-04-17 13:47:22 +02:00
Stephane Nicoll
a85998f4c3 Polish "Add auto-configuration for Hibernate metrics" 
Closes gh-12550
 2018-04-17 13:46:27 +02:00
Rui Figueira
b6b92ba937 Add auto-configuration for Hibernate metrics 
All Hibernate entityManagerFactories are automatically instrumented
and their statistics are included into Micrometer using its
HibernateMetrics binder.

Closes gh-12550
 2018-04-17 13:23:18 +02:00
Stephane Nicoll
3cb2246e7a Merge branch '2.0.x' 2018-04-16 11:33:59 +02:00
Stephane Nicoll
0bc7bef5e5 Properly handle InvalidEndpointRequestException 
This commit makes sure that `InvalidEndpointRequestException` is wrapped
in a `ReflectionException` when invoked via JMX.

Closes gh-12857
 2018-04-16 11:33:22 +02:00
Stephane Nicoll
f139dc3608 Merge branch '2.0.x' 2018-04-16 08:43:57 +02:00
Stephane Nicoll
2002115637 Add doc ref for hierarchical name mapping 2018-04-16 08:43:46 +02:00
Stephane Nicoll
12541d7efc Merge branch '2.0.x' 2018-04-16 08:16:30 +02:00
Stephane Nicoll
1c0f589c01 Simplify Joinfaces community starter entry 
See gh-12867
 2018-04-16 08:16:18 +02:00
Stephane Nicoll
0fd743cdb1 Merge branch '2.0.x' 2018-04-16 08:10:17 +02:00
Stephane Nicoll
369856dd2a Merge pull request #12866 from dreis2211:fix-duplicated-comment-typos 
* pr/12866:
  Fix duplicate words in comments
 2018-04-16 08:10:00 +02:00
dreis2211
2bbf438c36 Fix duplicate words in comments 
Closes gh-12866
 2018-04-16 08:09:40 +02:00
Madhura Bhave
982a110fc1 Merge branch '2.0.x' 2018-04-13 12:00:06 -07:00
Madhura Bhave
df7ddeefc4 Polish promotion script 
See gh-12292
 2018-04-13 11:57:56 -07:00
Stephane Nicoll
1583d342cc Merge branch '2.0.x' 2018-04-13 16:40:27 +02:00
Stephane Nicoll
bfe31e6688 Fix broken build 2018-04-13 16:40:15 +02:00
Stephane Nicoll
d0b2b9b1a5 Merge branch '2.0.x' 2018-04-13 16:29:44 +02:00
Stephane Nicoll
fa542bacc0 Translate user-defined exception when invoking JMX operation 
This commit makes sure to respect the MBeanServer#invoke contract by
wrapping any user-defined exception in an MBeanException. Also, any
exception not from the JDK is translated, as it may lead to unexpected
issue on the client if that class isn't present. This is consistent
with our operation result mapping strategy.

Closes gh-10448
 2018-04-13 16:26:04 +02:00
Stephane Nicoll
fb60716e1b Merge branch '2.0.x' 2018-04-13 15:19:06 +02:00
Stephane Nicoll
2204d5f750 Polish 2018-04-13 15:18:42 +02:00