27289 Commits (d12b6b3a86d364087bd1a3e0c0df493b907101ac)

 

All Branches   

Search

Author	SHA1	Message	Date
Phillip Webb	0a05b4c9fd	Update copyright year of changed files	5 years ago
Phillip Webb	c8e966002a	Fixup prepare-forward-merge for master ... Fix the regex so that merges to master are supported.	5 years ago
Phillip Webb	3107d2de51	Merge branch '2.3.x' ... Fixes gh-21705 in master	5 years ago
Phillip Webb	9a235197dc	Propagate manifest to exploded jars ... Update `LaunchedURLClassLoader` so that packages defined from exploded archive folders have manifest attributes applied to them. Prior to this calling `package.getImplementationTitle()` would only return the a manifiest attribute when running non-exploded. The root cause of this issue is the way that `URLClassLoader` handles the different URL types. For URLs that reference a jar the manifest is available. For URLs that reference a folder it isn't. When running exploded we use a URL that references to the `BOOT-INF/classes` folder directly. To fix the issue we now attempt to detect when `definePackage` is being called directly, and replace `null` entries with actual manifest values. Fixes gh-21705	5 years ago
Stephane Nicoll	0bc6159e44	Merge branch '2.3.x' ... Closes gh-21721	5 years ago
Stephane Nicoll	400a168ce9	Merge branch '2.2.x' into 2.3.x ... Closes gh-21720	5 years ago
Stephane Nicoll	221e248b66	Merge pull request #21671 from dreis2211 ... * pr/21671: Remove usages of deprecated Connector.setAttribute() Closes gh-21671	5 years ago
dreis2211	9bb22ffb69	Remove usages of deprecated Connector.setAttribute() ... See gh-21671	5 years ago
Stephane Nicoll	bb86d2b3d4	Merge branch '2.3.x'	5 years ago
Stephane Nicoll	79a5ca2941	Merge branch '2.2.x' into 2.3.x	5 years ago
Stephane Nicoll	eb38eeaf30	Polish	5 years ago
Andy Wilkinson	2f06cbc9c9	Merge pull request #21559 from dreis2211 ... * gh-21559: Polish "Print the java version being used on startup" Print the java version being used on startup Closes gh-21559	5 years ago
Andy Wilkinson	82cc7e972d	Polish "Print the java version being used on startup" ... See gh-21559	5 years ago
dreis2211	731c192817	Print the java version being used on startup ... See gh-21559	5 years ago
Andy Wilkinson	7b7e68a9aa	Merge pull request #21691 from dreis2211 ... * gh-21691: Add Java 15 to JavaVersion enum Closes gh-21691	5 years ago
dreis2211	85a6686cae	Add Java 15 to JavaVersion enum ... See gh-21691	5 years ago
Andy Wilkinson	8fb7a6cace	Remove JUnit 5's vintage engine from spring-boot-starter-test ... Closes gh-21625	5 years ago
Stephane Nicoll	721399bdc4	Merge branch '2.3.x'	5 years ago
Stephane Nicoll	baef6c803d	Merge pull request #21692 from making ... * pr/21692: Fix event name in documentation Closes gh-21692	5 years ago
Toshiaki Maki	0cd526c266	Fix event name in documentation ... See gh-21692	5 years ago
Stephane Nicoll	8353dea111	Merge branch '2.3.x'	5 years ago
Stephane Nicoll	e936e9aa6a	Merge pull request #21653 from ThierrySquirrel ... * pr/21653: Polish "Add reference to rocketmq-spring-boot-starter" Add reference to rocketmq-spring-boot-starter Closes gh-21653	5 years ago
Stephane Nicoll	4624bf6552	Polish "Add reference to rocketmq-spring-boot-starter" ... See gh-21653	5 years ago
ThierrySquirrel	c547567882	Add reference to rocketmq-spring-boot-starter ... See gh-21653	5 years ago
Andy Wilkinson	292f549cd2	Merge branch '2.3.x' ... Closes gh-21719	5 years ago
Andy Wilkinson	4fdd1a64c9	Merge branch '2.2.x' into 2.3.x ... Closes gh-21718	5 years ago
Andy Wilkinson	1a52009cfb	Migrate CustomServletPathSampleActuatorTests to JUnit Jupiter ... Closes gh-21717	5 years ago
Stephane Nicoll	6db4103b26	Merge pull request #21545 from izeye ... * pr/21545: Polish "Support filtered scrape for Prometheus" Support filtered scrape for Prometheus Upgrade CI to Docker 19.03.9 Closes gh-21545	5 years ago
Stephane Nicoll	da5e8d70a1	Polish "Support filtered scrape for Prometheus" ... See gh-21545	5 years ago
Johnny Lim	cd1baf18fe	Support filtered scrape for Prometheus ... See gh-21545	5 years ago
Andy Wilkinson	c848f80c27	Merge branch '2.3.x' ... Closes gh-21680	5 years ago
Andy Wilkinson	0415c307c7	Merge branch '2.2.x' into 2.3.x ... Closes gh-21683	5 years ago
Andy Wilkinson	97533a5364	Merge branch '2.1.x' into 2.2.x ... Closes gh-21682	5 years ago
Andy Wilkinson	20f0b41099	Upgrade CI to Docker 19.03.9 ... Closes gh-21681	5 years ago
Stephane Nicoll	78165c619d	Merge pull request #21605 from dreis2211 ... * pr/21605: Fix multi-release JAR test on JDK 15 Closes gh-21605	5 years ago
dreis2211	54f93e9b0f	Fix multi-release JAR test on JDK 15 ... See gh-21605	5 years ago
Phillip Webb	2fe299f6d0	Merge branch '2.3.x' ... Closes gh-21710	5 years ago
Phillip Webb	7561123cd9	Merge branch '2.2.x' into 2.3.x ... Closes gh-21709	5 years ago
Phillip Webb	10fdd65063	Add prepare-forward-merge script ... Add a git hook script that can be used to prepare a sensible merge commit message. Closes gh-21688	5 years ago
Phillip Webb	87a155410b	Merge branch '2.3.x' ... Closes gh-21707	5 years ago
Phillip Webb	ba53d10060	Merge branch '2.2.x' into 2.3.x ... Closes gh-21706	5 years ago
Phillip Webb	39caf45155	Allow forward merge to work with .x patterns ... Closes gh-21687	5 years ago
Phillip Webb	4a6e08c817	Add logging to forward-merge script ... Add some logging to aid with development.	5 years ago
Phillip Webb	c666f0ff05	Merge branch '2.3.x'	5 years ago
Phillip Webb	4a0d372675	Merge branch '2.2.x' into 2.3.x	5 years ago
Phillip Webb	b6474f2ca1	Remove accidentally committed hook file	5 years ago
Andy Wilkinson	c4faeac4d7	Merge branch '2.3.x' ... Closes gh-21703	5 years ago
Andy Wilkinson	24138c104c	Use highlightjs for syntax highlighting in Asciidoctor's HTML output ... Closes gh-21701	5 years ago
Andy Wilkinson	15ec26171c	Merge branch '2.3.x' ... Closes gh-21699	5 years ago
Andy Wilkinson	c0f748e143	Always apply retry plugin but only retry on CI ... Previously, the retry plugin was only applied on CI as we do not want tests to be retried in local builds. Unfortunately, this arrangement led to test tasks from CI builds having additional doFirst and doLast actions and an additional property. These differences meant that the output from a test task that has run on CI could not be used by a local build. This commit changes our configuration of the test retry plugin so that it is now always applied. To retain the behaviour of only retrying tests on CI, max retries is configured to 3 on CI and 0 for local builds. Closes gh-21698	5 years ago