root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity
16,946 Commits 28 Branches 365 Tags 289 MiB
Commit Graph

16946 Commits

Author SHA1 Message Date
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
Andy Wilkinson 55d66f3e6d Merge branch '2.0.x' 2018-05-08 09:58:57 +01:00
Andy Wilkinson 14520f6ca8 Include build pipeline name in Slack alerts 2018-05-08 09:58:33 +01:00
Brian Clozel 84c9a65e9d Auto-configure Elasticsearch REST clients 
This commit adds auto-configuration support for both `RestClient` and
`RestHighLevelClient` which are provided by `elasticsearch-rest-client`
and `elasticsearch-rest-high-level-client` dependencies respectively.

`RestClient` is associated with configuration properties in the
`spring.elasticsearch.rest.*` namespace, since this is the component
taking care of HTTP communication with the actual Elasticsearch node.

`RestHighLevelClient` wraps the first one and naturally inherits that
configuration.

Closes gh-12600
 2018-05-07 17:57:09 +02:00
Stephane Nicoll 43ef5ba205 Merge pull request #13078 from izeye:polish-20180505 
* pr/13078:
  Polish
 2018-05-07 14:55:39 +02:00
Johnny Lim 96ce71ddc4 Polish 
Closes gh-13078
 2018-05-07 14:55:13 +02:00
Stephane Nicoll 3ad8f3fcbf Merge branch '2.0.x' 2018-05-07 14:53:58 +02:00
Stephane Nicoll 9dccf5b895 Polish 
See gh-13078
 2018-05-07 14:48:56 +02:00
Stephane Nicoll 7f50d49251 Merge branch '2.0.x' 2018-05-07 14:42:39 +02:00
Stephane Nicoll 6e428100d7 Merge pull request #13084 from dreis2211:mock-server-empty-enumeration 
* pr/13084:
  Remove MockServletWebServer.emptyEnumeration()
 2018-05-07 14:42:06 +02:00
dreis2211 15d67d6b12 Remove MockServletWebServer.emptyEnumeration() 
Closes gh-13084
 2018-05-07 14:41:06 +02:00
Stephane Nicoll 9cf68a2de4 Merge branch '2.0.x' 2018-05-07 14:38:52 +02:00
Stephane Nicoll 4a1bdc2c05 Merge pull request #13085 from dreis2211:remove-deprecation-yaml-loader 
* pr/13085:
  Fix deprecation warning in OriginTrackedYamlLoader
 2018-05-07 14:38:40 +02:00
dreis2211 e3862d9bdf Fix deprecation warning in OriginTrackedYamlLoader 
Closes gh-13085
 2018-05-07 14:38:22 +02:00
Brian Clozel 31c7102800 Upgrade to Reactor Californium 
This Reactor generation will get the Reactor Netty 0.8 upgrade, which
will include important changes such as maven coordinate, package and API
changes.
 2018-05-07 11:48:04 +02:00
Brian Clozel 2e9b6bec1b Merge branch '2.0.x' 2018-05-07 10:56:22 +02:00
Brian Clozel 925269eacc Upgrade to Reactor Bismuth SR9 
Closes gh-12848
 2018-05-07 10:54:24 +02:00
Phillip Webb c578a30e90 Polish 2018-05-04 23:12:42 -07:00