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
21,104 Commits 23 Branches 348 Tags 290 MiB
Commit Graph

21104 Commits

Author SHA1 Message Date
Brian Clozel 81d3945922 Reinstate SNAPSHOT updates in integration tests 
Fixes gh-16453
 2019-04-04 09:57:06 +02:00
Phillip Webb 53b12eef4d Merge branch '2.1.x' 2019-04-03 21:37:48 -07:00
Phillip Webb c7746fba3b Allow promote script to be run again 2019-04-03 21:27:50 -07:00
Phillip Webb cada732f36 Merge branch '2.1.x' 2019-04-03 20:34:40 -07:00
Phillip Webb d6496c00b9 Fixup promote script 2019-04-03 20:33:41 -07:00
Spring Buildmaster 15c9ca7455 Next development version (v2.1.5.BUILD-SNAPSHOT) 2019-04-04 03:16:47 +00:00
Phillip Webb 8aec4de399 Merge branch '2.1.x' 2019-04-03 17:34:01 -07:00
Phillip Webb 617f97f788 Fix checkstyle violation 2019-04-03 17:33:34 -07:00
Phillip Webb ddbfb2530d Update copyright header of changed files 2019-04-03 17:01:00 -07:00
Phillip Webb ad7eebee9e Merge branch '2.1.x' 2019-04-03 17:00:25 -07:00
Phillip Webb ec094cdfda Increase timeout for promote script 
Increase the timeout used when checking if artifacts have landed in
Bintray from 20m to 40m. Also added some additional protection against
the curl command failing.

Closes gh-16443
 2019-04-03 16:35:49 -07:00
Phillip Webb f12ab1ff90 Update copyright header of changed files 2019-04-03 16:13:00 -07:00
Phillip Webb 34fee1adfa Polish 2019-04-03 16:12:37 -07:00
Phillip Webb 9b8e9c8407 Merge branch '2.1.x' 2019-04-03 14:25:40 -07:00
Madhura Bhave 8ad9bfe29b Merge branch '2.0.x' into 2.1.x 2019-04-03 13:54:35 -07:00
Spring Buildmaster 8e3cbd9a2f Next development version (v2.0.10.BUILD-SNAPSHOT) 2019-04-03 15:04:03 +00:00
Andy Wilkinson c5c53849ce Merge branch '2.1.x' 2019-04-03 14:41:15 +01:00
Andy Wilkinson 20b9a72359 Prohibit upgrades to Derby 10.15 as it requires Java 9 
See gh-16433
 2019-04-03 14:40:59 +01:00
Andy Wilkinson e404ac39bf Upgrade to Spring Integration 5.1.4 
See gh-16350
 2019-04-03 14:40:59 +01:00
Andy Wilkinson efd2f685d3 Upgrade to Spring Session Bean-SR4 
See gh-16357
 2019-04-03 14:40:59 +01:00
Andy Wilkinson c3b5d9c363 Upgrade to Sqlite Jdbc 3.27.2 
Closes gh-16440
 2019-04-03 14:40:59 +01:00
Andy Wilkinson 4cf273770c Upgrade to Mockito 2.25.1 
Closes gh-16439
 2019-04-03 14:40:59 +01:00
Andy Wilkinson 78a15c2234 Upgrade to Mariadb 2.4.1 
Closes gh-16438
 2019-04-03 14:40:59 +01:00
Andy Wilkinson 3fd0c26402 Upgrade to Junit Jupiter 5.4.1 
Closes gh-16437
 2019-04-03 14:40:28 +01:00
Andy Wilkinson 62462c9ced Upgrade to Hibernate 5.4.2.Final 
Closes gh-16436
 2019-04-03 14:40:28 +01:00
Andy Wilkinson fe4d96e60b Upgrade to Elasticsearch 6.6.2 
Closes gh-16435
 2019-04-03 14:40:28 +01:00
Andy Wilkinson 8b195940a6 Upgrade to Assertj 3.12.2 
Closes gh-16434
 2019-04-03 14:40:28 +01:00
Andy Wilkinson e7261f3d3f Upgrade to Artemis 2.7.0 
Closes gh-16432
 2019-04-03 14:40:28 +01:00
Andy Wilkinson 7661287760 Upgrade to Thymeleaf Layout Dialect 2.4.1 
Closes gh-16431
 2019-04-03 14:40:28 +01:00
Andy Wilkinson 674a96e369 Upgrade to Classmate 1.5.0 
Closes gh-16430
 2019-04-03 14:40:28 +01:00
Andy Wilkinson ca0119950f Align with new fail-fast behaviour in Micrometer 1.1.4 
Closes gh-16425
 2019-04-03 14:39:29 +01:00
Stephane Nicoll 5f4bd37eb1 Merge branch '2.1.x' 2019-04-03 13:56:58 +02:00
Stephane Nicoll 3c058585bf Upgrade to Micrometer 1.1.4 
Close gh-16425
 2019-04-03 13:54:41 +02:00
Stephane Nicoll 066f97f4ef Merge branch '2.1.x' 2019-04-03 13:13:19 +02:00
Stephane Nicoll 6a4e89dc0f Merge branch '2.0.x' into 2.1.x 2019-04-03 13:13:01 +02:00
Stephane Nicoll 1421ca7612 Polish 2019-04-03 13:12:37 +02:00
Stephane Nicoll ef25ba0d87 Merge branch '2.1.x' 2019-04-03 12:58:36 +02:00
Stephane Nicoll 2eaaff2e2f Merge branch '2.0.x' into 2.1.x 2019-04-03 12:58:16 +02:00
Stephane Nicoll dd1bdea048 Merge branch '1.5.x' into 2.0.x 2019-04-03 12:57:35 +02:00
Stephane Nicoll 0d256da068 Fixup version numbers following release 2019-04-03 12:56:41 +02:00
Andy Wilkinson e3f4d4a165 Merge branch '2.1.x' 2019-04-03 11:40:31 +01:00
Andy Wilkinson 961b0307d6 Upgrade to Netty Tcnative 2.0.24.Final 
Closes gh-16429
 2019-04-03 11:40:21 +01:00
Andy Wilkinson 67bb390246 Merge branch '2.0.x' into 2.1.x 2019-04-03 11:39:44 +01:00
Andy Wilkinson 1db848af0d Upgrade to Solr 6.6.6 
Closes gh-16428
 2019-04-03 11:38:16 +01:00
Spring Buildmaster ca3a864565 Next Development Version 2019-04-03 10:34:44 +00:00
Stephane Nicoll c5d0ebccff Merge branch '2.1.x' 2019-04-03 12:09:42 +02:00
Brian Clozel f221061d81 Avoid bean method proxying in WebMVC and WebFlux config 
This commit applies changes similar to what's been done in gh-9068, for
MVC and WebFlux configurations. This is now possible thanks to the
changes done in Spring Framework in
https://github.com/spring-projects/spring-framework/pull/22596

Fixes gh-16427
 2019-04-03 12:08:29 +02:00
Stephane Nicoll a90d0a224f Upgrade to Spring Batch 4.1.2 
Closes gh-16423
 2019-04-03 12:07:09 +02:00
Stephane Nicoll 96d3625b8e Merge branch '2.0.x' into 2.1.x 2019-04-03 12:06:23 +02:00
Stephane Nicoll 3fb8d504c5 Upgrade to Spring Batch 4.0.3 
Closes gh-16422
 2019-04-03 12:04:40 +02:00