Commit Graph

13363 Commits

Author SHA1 Message Date
Andy Wilkinson 6e2dfc75f3 Drop support for Mockito 1.x
Closes gh-10247
2017-09-20 08:56:14 +01:00
Andy Wilkinson 7e9180f0b8 Tweak Travis configuration as Surefire is now silent in quite mode
Surefire 2.20 is completely silent when running in quiet mode which
causes Travis to incorrectly detect that the build has hung. This
commit removes the use of quiet mode in the hope that it will
strike a reasonable balance between enough log output to prevent
a false positive for the build being hung while also not generating
so much output that Travis cannot cope.
2017-09-20 07:26:43 +01:00
Andy Wilkinson d7b8dbac21 Merge branch '1.5.x' 2017-09-20 06:57:06 +01:00
Andy Wilkinson 2bf428707d Merge pull request #10278 from Venil Noronha
* gh-10278:
  Polish "Align prefix match in BufferCounterService with DefaultCounterService"
  Align prefix match in BufferCounterService with DefaultCounterService
2017-09-20 06:52:06 +01:00
Andy Wilkinson aca30950cf Polish "Align prefix match in BufferCounterService with DefaultCounterService"
See gh-10278
2017-09-20 06:51:22 +01:00
Venil Noronha dcb81a3da5 Align prefix match in BufferCounterService with DefaultCounterService
Closes gh-10278
2017-09-20 06:34:29 +01:00
Andy Wilkinson 3b21a88e3c Merge branch '1.5.x' 2017-09-20 06:26:02 +01:00
Andy Wilkinson eb2c0fab18 Merge pull request #10355 from Kyle Anderson
* gh-10355:
  Upgrade Git Maven plugin to 2.2.3
2017-09-20 06:25:58 +01:00
Kyle Anderson 628c643e32 Upgrade Git Maven plugin to 2.2.3
Closes gh-10355
2017-09-20 06:25:39 +01:00
Andy Wilkinson b18857cf72 Update deployment tests to cope with Bean Validation 2.0
Closes gh-10353
2017-09-19 22:01:48 +01:00
Madhura Bhave 4a740a16f3 Duplicate values should bind properly to List
Fixes gh-10106
2017-09-19 13:58:51 -07:00
Andy Wilkinson 0f25dd0ea6 Update Failsafe and Surefire Maven plugins to 2.20.1
Closes gh-9414
2017-09-19 21:31:24 +01:00
Andy Wilkinson e0bb9e700b Tidy up generics in WebFluxEndpointHandlerMapping
Closes gh-10113
2017-09-19 20:52:51 +01:00
Andy Wilkinson 975c005dfb Determine Spring Boot version for bom import correctly when using Java 9
In Java 9, a package may return null for its implementation version
even when the manifest attribute specifying the version is present
in the jar from which the package was loaded.

This commit updates DependencyManagementPluginAction to fall back to
accessing the jar and its manifest attributes directly when the
implementation version of its package is null.

Closes gh-10049
2017-09-19 20:46:48 +01:00
Stephane Nicoll 0f2d91c7e0 Fix broken build
Hibernate Validator 6 has a slightly different structure for default
messages. This commit adapts our tests accordingly.

See gh-9969
2017-09-19 19:19:36 +02:00
Stephane Nicoll 8c0ffa331b Polish
See gh-9969
2017-09-19 18:45:08 +02:00
Stephane Nicoll 95697688cf Upgrade to javax.validation 2.0.0.Final
This should have been done in par with #9969

Closes gh-9784
2017-09-19 18:35:31 +02:00
Andy Wilkinson 49bab63ca6 Update metrics endpoint to return list of distinct names
Closes gh-10336
2017-09-19 17:12:56 +01:00
Stephane Nicoll 2ac6c10719 Merge pull request #9969 from rajadilipkolli:patch-3
* pr/9969:
  Upgrade to Hibernate Validator 6.0.2.Final
2017-09-19 17:41:10 +02:00
Raja Kolli a4a0eef186 Upgrade to Hibernate Validator 6.0.2.Final
Closes gh-9969
2017-09-19 17:40:45 +02:00
Stephane Nicoll ac9c2c0bd5 Merge pull request #10045 from blasd:clean1.5.x
* pr/10045:
  Add dependency management for tomcat-catalina-jmx-remote
2017-09-19 17:13:55 +02:00
Benoit Lacelle 9e69a41eae Add dependency management for tomcat-catalina-jmx-remote
Closes gh-10045
2017-09-19 17:13:10 +02:00
Stephane Nicoll d89ff8cb28 Polish sample
Closes gh-10330
2017-09-19 17:03:27 +02:00
Andy Wilkinson 974a630f6b Upgrade to Spring Social Twitter 2.0.0.M4
Closes gh-10346
2017-09-19 16:03:14 +01:00
Andy Wilkinson daeff23b6e Upgrade to Spring Social Linkedin 2.0.0.M3
Closes gh-10345
2017-09-19 16:03:14 +01:00
Andy Wilkinson 558daef31a Upgrade to Spring Social Facebook 3.0.0.M3
Closes gh-10344
2017-09-19 16:03:14 +01:00
Andy Wilkinson ade88c3b2b Upgrade to Spring Social 2.0.0.M4
Closes gh-10343
2017-09-19 16:03:14 +01:00
Stephane Nicoll 3da9406435 Merge pull request #9916 from bjornlindstrom:gh-9713
* pr/9916:
  Polish "Fix handling of empty/null arguments"
  Fix handling of empty/null arguments
2017-09-19 15:02:35 +02:00
Stephane Nicoll 8351042469 Polish "Fix handling of empty/null arguments"
Closes gh-9916
2017-09-19 15:02:08 +02:00
Björn 0867ac5777 Fix handling of empty/null arguments
See gh-9916
2017-09-19 14:39:00 +02:00
Stephane Nicoll 0e46d0f586 Merge pull request #10318 from jkschneider:patch-1
* pr/10318:
  Make WebMvcMetrics#tagWithException public
2017-09-19 14:03:13 +02:00
Jon Schneider 71495d1ad9 Make WebMvcMetrics#tagWithException public
Closes gh-10318
2017-09-19 14:02:56 +02:00
Stephane Nicoll 224a4e46d9 Merge branch '1.5.x' 2017-09-19 14:00:35 +02:00
Stephane Nicoll 86e72534c9 Merge pull request #10314 from luchob:master
* pr/10314:
  Polish "Fix a dead link"
  Fix a dead link
2017-09-19 14:00:14 +02:00
Stephane Nicoll d93e0fee35 Polish "Fix a dead link"
Closes gh-10314
2017-09-19 14:00:03 +02:00
Lachezar Balev acdd475373 Fix a dead link
See gh-10314
2017-09-19 13:58:42 +02:00
Andy Wilkinson 09c64d52e1 Improve ApplicationContextRunner diagnostics when context start fails
Closes gh-10250
2017-09-19 09:14:33 +01:00
Madhura Bhave 114d270c9f Use date that fails with the fallback formatter
Fixes gh-9975
2017-09-18 16:39:28 -07:00
Andy Wilkinson d1cf308bd2 Polish 2017-09-18 19:26:19 +01:00
Andy Wilkinson febf30ef0a Upgrade to Mongo Driver Reactivestreams 1.6.0
Closes gh-10334
2017-09-18 19:26:19 +01:00
Andy Wilkinson 660b0fad00 Upgrade to Mongodb 3.5.0
Closes gh-10333
2017-09-18 19:26:19 +01:00
Andy Wilkinson f8064bf8a7 Polish dependency management for XMLUnit
Closes gh-9709
2017-09-18 17:50:37 +01:00
Stephane Nicoll edfdae18e4 Merge pull request #9709 from andrew-j-cohen:master
* pr/9709:
  Add XMLUnit to spring-boot-starter-test
2017-09-18 16:48:35 +02:00
Andrew Cohen 9c46dacf7e Add XMLUnit to spring-boot-starter-test
Closes gh-9709
2017-09-18 16:47:50 +02:00
Stephane Nicoll 61c6662b9c Merge pull request #10251 from martingreber:add-keystoretype
* pr/10251:
  Polish "Added keystore type and truststore type to rabbit properties"
  Added keystore type and truststore type to rabbit properties
2017-09-18 16:44:26 +02:00
Stephane Nicoll 4c53755980 Polish "Added keystore type and truststore type to rabbit properties"
Closes gh-10251
2017-09-18 16:43:49 +02:00
Martin Greber b70ac99bcb Added keystore type and truststore type to rabbit properties
See gh-10251
2017-09-18 16:25:21 +02:00
Stephane Nicoll f04fa32c27 Merge pull request #10308 from izeye:polish-20170915
* pr/10308:
  Polish
2017-09-18 16:19:19 +02:00
Johnny Lim 5e35a34cba Polish
Closes gh-10308
2017-09-18 16:19:02 +02:00
Stephane Nicoll c536af0bea Merge pull request #9907 from renjithgr:9886
* pr/9907:
  Polish "Update application layout to show packaging by features"
  Update application layout to show packaging by features
2017-09-18 16:14:22 +02:00