root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity
21,120 Commits 28 Branches 365 Tags 289 MiB
Commit Graph

21120 Commits

Author SHA1 Message Date
Stephane Nicoll dbf8245c1d Polish "Polish embedded tomcat setup" 
Closes gh-16446
 2019-04-05 08:44:54 +02:00
Rudy Adams 06028f83b2 Polish embedded tomcat setup 
See gh-16446
 2019-04-05 08:44:54 +02:00
Madhura Bhave 7587af343d Merge pull request #16342 Pascal Zwick 
* pr/16342:
  Polish "Simplify the configuration of the ProtocolHandler"
  Simplify the configuration of the ProtocolHandler
 2019-04-04 12:41:15 -07:00
Madhura Bhave ad767ca4e1 Polish "Simplify the configuration of the ProtocolHandler" 
Closes gh-16342
 2019-04-04 12:41:05 -07:00
Pascal Zwick 2eaa64f82e Simplify the configuration of the ProtocolHandler 
This commit introduces a new callback interface that can
be used to customize the ProtocolHandler on a Tomcat Connector.

See gh-16342
 2019-04-04 12:24:47 -07:00
Andy Wilkinson 4440c30d93 Merge branch '2.1.x' 2019-04-04 15:07:49 +01:00
Andy Wilkinson 7175b80669 Output information about issue created for forward merge 
See gh-16458
 2019-04-04 15:07:39 +01:00
Stephane Nicoll 0972ef3422 Merge branch '2.1.x' 
Closes gh-16451
 2019-04-04 16:00:34 +02:00
Stephane Nicoll fbb5ffe0a4 Avoid infinite cycle resolving generic type that refers itself 
This commit improves type resolution for a unresolved generic type that
uses itself in its upper bound declaration.

Closes gh-16451
 2019-04-04 15:55:55 +02:00
Andy Wilkinson 537a97c1e5 Merge branch '2.1.x' 
Closes gh-16461
 2019-04-04 14:40:54 +01:00
Andy Wilkinson 8a04e2cc86 Honor custom change log tables in Liquibase endpoint 
Closes gh-16442
 2019-04-04 14:40:47 +01:00
Andy Wilkinson f112ec77b5 Merge branch '2.1.x' 
Closes gh-16460
 2019-04-04 13:24:56 +01:00
Andy Wilkinson 58c9412c09 Add forward merge issue creation hook 
Closes gh-16458
 2019-04-04 13:24:40 +01:00
Stephane Nicoll bb4e559724 Let Hibernate detect the dialect to use 
Closes gh-16172
 2019-04-04 14:10:01 +02:00
Stephane Nicoll 5f6d8e1ead Polish 2019-04-04 11:16:09 +02:00
Stephane Nicoll 763c1a99e0 Polish 2019-04-04 11:01:10 +02:00
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