root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity
16,963 Commits 23 Branches 348 Tags 288 MiB
Commit Graph

16963 Commits

Author SHA1 Message Date
Andy Wilkinson 47138af538 Correct the CI badge and link for 2.0.x builds 2018-05-09 14:06:32 +01:00
Andy Wilkinson 073849b9e5 Merge branch '2.0.x' 2018-05-09 11:26:12 +01:00
Andy Wilkinson 989975bb67 Merge branch '1.5.x' into 2.0.x 2018-05-09 11:25:48 +01:00
Andy Wilkinson d2cef484cb Fix up version numbers following release 2018-05-09 11:25:21 +01:00
Spring Buildmaster 010b4fccbd Next development version 2018-05-09 09:31:46 +00: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
Andy Wilkinson ba16f135a6 Merge pull request #13108 from Jon Schneider 
* gh-13108:
  Upgrade to Micrometer 1.0.4
 2018-05-09 06:39:33 +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 2cb775a90c Merge branch '1.5.x' into 2.0.x 2018-05-09 06:36:07 +01:00
Andy Wilkinson 7cfaf5e287 Upgrade to Spring Integration 4.3.16.RELEASE 
Closes gh-13015
 2018-05-09 06:35:29 +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 8e909f69af Merge branch '2.0.x' 2018-05-08 20:17:37 +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 3243ccd8b3 Merge pull request #13090 from ifigotin 
* gh-13090:
  Polish "Clarify deployment of Spring Boot apps to App Engine Standard"
  Clarify deployment of Spring Boot apps to App Engine Standard
 2018-05-08 20:14:34 +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 3183e2cb87 Merge branch '2.0.x' 2018-05-08 19:18:40 +01:00
Andy Wilkinson ce8e1527ca Merge branch '1.5.x' into 2.0.x 2018-05-08 19:18:34 +01:00
Andy Wilkinson 6ce43df110 Upgrade to Spring Security OAuth 2.0.15 
Closes gh-13098
 2018-05-08 19:17:10 +01:00
Andy Wilkinson 82bf178880 Upgrade to Spring Security 4.2.6 
Closes gh-13028
 2018-05-08 19:15:42 +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
Andy Wilkinson 626d84dd66 Merge branch '2.0.x' 2018-05-08 12:51:53 +01:00
Andy Wilkinson 7b6546c28c Merge branch '1.5.x' into 2.0.x 2018-05-08 12:51:45 +01:00
Andy Wilkinson 2c865688f9 Upgrade to Spring Data Ingalls SR12 
Closes gh-13014
 2018-05-08 12:51:09 +01:00
Andy Wilkinson 12e1ec5a6a Merge branch '2.0.x' 2018-05-08 12:38:18 +01:00
Andy Wilkinson bc80e90b00 Merge branch '1.5.x' into 2.0.x 2018-05-08 12:38:13 +01:00
Andy Wilkinson 2195ed1e8e Update Jetty war package test to expect new ASM transitive dependency 
Closes gh-13097
 2018-05-08 12:37:19 +01:00
Andy Wilkinson e4bdf4e513 Polish 2018-05-08 12:14:39 +01:00
Andy Wilkinson a1bea69555 Make Elasticsearch dependency available to javadoc generation 
See gh-12600
 2018-05-08 12:12:21 +01:00
Stephane Nicoll 503faf3153 Merge branch '2.0.x' 2018-05-08 12:45:17 +02:00
Stephane Nicoll 6577513464 Upgrade to Spring Framework 5.0.6.RELEASE 
Closes gh-13021
 2018-05-08 12:44:55 +02:00
Andy Wilkinson 5b26974000 Merge branch '2.0.x' 2018-05-08 11:30:37 +01:00
Andy Wilkinson 874650cb33 Merge branch '1.5.x' into 2.0.x 2018-05-08 11:30:30 +01:00
Andy Wilkinson 8a5cefb547 Upgrade to Spring Framework 4.3.17.RELEASE 
Closes gh-13013
 2018-05-08 11:29:04 +01:00
Andy Wilkinson 63aff45438 Upgrade to Jetty 9.4.10.v20180503 
Closes gh-13097
 2018-05-08 11:28:01 +01:00