root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity
16,256 Commits 25 Branches 369 Tags 282 MiB
Commit Graph

16256 Commits

Author SHA1 Message Date
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
Phillip Webb dfb9dc2d26 Merge pull request #12762 from jkschneider 
* pr/12762:
  Polish "Apply MeterRegistryCustomizer to composites"
  Apply MeterRegistryCustomizer to composites
 2018-04-04 16:01:55 -07:00
Phillip Webb ce9ca6ae70 Polish "Apply MeterRegistryCustomizer to composites" 
Closes gh-12762
 2018-04-04 16:00:53 -07:00
Jon Schneider 1fce462944 Apply MeterRegistryCustomizer to composites 
Update `MeterRegistryConfigurer` to also apply customizers to
composite meter registries. Prior to this commit composites were
skipped due to the incorrect assumption that did not contain
their own state.

Closes gh-12762
 2018-04-04 15:58:16 -07:00
Phillip Webb d49a1024bd Merge branch '1.5.x' 2018-04-04 15:35:20 -07:00
Phillip Webb 6b59814cbc Switch error views to use SimpleEvaluationContext 
Update `ErrorMvcAutoConfiguration` to use `SimpleEvaluationContext`
rather than `StandardEvaluationContext`.

Fixes gh-12507
 2018-04-04 15:34:02 -07:00
Phillip Webb 696aedaef8 Merge branch '1.5.x' 2018-04-04 14:51:16 -07:00
Phillip Webb 624a5f8260 Apply URL decoding for nested jar entry names 
Update `JarURLConnection` to apply URL decoding to nested jar entry
names.

Fixes gh-12765
 2018-04-04 14:49:06 -07:00
Brian Clozel 799e1ba077 Upgrade to Netty 4.1.23.Final 
Closes gh-12764
 2018-04-04 23:07:46 +02:00
Phillip Webb 4bb3930d38 Merge branch '1.5.x' 2018-04-04 12:39:36 -07:00
Phillip Webb f08c496858 Upgrade to Spring Integration 4.3.15 
Closes gh-12692
 2018-04-04 12:33:45 -07:00
Phillip Webb 3563baf36b Update to Spring Data Ingalls SR11 
Closes gh-12695
 2018-04-04 12:33:04 -07:00
Phillip Webb 6fb4fba43a Merge branch '1.5.x' 2018-04-04 12:17:57 -07:00
Phillip Webb dd0866000f Revert "Add text/plain error response support" 
This reverts commit 23892e33d6.
 2018-04-04 12:06:13 -07:00
Phillip Webb 7242ddae3c Polish 2018-04-04 12:05:08 -07:00
Andy Wilkinson aa27334671 Run deployment tests on JDK 9 and 10 where possible 
Closes gh-10414
 2018-04-04 14:48:58 +01:00
Andy Wilkinson e44bfbea4a Merge branch '1.5.x' 2018-04-04 14:15:52 +01:00
Andy Wilkinson c4923d6273 Ignore existing output when asserting captured log output 
Closes gh-12734
 2018-04-04 14:14:45 +01:00
Andy Wilkinson 7b39cdd5c4 Merge branch '1.5.x' 2018-04-04 13:49:18 +01:00
Andy Wilkinson ac88a60071 Ensure error is sent before Writer or OutputStream is used 
Previously, ErrorPageFilter's ErrorResponseWrapper would delaying
sending an error back to the client. In cases where the response's
Writer or OutputStream was accessed and flushed or closed, this could
lead to the wrong response status being sent.

This commit updates ErrorResponseWrapper so that it will send any
capture error to the client before returning the response's Writer or
OutputStream. This ensures that closing the Writer or OutputStream
does not cause the response to be committed with the default response
status rather than the previously captured error status.

Such responses will now include the correct status, but will not be
forwarded to the error controller. Such forwarding is not possible
due to the response already having been committed.

Closes gh-11814
 2018-04-04 13:49:08 +01:00
Andy Wilkinson b951397a7c Upgrade to Spring REST Docs 2.0.1.RELEASE 
Closes gh-12681
 2018-04-04 12:50:37 +01:00
Brian Clozel f6d16c8b99 Align WebFluxTags uri support on WebMvcTags 
This commit ensures that `WebFluxTags` not only relies on
`BEST_MATCHING_PATTERN_ATTRIBUTE` or request URI to provide the "uri"
tag information.

To avoid cardinality explosion, HTTP not found and redirects are
assigned fixed uri tags.

Closes gh-12685
 2018-04-04 11:46:10 +02:00
Stephane Nicoll ad6a888e47 Polish 2018-04-04 11:29:37 +02:00
Stephane Nicoll f99752283f Fix relaxed binding examples 
Closes gh-12750
 2018-04-04 11:29:18 +02:00
Stephane Nicoll bf06854218 Merge branch '1.5.x' 2018-04-04 11:24:20 +02:00
Stephane Nicoll 1805cc5696 Clarify optional use of ComponentScan 
Closes gh-12739
 2018-04-04 11:16:11 +02:00
Madhura Bhave 30e3cf4c01 Make sure property mapping exception are swallowed 2018-04-03 16:12:24 -07:00
Madhura Bhave e5f8078749 Support dots in System environment properties 
Fixes gh-12728
 2018-04-03 14:37:06 -07:00
Stephane Nicoll d14cd2cbae Upgrade to Spring Framework 5.0.5.RELEASE 
Closes gh-12340
 2018-04-03 23:00:25 +02:00
Stephane Nicoll f424297fef Upgrade to Reactor Bismuth SR8 
Closes gh-12698
 2018-04-03 22:59:43 +02:00
Stephane Nicoll 8210e3d85e Merge branch '1.5.x' 2018-04-03 22:59:02 +02:00
Stephane Nicoll 249af7d5aa Upgrade to Spring Framework 4.3.15 
Closes gh-12344
 2018-04-03 22:58:13 +02:00
Madhura Bhave fa4a3ab308 Don't force snapshot update for integration tests 
See if that fixes intermittent NoClassDefFoundError.

See gh-12689
 2018-04-03 12:04:20 -07:00
Andy Wilkinson e5f27c60f2 Merge branch '1.5.x' 2018-04-03 17:37:32 +01:00
Andy Wilkinson 288e71b6c1 Upgrade to GemFire 8.2.9 
Closes gh-12748
 2018-04-03 17:37:01 +01:00
Andy Wilkinson 195a66f009 Upgrade to Hibernate Validator 6.0.9.Final 
Closes gh-12746
 2018-04-03 16:05:11 +01:00
Andy Wilkinson d5caddf4ca Upgrade to Rxjava 1.3.8 
Closes gh-12745
 2018-04-03 16:05:10 +01:00
Andy Wilkinson 16f5f8d53c Upgrade to Lettuce 5.0.3.RELEASE 
Closes gh-12744
 2018-04-03 16:05:09 +01:00