Branch and release

Branch and Release model

Branch	Version	Tags	Spring Version Depends
master	2.2.0.BUILD-SNAPSHOT		2.2.0.SNAPSHOT
2.1.x	2.1.5.BUILD-SNAPSHOT		2.1.5.RELEASE
		2.1.4.RELEASE	2.1.4.RELEASE
		2.1.4.RC2	2.1.4.RELEASE
		2.1.4.RC1	2.1.4.RELEASE
		2.1.4.M2	2.1.4.RELEASE
		2.1.4.M1	2.1.4.RELEASE
		2.1.3.RELEASE	2.1.3.RELEASE
		2.1.3.RC2	2.1.3.RELEASE
		2.1.3.RC1	2.1.3.RELEASE
		2.1.3.M2	2.1.3.RELEASE
		2.1.3.M1	2.1.3.RELEASE
		...	...
2.0.x	2.0.7.BUILD-SNAPSHOT		2.0.7.RELEASE
		2.0.6.RELEASE	2.0.6.RELEASE
		2.0.6.RC2	2.0.6.RELEASE
		2.0.6.RC1	2.0.6.RELEASE
		2.0.6.M2	2.0.6.RELEASE
		2.0.6.M1	2.0.6.RELEASE
		2.0.5.RELEASE	2.0.5.RELEASE
		2.0.5.RC2	2.0.5.RELEASE
		2.0.5.RC1	2.0.5.RELEASE
		2.0.5.M2	2.0.5.RELEASE
		2.0.5.M1	2.0.5.RELEASE
		...	...
1.5.x	1.5.12.BUILD-SNAPSHOT		1.5.12.RELEASE
		1.5.11.RELEASE	1.5.11.RELEASE
		1.5.11.RC2	1.5.11.RELEASE
		1.5.11.RC1	1.5.11.RELEASE
		1.5.11.M2	1.5.11.RELEASE
		1.5.11.M1	1.5.11.RELEASE
		...	...

Steps of Spring version upgrade

Take spring version 2.2.0.RELEASE as example

• Upgrade spring version to 2.2.0.RELEASE, make changes for comparability.
• Branch out 2.2.x.
• Update master version to 2.3.0.BUILD-SNAPSHOT, as well as upgrade spring version to 2.3.0.BUILD-SNAPSHOT.
• Continue work on branch 2.2.x, then release 2.2.0.M1, 2.2.0.RC1 and so on.
• After branch 2.2.0.RC.X is stable enough and spring version 2.2.1.RELEASE available, we can release the final version 2.2.0.RELEASE.
• Finally, update branch 2.1.x version to 2.2.1.BUILD-SNAPSHOT and upgrade spring version to 2.2.1.RELEASE.