On 10/08/2010 12:12 PM, Thomas Mortagne wrote:
On Thu, Oct 7, 2010 at 10:51, Caleb James DeLisle <[email protected]> wrote:
On 10/07/2010 03:24 AM, Marius Dumitru Florea wrote:
On 10/06/2010 03:28 PM, Caleb James DeLisle wrote:
I have been observing problems with the versioning scheme which we are using.
Because applications are not branched along with core, when a bugfix version of a stable branch is released, new versions of applications are typically pulled in.
I'm not sure what you mean by "typically" here but I don't see the need to automatically release an application whenever a bug fix release of XE is made and I don't think our release managers do this.
Let's take for example the administration application which is included in each release of enterprise. http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.4/pom.xml<-- v1.37 http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.4.1/pom.xml<-- v1.38 http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.4.2/pom.xml<-- v1.39 in v2.3 http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.3/pom.xml<-- v1.33 http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.3.1/pom.xml<-- v1.34 http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.3.2/pom.xml<-- v1.34 with a comment above that 1.35 is incompatible.
http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.2/pom.xml<-- v1.26 http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.2.1/pom.xml<-- v1.27 http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.2.2/pom.xml<-- v1.28 http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.2.3/pom.xml<-- v1.29 http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.2.4/pom.xml<-- v1.30 http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.2.5/pom.xml<-- v1.32 http://svn.xwiki.org/svnroot/xwiki/enterprise/tags/xwiki-enterprise-2.2.6/pom.xml<-- v1.33
So in the last three versions, every time except for 1, this was the practice.
If an application has bug fixes too and these bug fixes are compatible with the bug fix release of XE then yes, otherwise the application needs a branch.
Branching to keep bug fixes to backport separate from regular development is a good idea, but in http://svn.xwiki.org/svnroot/xwiki/platform/xwiki-applications/branches/ I only see 4 branches have ever been made.
Which only mean that we don't need to branch that much, even the application remain compatible with the stable branch or only incompatible commits are done in the applications most of the time.
Applications rarely need branches because there are mostly two types of changes that require branches: - API changes, which are pretty rare - Major Skin changes, which are also pretty rare. 2.4.1 was broken because of API changes. 2.4.2 was broken because of a skin change, and for which I locked down the wrong version of the application. Really, branching applications is not needed. -- Sergiu Dumitriu http://purl.org/net/sergiu/