Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,224 Commits 23 Branches 0 Tags
105105db3e6d5cdecbc15afdb4458cb20f2e48de
Commit Graph

16224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
105105db3e Merge branch '2.0.x' 2018-04-11 11:37:16 +02:00
Stephane Nicoll
3c169b4e0a Fix bean name of EnvironmentEndpointWebExtension 
Closes gh-12827
 2018-04-11 11:34:44 +02:00
Stephane Nicoll
5f3bccc3ba Merge branch '2.0.x' 2018-04-11 10:52:03 +02:00
Stephane Nicoll
8d81bcd101 Merge pull request #12825 from thsnoopy:fix-typo 
* pr/12825:
  Fix typo
 2018-04-11 10:51:53 +02:00
Ken Kwon
16ad34aa19 Fix typo 
Closes gh-12825
 2018-04-11 10:51:20 +02:00
Madhura Bhave
5cfbd33235 Merge branch '2.0.x' 2018-04-10 12:00:31 -07:00
Madhura Bhave
a09a6f223b Reinstate commit status for concourse builds 
Fixes gh-10851
 2018-04-10 11:59:17 -07:00
Stephane Nicoll
55ea9f796f Merge branch '2.0.x' 2018-04-10 20:24:19 +02:00
Stephane Nicoll
e8fac7d9c4 Properly discover endpoints that are proxied 
Previously to this commit, if a `@ControllerEndpoint`,
`@RestControllerEndpoint` or `@ServletEndpoint` annotated bean was
proxied, the endpoint wasn't properly detected.

This commit makes sure that annotation retrieval works on the user class
while preserving the get (vs. find) retrieval semantic

Closes gh-12441
 2018-04-10 20:23:55 +02:00
Stephane Nicoll
86b96254a1 Migrate to ApplicationContextRunner 2018-04-10 20:23:54 +02:00
Andy Wilkinson
02c0425a15 Merge branch '2.0.x' 2018-04-10 16:48:03 +01:00
Andy Wilkinson
d8b2a17e1c Reinstate CI image builds for 2.0.x pipeline 2018-04-10 16:47:42 +01:00
Stephane Nicoll
ea8e5acd22 Merge branch '2.0.x' 2018-04-10 11:47:33 +02:00
Stephane Nicoll
729f07907f Merge pull request #12812 from izeye:polish-20180410 
* pr/12812:
  Polish contribution
  Polish
 2018-04-10 11:46:45 +02:00
Stephane Nicoll
f83934e192 Polish contribution 
Closes gh-12812
 2018-04-10 11:46:16 +02:00
Johnny Lim
f03849d502 Polish 
See gh-12812
 2018-04-10 11:46:16 +02:00
Andy Wilkinson
50ffec0e92 Merge branch '2.0.x' 2018-04-10 09:53:45 +01:00
Andy Wilkinson
a9020df9b9 Remove pull request and CI image builds from 2.0.x pipeline 2018-04-10 09:53:15 +01:00
Andy Wilkinson
7c3696bd64 Next development version (v2.1.0.BUILD-SNAPSHOT) 2018-04-10 09:46:49 +01:00
Andy Wilkinson
ce0f2d2fe5 Merge branch '2.0.x' 2018-04-10 09:45:22 +01:00
Andy Wilkinson
a50ef54e3b Create 2.0.x branch and CI pipeline 2018-04-10 09:42:30 +01:00
Andy Wilkinson
4fbe0b1283 Add dependency management for Kafka 
Closes gh-12815
 2018-04-10 09:07:19 +01:00
Phillip Webb
8c4080b914 Merge branch '1.5.x' 2018-04-09 18:21:11 -07:00
Phillip Webb
370915f8f0 Fixup version numbers following release 2018-04-09 18:20:41 -07:00
Spring Buildmaster
c10aad165f Next Development Version 2018-04-09 23:14:33 +00:00
Phillip Webb
ba85cefce3 Polish 2018-04-09 14:50:03 -07:00
Stephane Nicoll
d89048300a Merge branch '1.5.x' 2018-04-09 19:59:21 +02:00
Stephane Nicoll
ba5ed5b97c Upgrade to Spring Framework 4.3.16 
Closes gh-12806
 2018-04-09 19:43:31 +02:00
Andy Wilkinson
8d5b9f37d5 Merge branch '1.5.x' 2018-04-09 17:59:53 +01:00
Andy Wilkinson
cd0e4fe945 Sanitize sun.java.command by default 
Closes gh-12796
 2018-04-09 17:44:51 +01:00
Andy Wilkinson
8b1a101cb6 Merge branch '1.5.x' 2018-04-09 17:39:26 +01:00
Andy Wilkinson
a06de4d997 Stop error page filter from commiting response prematurely 
Previously, the error page filter used sendError to set the response
status when handling an exception and before forwarding the request
to the error controller. Following the fix for gh-11814, this meant
that the error controller was unable to write its response and the
containers default error page was returned instead.

This commit updates the error page filter to use setStatus rather than
sendError. This ensures that the response has the correct status code
while allowing the error controller to write its body. Tests have
been added to the Tomcat deployment test suite to verify that the
error page filter behaves as intended when dealing with a sent error
and an exception for requests accepting HTML, JSON, or anything.

Closes gh-12787
 2018-04-09 16:14:27 +01:00
Stephane Nicoll
1454bce725 Merge pull request #12655 from diamondblack:update-couchbase-deprecated-endpoint 
* pr/12655:
  Polish "Replace Couchbase's deprecated methods"
  Replace Couchbase's deprecated methods
 2018-04-09 16:19:41 +02: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
Spring Buildmaster
5587eac8de Next development version (v2.0.2.BUILD-SNAPSHOT) 2018-04-05 12:27:03 +00:00
Andy Wilkinson
c3bf8541d7 Do not rely on findAvailableTcpPort finding an available port 
Closes gh-12779
 2018-04-05 11:35:58 +01:00
Stephane Nicoll
c0af8666c3 Merge branch '1.5.x' 2018-04-05 11:23:34 +02:00
Stephane Nicoll
3634a1d9d1 Fixup version numbers following release 2018-04-05 11:23:15 +02:00
Brian Clozel
b23befcaf8 Merge pull request #12605 from jliu666:master 
* pr/12605:
  Add docker-api starter to 3rd party list
 2018-04-05 11:12:48 +02:00
Jichun Liu
34986ed12f Add docker-api starter to 3rd party list 
See https://github.com/jliu666/docker-api-spring-boot

Closes gh-12605
 2018-04-05 11:12:29 +02:00
Spring Buildmaster
ade4760842 Next Development Version 2018-04-05 09:01:52 +00:00
Andy Wilkinson
f335ec00bf Polish 2018-04-05 09:31:17 +01:00
Andy Wilkinson
b13b3be2f1 Merge pull request #12776 from Dejan Jankov 
* gh-12776:
  Fix broken links to Gradle and Maven tools, and CLI samples in README
 2018-04-05 09:10:49 +01:00
Dejan Jankov
194a7a0c9b Fix broken links to Gradle and Maven tools, and CLI samples in README 
Closes gh-12776
 2018-04-05 09:10:20 +01:00
Andy Wilkinson
71df9c8618 Upgrade to Spring Kafka 2.1.5.RELEASE 
Closes gh-12775
 2018-04-05 07:51:52 +01:00
Andy Wilkinson
b42325f388 Upgrade to Spring Amqp 2.0.3.RELEASE 
Closes gh-12774
 2018-04-05 07:51:51 +01:00
Andy Wilkinson
0c6a09201d Upgrade to Couchbase Client 2.5.7 
Closes gh-12773
 2018-04-05 07:51:50 +01:00