20418 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andy Wilkinson	dacbb65fd7	Merge branch '2.0.x' into 2.1.x ... Closes gh-16579	2019-04-16 15:47:17 +01:00
Andy Wilkinson	7260c0f2c4	Merge branch '1.5.x' into 2.0.x	2019-04-16 15:46:49 +01:00
Andy Wilkinson	c11e847d6c	Fix syntax highlighting in the reference documentation ... Closes gh-16548	2019-04-16 15:46:16 +01:00
Andy Wilkinson	043f0ffbeb	Restore indentation in published spring-boot-starter-parent pom ... Closes gh-16466	2019-04-16 09:46:16 +01:00
Andy Wilkinson	4ad636ee8e	Tolerate competing gRPC version requirements in Micrometer's registries ... See gh-16178	2019-04-16 09:17:35 +01:00
Andy Wilkinson	4e4d5f0539	Remove dependency management for solr-uima following upgrade to 7.7.1 ... Closes gh-16490	2019-04-16 09:10:16 +01:00
Madhura Bhave	f0544fb86f	Polish	2019-04-15 17:09:47 -07:00
Madhura Bhave	38cbc0f096	Merge pull request #16515 from Rudy Adams ... * pr/16515: Add tests for CompressionConnectorCustomizer	2019-04-15 16:21:30 -07:00
Rudy Adams	0aa25fb742	Add tests for CompressionConnectorCustomizer ... Closes gh-16515	2019-04-15 16:17:29 -07:00
Andy Wilkinson	95149cd7cb	Make it easier to identify issues created for forward ports ... Closes gh-16566	2019-04-15 16:59:27 +01:00
Stephane Nicoll	e99deb95f7	Fix source detection in case of multiple candidates ... This commit improves the detection of a property source when more than one group with the same type exist. Closes gh-16549	2019-04-15 16:17:11 +02:00
Andy Wilkinson	bb0037f041	Restore indentation in published spring-boot-dependencies pom ... The move to an HTTPS URL for the xmlns:xslt identifier has the unwanted side-effect of disabling indentation. This commit moves back to an HTTPS URL. It also changes the indent size to 2, aligning with the size used by all the other poms that are written by the flatten plugin. Closes gh-16466	2019-04-15 14:26:52 +01:00
Madhura Bhave	b4d6ac1f41	Fix javadoc	2019-04-12 12:32:23 -07:00
Stephane Nicoll	e6d1b2c30f	Merge pull request #16527 from adammichalik ... * pr/16527: Fix package of java.time.Duration in documentation	2019-04-11 13:55:21 +02:00
Adam Michalik	55987a51c7	Fix package of java.time.Duration in documentation ... Closes gh-16527	2019-04-11 13:54:18 +02:00
Stephane Nicoll	391c8b6274	Add reference to https://github.com/alimate/errors-spring-boot-starter	2019-04-07 17:14:14 +02:00
Andy Wilkinson	c0a91478f1	Only start management server once main server is initialized ... Closes gh-15378	2019-04-05 17:36:20 +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	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	8a04e2cc86	Honor custom change log tables in Liquibase endpoint ... Closes gh-16442	2019-04-04 14:40:47 +01:00
Andy Wilkinson	58c9412c09	Add forward merge issue creation hook ... Closes gh-16458	2019-04-04 13:24:40 +01:00
Phillip Webb	c7746fba3b	Allow promote script to be run again	2019-04-03 21:27:50 -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	617f97f788	Fix checkstyle violation	2019-04-03 17:33:34 -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
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	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	3c058585bf	Upgrade to Micrometer 1.1.4 ... Close gh-16425	2019-04-03 13:54:41 +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	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	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	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
Stephane Nicoll	0b828db603	Merge pull request #16406 from izeye ... * pr/16406: Check for Reactor Netty disconnected client errors	2019-04-03 11:45:58 +02:00
Johnny Lim	9fae1e5d0e	Check for Reactor Netty disconnected client errors ... Closes gh-16046	2019-04-03 11:45:51 +02:00
Andy Wilkinson	52ebf20cbf	Merge branch '2.0.x' into 2.1.x	2019-04-03 09:52:45 +01:00
Andy Wilkinson	bfe65c8a5c	Merge branch '1.5.x' into 2.0.x	2019-04-03 09:52:28 +01:00
Andy Wilkinson	0f27b1a65e	Verify entry output location when extracting zip ... Closes gh-16028	2019-04-03 09:48:56 +01:00
Stephane Nicoll	445870941f	Upgrade to Spring Session Bean-SR4 ... Closes gh-16357	2019-04-03 10:11:49 +02:00