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

40 Commits

Author SHA1 Message Date
Phillip Webb 4034725e38 Skip forward merge checks on docs-build branch 2025-04-03 14:39:43 -07:00
Andy Wilkinson 214e0281a9 Start work on Spring Boot 3.5 2025-01-06 15:29:25 +00:00
Andy Wilkinson d9539783d2 Merge branch '3.3.x' 2024-10-18 17:07:51 +01:00
Andy Wilkinson f426ac9c92 Merge branch '3.2.x' into 3.3.x 2024-10-18 17:07:41 +01:00
Andy Wilkinson 65fa6ef372 Ignore hotfix releases when creating forward merge issue 2024-10-18 17:06:16 +01:00
Phillip Webb 5324c646e1 Update merge script to support commercial repository 
See gh-42333
 2024-09-17 13:30:12 -07:00
Moritz Halbritter e3d7c23dfb Fix forward merge script 2024-06-21 11:26:20 +02:00
Andy Wilkinson 5ef7db9a28 Start working on Spring Boot 3.3 2024-01-04 10:56:56 +00:00
Andy Wilkinson 50d8b20d6c Re-enable forward merge issues for merges into main 2023-06-23 16:01:26 +01:00
Andy Wilkinson b9c2c289b3 Start working on Spring Boot 3.2 
This commit also disables the creation of forward merge issues
when merging into main. Forward merge issues will be re-enabled
once 3.1.1 has been released.
 2023-06-08 17:22:21 +01:00
Andy Wilkinson 63abaa4cd2 Start working on 3.1.0 2023-01-23 12:04:39 +00:00
Moritz Halbritter 4d2b389248 Merge branch '2.7.x' 2023-01-16 13:53:25 +01:00
Moritz Halbritter c72dd7de1a Fix typo in forward-merge script 2023-01-16 13:53:18 +01:00
Johnny Lim 90589fd6d4 Polish 
See gh-33384
 2022-12-01 11:32:39 +01:00
Andy Wilkinson 430f033381 Create forward port issues for merges into main 
This reverts commit 4e884b27f8.

Closes gh-31148
 2022-05-23 11:17:47 +01:00
Stephane Nicoll 63e8117d49 Merge branch '2.7.x' 2022-03-20 08:50:25 +01:00
Stephane Nicoll 0233dc035f Merge branch '2.6.x' into 2.7.x 
Closes gh-30334
 2022-03-20 08:50:14 +01:00
Stephane Nicoll 1cfebc0d39 Merge branch '2.5.x' into 2.6.x 
Closes gh-30333
 2022-03-20 08:49:56 +01:00
Mohammad Semnani 677787bd0a Fix typo in forward-merge log message 
See gh-30332
 2022-03-20 08:49:20 +01:00
Andy Wilkinson 4e884b27f8 Don't create forward port issues for merges into main 2021-11-30 15:14:33 +00:00
Andy Wilkinson e06b0d97f7 Update main branch to start work on 3.0.x 2021-11-30 15:07:24 +00:00
Andy Wilkinson 86a773a8e9 Update main branch to start work on 2.7.x 2021-11-30 11:16:53 +00:00
dreis2211 9d344b1e18 Update some more references to 2.5.x 
See gh-26861
 2021-06-11 11:54:34 +01:00
Andy Wilkinson 258ae73aa4 Update prepare-forward-merge following master->main rename 
See gh-26248
 2021-04-27 11:56:10 +01:00
Andy Wilkinson 94e17d23ef Create issue for each forward merge found in commit message 
Closes gh-25586
 2021-03-10 17:30:15 +00:00
Stephane Nicoll 40fd71bc05 Switch master branch to 2.5.x 2020-12-14 14:31:25 +01:00
Scott Frederick e5ec6dfef0 Find nearest milestone for forward merge with .x pattern 
Fixes gh-22350
 2020-07-15 17:04:34 -05:00
Phillip Webb 97d4613fba Refine prepare-forward-merge to detect master 2020-06-05 16:21:36 -07:00
Phillip Webb c8e966002a Fixup prepare-forward-merge for master 
Fix the regex so that merges to master are supported.
 2020-06-05 15:36:09 -07:00
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
 2020-06-04 20:10:09 -07:00
Phillip Webb 39caf45155 Allow forward merge to work with .x patterns 
Closes gh-21687
 2020-06-04 20:05:17 -07:00
Phillip Webb 4a6e08c817 Add logging to forward-merge script 
Add some logging to aid with development.
 2020-06-04 20:05:01 -07:00
Phillip Webb b6474f2ca1 Remove accidentally committed hook file 2020-06-04 13:59:14 -07:00
Phillip Webb eddbfb34f7 Merge branch '2.1.x' 
Closes gh-17258
 2019-06-18 15:08:54 -07:00
Phillip Webb ffbb23bc6d Always use credentials in forward merge script 
Closes gh-17257
 2019-06-18 15:08:09 -07:00
Phillip Webb 7ed0faa574 Merge branch '2.1.x' 
Closes gh-17088
 2019-06-07 21:03:13 -07:00
Phillip Webb ef09ee5dea Add new line when rewriting git message 
Update the forward merge script to add an additional new line when
rewiring the commit message. Prior this this commit, if an additional
line immediately followed the "Fixes ... in ..." pattern it would be
appended to the end of the rewritten fixes line.

Closes gh-16861
 2019-05-28 13:30:13 -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
Andy Wilkinson 7175b80669 Output information about issue created for forward merge 
See gh-16458
 2019-04-04 15:07:39 +01:00
Andy Wilkinson 58c9412c09 Add forward merge issue creation hook 
Closes gh-16458
 2019-04-04 13:24:40 +01:00