root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity
16,963 Commits 23 Branches 348 Tags 290 MiB
Commit Graph

16963 Commits

Author SHA1 Message Date
Stephane Nicoll 830e523531 Clarify behavior of JMX in @SpringBootTest 
Closes gh-13008
 2018-05-03 11:06:55 +02:00
Madhura Bhave 868dc6e370 Merge branch '2.0.x' 2018-05-02 17:21:16 -07:00
Madhura Bhave 1fb51dcc0d Send Slack Notifications when build completes 
Closes gh-10790
 2018-05-02 17:19:36 -07:00
Madhura Bhave 1be616aebc Merge branch '2.0.x' 2018-05-02 14:35:08 -07:00
Madhura Bhave 04d6bc5119 Update email script to find status till one is found 
The determine-email-body script would only look at the previous commit's
status to determine whether to send a success email or not. If no status
was found (this happens when commits are pushed close to each other and CI
only runs the latest one), it would send a successful email even if the last
CI run was successful.
 2018-05-02 13:33:14 -07:00
Stephane Nicoll 33a6f6f807 Merge pull request #13007 from garyrussell:kafka22 
* pr/13007:
  Start building against Spring Kafka 2.2.0 snapshots
 2018-05-02 16:30:59 +02:00
Gary Russell 8cf34238d3 Start building against Spring Kafka 2.2.0 snapshots 
Closes gh-13007
 2018-05-02 16:15:08 +02:00
Stephane Nicoll eab2d4a404 Merge branch '2.0.x' 2018-05-02 16:13:31 +02:00
Stephane Nicoll ed594d7706 Merge pull request #13022 from izeye:polish-20180502 
* pr/13022:
  Polish IgnoreTopLevelConverterNotFoundBindHandlerTests
 2018-05-02 16:13:06 +02:00
Johnny Lim e7d2f22911 Polish IgnoreTopLevelConverterNotFoundBindHandlerTests 
Closes gh-13022
 2018-05-02 16:12:37 +02:00
Stephane Nicoll 11f178538e Merge pull request #13019 from izeye:patch-49 
* pr/13019:
  Fix @since for IgnoreTopLevelConverterNotFoundBindHandler
 2018-05-02 16:11:55 +02:00
Johnny Lim 12cdc8b0e0 Fix @since for IgnoreTopLevelConverterNotFoundBindHandler 
Closes gh-13019
 2018-05-02 16:11:37 +02:00
Stephane Nicoll 7879b38615 Merge branch '2.0.x' 2018-05-02 16:09:56 +02:00
Stephane Nicoll 7cca56e15b Upgrade to HikariCP 2.7.9 
Closes gh-12783
 2018-05-02 16:09:02 +02:00
Stephane Nicoll 4eeddbd889 Merge branch '2.0.x' 2018-05-02 16:08:03 +02:00
Stephane Nicoll d6244889f5 Add default value for "spring.flyway.locations" 
See gh-12193
 2018-05-02 16:07:38 +02:00
Stephane Nicoll 79c222da78 Allow to provide manual metadata for keys that are not unique 
Closes gh-12193
 2018-05-02 16:04:02 +02:00
Stephane Nicoll 44fd7d953e Merge branch '2.0.x' 2018-05-02 16:00:25 +02:00
Stephane Nicoll 782d8c63da Merge branch '1.5.x' into 2.0.x 2018-05-02 15:59:56 +02:00
Stephane Nicoll dd3f57d816 Avoid potentially mutating item metadata collection 
Closes gh-13027
 2018-05-02 15:55:29 +02:00
Andy Wilkinson 38f7b2b9da Merge branch '2.0.x' 2018-05-02 13:43:55 +01:00
Andy Wilkinson c16331fa6c Merge branch '1.5.x' into 2.0.x 2018-05-02 13:43:49 +01:00
Andy Wilkinson d0f329caa4 Break circular dependency in DevTools without using field injection 2018-05-02 13:43:19 +01:00
Andy Wilkinson 0526594a3c Merge branch '2.0.x' 2018-05-02 12:26:23 +01:00
Andy Wilkinson f019d5c85b Merge branch '1.5.x' into 2.0.x 2018-05-02 12:22:04 +01:00
Andy Wilkinson 06cf698387 Polish 2018-05-02 12:12:47 +01:00
Andy Wilkinson 1fda677f2d Merge branch '2.0.x' 2018-05-02 11:36:23 +01:00
Andy Wilkinson 0a9d950a44 Start building against Spring Kafka 2.1.6 snapshots 
See gh-13018
 2018-05-02 11:32:26 +01:00
Andy Wilkinson 2a8eb2c113 Start building against Spring Integration 5.0.5 snapshots 
See gh-13016
 2018-05-02 11:31:29 +01:00
Andy Wilkinson c50687758e Start building against Spring Data Kay SR7 snapshots 
See gh-13017
 2018-05-02 11:30:53 +01:00
Andy Wilkinson 0d67ca1e81 Starting building against Spring Framework 5.0.6 snapshots 
See gh-13021
 2018-05-02 11:29:25 +01:00
Andy Wilkinson 76b40a37cc Merge branch '1.5.x' into 2.0.x 2018-05-02 11:28:28 +01:00
Andy Wilkinson 31c6281e96 Start building against Spring Integration 4.3.16 snapshots 
See gh-13015
 2018-05-02 11:27:50 +01:00
Andy Wilkinson b6926c9bca Start building against Spring Data Ingalls SR12 snapshots 
See gh-13014
 2018-05-02 11:26:47 +01:00
Andy Wilkinson 9bd46ca8f8 Start building against Spring Framework 4.3.17 snapshots 
See gh-13013
 2018-05-02 11:21:40 +01:00
Andy Wilkinson c17a451744 Merge branch '2.0.x' 2018-05-02 10:57:47 +01:00
Andy Wilkinson 49089546f8 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:57:29 +01:00
Andy Wilkinson a29a70d2f4 Fix handling of static resource jar paths containing a + 
Closes gh-12942
 2018-05-02 10:23:42 +01:00
Stephane Nicoll 0819822eb6 Merge branch '2.0.x' 2018-05-02 10:42:03 +02:00
Stephane Nicoll fbf8f57773 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:41:24 +02:00
Stephane Nicoll 08bc306a61 Guard IntegrationJmxConfiguration if no mBeanServer is available 
Closes gh-12966
 2018-05-02 10:35:17 +02:00
Andy Wilkinson b679f97794 Merge branch '2.0.x' 2018-05-02 09:11:45 +01:00
Andy Wilkinson b0dbcd094e Merge branch '1.5.x' into 2.0.x 2018-05-02 09:11:29 +01:00
Andy Wilkinson 4585bc846a Restore RestartClassLoader's Java 6 compatibility 
Closes gh-12826
 2018-05-02 08:27:38 +01:00
Madhura Bhave a193c89c6d Merge branch '2.0.x' 2018-05-01 16:42:24 -07:00
Madhura Bhave aad279208e Throw exception if RandomAccessData tries to read beyond EOF 
Fixes gh-12986
 2018-05-01 16:35:43 -07:00
Madhura Bhave ef0cfc43fe Merge branch '2.0.x' 2018-05-01 11:34:39 -07:00
Madhura Bhave d268b2102f Fix typo 2018-05-01 11:33:47 -07:00
Stephane Nicoll 9f7be62687 Backport polish commit "22b99a90" 2018-05-01 11:33:26 -07:00
Andy Wilkinson c37e6ebac5 Merge branch '2.0.x' 2018-05-01 09:25:14 +01:00