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

2090 Commits

Author SHA1 Message Date
Stephane Nicoll
b0433d66c1 Merge branch '2.0.x' 2018-05-11 14:24:13 +02:00
dreis2211
e6a23fa3ff Remove unnecessary semicolons 
Closes gh-13144
 2018-05-11 14:23:47 +02:00
Andy Wilkinson
b88a20fabb Polish 2018-05-11 13:05:17 +01:00
Andy Wilkinson
a325b13d05 Polish "Auto-configure a ResourceConfig for Jersey endpoints if needed" 
Closes gh-11948
 2018-05-11 12:49:44 +01:00
Michael J. Simons
bb2864ad02 Auto-configure a ResourceConfig for Jersey endpoints if needed 
See gh-11948
 2018-05-11 12:49:31 +01:00
Andy Wilkinson
d5e4a19446 Upgrade to Liquibase 3.6.1 and adapt to logging changes 
Closes gh-13145
 2018-05-11 12:37:54 +01:00
Andy Wilkinson
39d7382129 Merge branch '2.0.x' 2018-05-11 11:54:19 +01:00
Andy Wilkinson
972d952716 Merge branch '1.5.x' into 2.0.x 2018-05-11 11:54:12 +01:00
Andy Wilkinson
079b67c53b Merge branch '2.0.x' 2018-05-11 11:16:11 +01:00
Andy Wilkinson
7913d9b599 Add methods to BootJar for adding content to BOOT-INF 
Closes gh-13000
 2018-05-11 11:14:14 +01:00
Andy Wilkinson
07251a09d1 Merge branch '2.0.x' 2018-05-11 10:32:05 +01:00
Andy Wilkinson
d9d7499ae6 Merge branch '1.5.x' into 2.0.x 2018-05-11 10:31:52 +01:00
Stephane Nicoll
360f4e17c2 Add support for PageableHandlerMethodArgumentResolver in WebMvcTest 
Closes gh-13066
 2018-05-11 10:37:17 +02:00
Stephane Nicoll
5e87a3d2fa Polish 
See gh-13130
 2018-05-11 10:03:03 +02:00
Stephane Nicoll
00a43d8f4d Merge branch '2.0.x' 2018-05-11 10:01:30 +02:00
Johnny Lim
75e591e76e Polish 
Closes gh-13130
 2018-05-11 10:00:15 +02:00
Stephane Nicoll
c35cb1b69f Merge branch '2.0.x' 2018-05-11 09:57:18 +02:00
Stephane Nicoll
4683940423 Merge branch '1.5.x' into 2.0.x 2018-05-11 09:56:54 +02:00
Stephane Nicoll
a11acbc829 Merge branch '2.0.x' 2018-05-11 08:55:21 +02:00
Stephane Nicoll
4bec3b7cd9 Polish 
See gh-13123
 2018-05-11 08:55:03 +02:00
Madhura Bhave
ea99d8cab0 Merge branch '2.0.x' 2018-05-10 11:53:25 -07:00
Madhura Bhave
05cf8229d9 Fix tests 2018-05-10 11:50:43 -07:00
Madhura Bhave
36c89e2383 Merge branch '2.0.x' 2018-05-10 10:01:42 -07:00
Madhura Bhave
c937bb68a0 ServletEndpoints should take servletPath into account 
Fixes gh-13106
 2018-05-10 10:01:11 -07:00
Andy Wilkinson
0b76fc8f8e Merge branch '2.0.x' 2018-05-10 15:46:47 +01:00
Andy Wilkinson
fbf974478a Merge branch '1.5.x' into 2.0.x 2018-05-10 15:46:28 +01:00
Madhura Bhave
36c7602f2a Merge branch '2.0.x' 2018-05-09 12:04:34 -07:00
Madhura Bhave
4ec87956f9 Fix EndpointRequest include/exclude for ServletEndpoints 
Fixes gh-13089
 2018-05-09 12:01:58 -07:00
Stephane Nicoll
c72df104d8 Improve caches endpoint format 
This commit adds an intermediate "caches" element so that additional
cache manager attributes can be added in the future.

Closes gh-13079
 2018-05-09 11:08:23 +02:00
Andy Wilkinson
d77c4c83a1 Polish 2018-05-09 09:19:03 +01:00
Andy Wilkinson
a41c9eb736 Merge branch '2.0.x' 2018-05-09 09:14:48 +01:00
Andy Wilkinson
e14a2e33ab Deprecate queue size property for StatsD metrics export 
Closes gh-13108
 2018-05-09 09:14:09 +01:00
Andy Wilkinson
c826310fd1 Polish 2018-05-09 08:44:15 +01:00
Andy Wilkinson
56fa85f179 Merge branch '2.0.x' 2018-05-09 06:40:39 +01:00
Jon Schneider
c6860cb431 Upgrade to Micrometer 1.0.4 
Closes gh-13108
 2018-05-09 06:38:55 +01:00
Andy Wilkinson
33861b3608 Upgrade to Spring Integration 5.0.5.RELEASE 
Closes gh-13016
 2018-05-09 06:37:22 +01:00
Andy Wilkinson
ba407da259 Merge branch '2.0.x' 2018-05-08 21:21:29 +01:00
Andy Wilkinson
e407ed5f92 Upgrade to Spring Session Apple-SR2 
Closes gh-13103
 2018-05-08 21:21:08 +01:00
Andy Wilkinson
3a3eeb0caf Merge branch '2.0.x' 2018-05-08 21:12:58 +01:00
Andy Wilkinson
8ce4110966 Allow Jersey-based Actuator to be used with separate management port 
Previously, when the Jersey-based Actuator was configure with a
separate management port, the resulting child context would fail to
start due to their being no ResourceConfigCustomizer beans available.

This commit updates the configuration so that the customizer's are
injected using an ObjectProvider and an empty list is used in the
event of their being no customizer beans. This aligns the child
context configuration class with JerseyAutoConfiguration which
already used this approach.

Closes gh-12975
 2018-05-08 21:00:05 +01:00
Andy Wilkinson
e45384bdfa Upgrade to Spring Kafka 2.1.6.RELEASE 
Closes gh-13018
 2018-05-08 20:16:41 +01:00
Andy Wilkinson
5dbba99aed Merge branch '2.0.x' 2018-05-08 20:15:02 +01:00
Andy Wilkinson
7a53623e1c Polish "Clarify deployment of Spring Boot apps to App Engine Standard" 
See gh-13090
 2018-05-08 20:12:46 +01:00
ifigotin
676b013998 Clarify deployment of Spring Boot apps to App Engine Standard 
Closes gh-13090
 2018-05-08 20:12:33 +01:00
Andy Wilkinson
95c415fd93 Merge branch '2.0.x' 2018-05-08 17:08:04 +01:00
Andy Wilkinson
5168766ebb Upgrade to Spring Security 5.0.5.RELEASE 
Closes gh-13029
 2018-05-08 17:07:17 +01:00
Andy Wilkinson
bca2756b46 Upgrade to Jaybird 3.0.4 
Closes gh-13100
 2018-05-08 17:06:55 +01:00
Andy Wilkinson
47c45539d9 Upgrade to Lettuce 5.0.4.RELEASE 
Closes gh-13099
 2018-05-08 17:06:40 +01:00
Stephane Nicoll
8fc997243a Merge branch '2.0.x' 2018-05-08 17:23:01 +02:00
Stephane Nicoll
f9134c9325 Upgrade to Spring Data Kay SR7 
Closes gh-13017
 2018-05-08 17:22:01 +02:00