20 Commits

Author	SHA1	Message	Date
Phillip Webb	913e831f4e	Merge '1.5.x' into 2.0.x	2019-07-24 11:39:58 +01:00
Andy Wilkinson	c6c139d980	Merge branch '1.5.x' into 2.0.x	2019-06-07 10:46:31 +01:00
Phillip Webb	b442d3b906	Merge branch '1.5.x' into 2.0.x	2019-06-04 01:49:03 -07:00
Phillip Webb	5fba43aa31	Merge branch '1.5.x' into 2.0.x	2019-06-04 00:05:57 -07:00
Andy Wilkinson	3e3d7545cc	Merge branch '1.5.x' into 2.0.x	2019-04-24 10:01:50 +01:00
Andy Wilkinson	9fbd38ab3c	Merge branch '1.5.x' into 2.0.x	2019-03-20 16:45:26 +00:00
Spring Operator	3e2b6ac8ed	Update build and setup configuration to use HTTPS ... See gh-16246	2019-03-19 16:58:31 +00:00
Stephane Nicoll	306c79f0de	Merge branch '1.5.x'	2018-02-26 18:03:32 +01:00
Andy Wilkinson	e1ab62668f	Merge branch '1.5.x'	2018-02-13 15:05:28 +00:00
Andy Wilkinson	9542f5182c	Move scripts for new launch script tests to correct location ... See gh-11397	2018-02-01 09:26:16 +00:00
Phillip Webb	886b39293c	Merge branch '1.5.x'	2018-01-30 12:51:45 -08:00
Phillip Webb	49c685b7c0	Merge branch '1.5.x'	2018-01-10 12:01:29 -08:00
Johnny Lim	483d123d9b	Fix imports order for Checkstyle ... Closes gh-11587	2018-01-10 09:46:06 +01:00
Madhura Bhave	32557e4987	Fix imports	2018-01-09 15:47:09 -08:00
Phillip Webb	b3ec2c9d1d	Polish	2018-01-09 12:12:59 -08:00
Andy Wilkinson	d439b73758	Use docker-java 3.0.x for launch script integration tests	2018-01-09 16:37:07 +00:00
Johnny Lim	0f0c6e0729	Polish ... Closes gh-11536	2018-01-09 09:28:56 +01:00
Phillip Webb	748e0779b6	Update copyright year for changed files	2017-10-10 11:56:13 -07:00
Phillip Webb	4ff65d58a4	Fix integration test POMs ... Update integration test POMs to use CI friendly version numbers. See gh-9316	2017-10-04 16:34:42 -07:00
Phillip Webb	89b0ba2c14	Relocate test projects under spring-boot-tests ... Move integration and deployment tests under a single `spring-boot-tests` module. See gh-9316	2017-10-04 16:34:38 -07:00