spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-07 17:59:02 +00:00
Code Issues Projects Releases Wiki Activity
16,443 Commits 24 Branches 395 Tags
38f7b2b9da2b4e052d6f15f310ff51bd4672495e
Commit Graph
16443 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andy Wilkinson 87aef1c379 Merge branch '1.5.x' 2018-04-05 07:50:17 +01:00
Andy Wilkinson 8608202e56 Remove Surefire workarounds that are not needed with 2.21 
Closes gh-12721
 2018-04-05 07:48:09 +01:00
Andy Wilkinson 61ab4f6ca8 Upgrade to Spring Kafka 1.1.8.RELEASE 
Closes gh-12772
 2018-04-05 07:42:19 +01:00
Andy Wilkinson 88a18a635a Upgrade to Spring Amqp 1.7.7.RELEASE 
Closes gh-12771
 2018-04-05 07:42:18 +01:00
Andy Wilkinson 89638d6807 Upgrade to Freemarker 2.3.28 
Closes gh-12770
 2018-04-05 07:42:17 +01:00
Andy Wilkinson 4a47ab4b3e Make JAX-B available to the Jersey 1 sample on Java 9 2018-04-05 07:13:10 +01:00
Andy Wilkinson a8bbf7120e Merge branch '1.5.x' 2018-04-05 07:11:34 +01:00
Andy Wilkinson e066558601 Upgrade to Dependency Management Plugin 1.0.5.RELEASE 
Closes gh-12406
 2018-04-05 07:10:38 +01:00
Phillip Webb 7bcb5c44ec Merge pull request #12669 from geo-m 
* pr/12669:
  Polish "Allow validation api without implementation"
  Allow validation api without implementation
 2018-04-04 21:24:44 -07:00
Phillip Webb 0c98d0e7d3 Polish "Allow validation api without implementation" 
Closes gh-12669
 2018-04-04 21:24:25 -07:00
geo_m a74dc74ec3 Allow validation api without implementation 
Allow validation api in the classpath without
a validator, as long as no bean is annotated `@Validated`

See gh-12669
 2018-04-04 21:24:20 -07:00
Phillip Webb b67e6aafb5 Merge pull request #12680 from graben 
* pr/12680:
  Polish "Prevent warnings when running embedded Artemis"
  Prevent warnings when running embedded Artemis
 2018-04-04 21:11:09 -07:00
Phillip Webb 41dc70146a Polish "Prevent warnings when running embedded Artemis" 
Closes gh-12680
 2018-04-04 21:10:35 -07:00
Benjamin Graf 19818b752c Prevent warnings when running embedded Artemis 
Configure AddressSettings for DLQ and ExpiryQueue for the embedded
Artemis broker to prevent warnings from being logged.

Closes gh-12680
 2018-04-04 21:03:04 -07:00
Phillip Webb 68dc9fed3b Upgrade to Spring Integration 5.0.4 
Closes gh-12693
 2018-04-04 20:47:51 -07:00
Phillip Webb ec419fca8b Upgrade to Spring Security 5.0.4 
Closes gh-12694
 2018-04-04 20:46:36 -07:00
Phillip Webb 0c0b60bfa4 Upgrade to Spring Data Kay SR6 
Closes gh-12696
 2018-04-04 20:43:47 -07:00
Phillip Webb f76c574f8e Merge pull request #12767 from jkschneider 
* pr/12767:
  Upgrade to Micrometer 1.0.3
 2018-04-04 20:42:50 -07:00
Jon Schneider 03158e2fd5 Upgrade to Micrometer 1.0.3 
Closes gh-12767
 2018-04-04 20:42:23 -07:00
Phillip Webb 236b1bc4b6 Merge pull request #12626 from igor-suhorukov 
* pr/12626:
  Polish "Use lambdas for map entry iteration where possible"
  Use lambdas for map entry iteration where possible
 2018-04-04 20:32:17 -07:00
Phillip Webb 685babc829 Polish "Use lambdas for map entry iteration where possible" 
Closes gh-12626
 2018-04-04 19:36:18 -07:00
igor-suhorukov 69bc19e0ca Use lambdas for map entry iteration where possible 
See gh-12626
 2018-04-04 19:36:10 -07:00
Phillip Webb 78a94cafe1 Merge pull request #12635 from clemstoquart 
* pr/12635:
  Add missing managed JUnit Jupiter dependencies
 2018-04-04 18:13:05 -07:00
Clement Stoquart 276037cd56 Add missing managed JUnit Jupiter dependencies 
Add managed dependencies for `junit-jupiter-params` and
`junit-vintage-engine`.

Closes gh-12635
 2018-04-04 18:12:46 -07:00
Phillip Webb 5413ad3ce7 Merge pull request #12732 from dreis2211 
* pr/12732:
  Populate cache in ConfigFileApplicationListener
  Polish
 2018-04-04 18:10:33 -07:00
dreis2211 cc66de28d0 Populate cache in ConfigFileApplicationListener 
Fix `ConfigFileApplicationListener` so that the loadDocumentsCache is
populated when documents are loaded.

Closes gh-12732
 2018-04-04 18:09:08 -07:00
dreis2211 35b4cd01ab Polish 2018-04-04 18:08:38 -07:00
Phillip Webb 0ec737a0b7 Merge pull request #12721 from SteKoe 
* pr/12721:
  Upgrade Maven failsafe plugin to 2.21.0
  Upgrade Maven surefire plugin to 2.21.0
 2018-04-04 18:07:22 -07:00
Phillip Webb bc15f9ee9b Upgrade Maven failsafe plugin to 2.21.0 
See gh-12721
 2018-04-04 18:06:45 -07:00
Stephan Köninger 373f5e7682 Upgrade Maven surefire plugin to 2.21.0 
Closes gh-12721
 2018-04-04 18:05:10 -07:00
Phillip Webb 598e9bb842 Polish 2018-04-04 18:01:25 -07:00