spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-09 10:59:11 +00:00
Code Issues Projects Releases Wiki Activity
27,751 Commits 24 Branches 395 Tags
4e14f2a9ff79ec9068d53ea8679998eb43282a10
Commit Graph
27751 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll 4e14f2a9ff Merge branch '2.3.x' 2020-07-24 11:50:59 +02:00
Stephane Nicoll bcf62004f9 Merge branch '2.2.x' into 2.3.x 2020-07-24 11:50:32 +02:00
Andy Wilkinson 793d266b7e Merge branch '2.3.x' 
Closes gh-22546
 2020-07-24 10:41:40 +01:00
Andy Wilkinson c605a6e34b Override other variant of registerBeanDefintions 
Fixes gh-22480
 2020-07-24 10:33:16 +01:00
Spring Buildmaster 652712b5eb Next development version (v2.2.10.BUILD-SNAPSHOT) 2020-07-24 08:47:37 +00:00
Andy Wilkinson 51eeec7122 Merge pull request #22544 from dsyer 
* gh-22544:
  Restore missing EnvironmentPostProcessors

Closes gh-22544
 2020-07-24 08:46:37 +01:00
Dave Syer 48f49f2120 Restore missing EnvironmentPostProcessors 
See gh-22544
 2020-07-24 08:46:04 +01:00
Phillip Webb 6e569c75cf Merge branch '2.3.x' 2020-07-23 21:38:01 -07:00
Phillip Webb f625d8e701 Merge branch '2.2.x' into 2.3.x 2020-07-23 21:37:16 -07:00
Phillip Webb e137e3d130 Merge branch '2.1.x' into 2.2.x 2020-07-23 21:36:50 -07:00
Phillip Webb f68671e1bc Refine regex 
See gh-22543
 2020-07-23 21:23:42 -07:00
Phillip Webb 7ace6cd450 Move properties to correct file 
See gh-22543
 2020-07-23 21:09:15 -07:00
Phillip Webb b77dbcd06f Allow certain artifacts to be optionally deployed 
Update `DistributeCommand` so that regex patterns can be used to mark
artifacts that are optional and need not fail the release.

Closes gh-22543
 2020-07-23 20:45:25 -07:00
Phillip Webb d69c35a1db Deal with 404 response when checking for artifacts 2020-07-23 18:23:24 -07:00
Phillip Webb 53296cd161 Backport build script updates 2020-07-23 17:45:55 -07:00
Phillip Webb c043701dc0 Turn on debug logging 2020-07-23 17:45:49 -07:00
Spring Buildmaster 7ac5cc96c2 Next development version (v2.1.17.BUILD-SNAPSHOT) 2020-07-23 21:53:53 +00:00
Andy Wilkinson 2ffb41a2de Merge branch '2.3.x' 2020-07-23 21:13:24 +01:00
Andy Wilkinson 3480db72a5 Merge branch '2.2.x' into 2.3.x 2020-07-23 21:13:16 +01:00
Andy Wilkinson 9c5e59371f Upgrade to Jackson 2.10.5 
Closes gh-22432
 2020-07-23 21:12:08 +01:00
Andy Wilkinson 8218e5b548 Merge branch '2.3.x' 2020-07-23 21:05:49 +01:00
Andy Wilkinson 39c8898008 Upgrade to MariaDB 2.6.2 
Closes gh-22541
 2020-07-23 21:05:32 +01:00
Andy Wilkinson 44e6cf2e55 Upgrade to AspectJ 1.9.6 
Closes gh-22540
 2020-07-23 21:05:31 +01:00
Andy Wilkinson 1cc941f9c3 Merge branch '2.2.x' into 2.3.x 2020-07-23 21:05:00 +01:00
Andy Wilkinson 2118c73985 Merge branch '2.1.x' into 2.2.x 2020-07-23 21:03:57 +01:00
Andy Wilkinson f93bae4bd3 Upgrade to Aspectj 1.9.6 
Closes gh-22539
 2020-07-23 21:03:51 +01:00
Andy Wilkinson ce803cc678 Upgrade to Micrometer 1.3.11 
Closes gh-22538
 2020-07-23 21:03:49 +01:00
Andy Wilkinson 698db27a75 Upgrade to Aspectj 1.9.6 
Closes gh-22537
 2020-07-23 21:02:36 +01:00
Andy Wilkinson db242794ec Upgrade to Micrometer 1.1.16 
Closes gh-22536
 2020-07-23 21:02:34 +01:00
Phillip Webb 36a6ca6e6e Add EnvironmentPostProcessorsFactory 
Update `EnvironmentPostProcessorApplicationListener` so that it can
either use values from `spring.factories` or use a factory interface.

Closes gh-22529
 2020-07-23 11:43:02 -07:00
Stephane Nicoll 5800f1596c Merge pull request #22524 from dreis2211 
* pr/22524:
  Polish

Closes gh-22524
 2020-07-23 18:16:56 +02:00
dreis2211 b01fb63de6 Polish 
See gh-22524
 2020-07-23 18:16:34 +02:00
Phillip Webb 33b48c8bac Add @Name support to the annotation processor 
Update the `ConfigurationMetadataAnnotationProcessor` so that `@Name`
annotated parameters generate the correct meta-data.

Closes gh-22492
 2020-07-23 05:36:44 -07:00
Andy Wilkinson 3aed03b9f9 Merge pull request #22506 from royclarkson 
* gh-22506:
  Update conditional inclusion of milestone repository

Closes gh-22506
 2020-07-23 10:28:58 +01:00
Roy Clarkson 374338e32c Update conditional inclusion of milestone repository 
The new Spring version schema does not include a "RELEASE" version.
This commit modifies the Gradle conditional to include the milestone
repository for all milestone and snapshot versions.

See gh-22506
 2020-07-23 10:28:19 +01:00
Stephane Nicoll 88e2810801 Merge branch '2.3.x' 
Closes gh-22527
 2020-07-23 11:07:28 +02:00
Stephane Nicoll e9a966a0a2 Upgrade to Groovy 2.5.13 
Closes gh-22526
 2020-07-23 11:06:12 +02:00
Stephane Nicoll a056eb475a Merge branch '2.2.x' into 2.3.x 2020-07-23 11:02:01 +02:00
Stephane Nicoll 4f3b03afcf Merge branch '2.1.x' into 2.2.x 
Closes gh-22525
 2020-07-23 11:01:05 +02:00
Stephane Nicoll 0440a9a78c Upgrade to Groovy 2.5.13 
Closes gh-22505
 2020-07-23 10:55:47 +02:00
Stephane Nicoll 57539e0167 Upgrade Java 15 version in CI image 
Closes gh-22513
 2020-07-23 09:37:58 +02:00
Stephane Nicoll f28a8e06fb Upgrade Java 8 version in CI image 
Closes gh-22517
 2020-07-23 09:36:44 +02:00
Stephane Nicoll f39b338af4 Merge branch '2.3.x' 2020-07-23 09:36:15 +02:00
Stephane Nicoll 41b7eb158b Upgrade Java 14 version in CI image 
Closes gh-22515
 2020-07-23 09:35:44 +02:00
Stephane Nicoll 71ec15e851 Upgrade Java 8 version in CI image 
Closes gh-22514
 2020-07-23 09:35:07 +02:00
Stephane Nicoll 32f17645af Merge branch '2.2.x' into 2.3.x 2020-07-23 09:34:29 +02:00
Stephane Nicoll 458b5690e1 Upgrade Java 14 version in CI image 
Closes gh-22516
 2020-07-23 09:33:30 +02:00
Stephane Nicoll a2b797f8b7 Upgrade Java 8 version in CI image 
Closes gh-22518
 2020-07-23 09:33:03 +02:00
Stephane Nicoll 3d1181ee96 Merge branch '2.1.x' into 2.2.x 2020-07-23 09:31:42 +02:00
Stephane Nicoll ee37ddd6c0 Upgrade Java 8 version in CI image 
Closes gh-22512
 2020-07-23 09:31:01 +02:00