Hi KasunG, On Mon, Jul 18, 2016 at 5:31 PM, KasunG Gajasinghe <[email protected]> wrote:
> > > On Mon, Jul 18, 2016 at 2:45 PM, Nisala Nanayakkara <[email protected]> > wrote: > >> Hi KasunG, >> >> Yes.This is the branch. Currently we are maintaining two branches as this >> tomcat version(tomcat 8) will not work with carbon 4.4.x products due to >> the tomcat API changes. >> > > >> So we have to maintain two branches now. But we will move the current >> master to branch 0.12.x branch and merger tomcat-8.0.x-jaggery to master. >> Then its a two different versions, not a feature branch. >> > > Since the code bases are pretty similar, it would be much better if these > two can be merged together instead! What are the possible alternatives we > have? > As there are many API changes in the tomcat level, and we have removed all carbon dependencies from the jaggery-core due to the tomcat integration effort. Also some of the host objects such as registry, database, etc which are based on carbon are moved out of jaggery core during this. Therefore I don't think it's very easy to merge all these together as it will just impose more complicated code, and many if conditions. > > Maintaining two different branches in the same repo would mean that we > will need to have two major versions. One for the existing development, and > another for the new development. > Not really, in the jaggery perspective we are not doing any active development or feature implementation. And once all our products have moved to away from carbon 4.4.x, the 0.12.x branch will not be used. Therefore I don't see much issue on having two branches. Thanks, Sinthuja. > > Thanks, > KasunG > > >> Thanks, >> Nisala >> >> On Mon, Jul 18, 2016 at 2:05 PM, KasunG Gajasinghe <[email protected]> >> wrote: >> >>> Hi Nisala, >>> >>> On Thu, Jun 30, 2016 at 7:17 AM, Nisala Nanayakkara <[email protected]> >>> wrote: >>> >>>> Hi all, >>>> >>>> Please find the branch here. >>>> >>>> [1] - https://github.com/wso2/jaggery/tree/tomcat-8.0.x-jaggery >>>> >>> >>> >>> From what I understood, this is a feature branch, is it not? Then, this >>> does not really need a separate jenkins job since you will merge this into >>> master soon. Please note that, you shouldn't have two diverged features in >>> branches of the same repo. >>> >>> Thanks, >>> KasunG >>> >>> >>>> >>>> Thanks, >>>> Nisala >>>> >>>> On Thu, Jun 30, 2016 at 7:12 AM, Nisala Nanayakkara <[email protected]> >>>> wrote: >>>> >>>>> Hi all, >>>>> >>>>> We have created a seperate branch[1] with the changes required for >>>>> providing runtime environment for jaggery apps in AS6. Currently there is >>>>> no jenkins builder setup for this, Please get the 1.0.0-SNAPSHOT version >>>>> by >>>>> building the branch in local repo. Please inform me if there are any >>>>> issues. >>>>> >>>>> Thanks, >>>>> Nisala >>>>> >>>>> -- >>>>> *Nisala Niroshana Nanayakkara,* >>>>> Software Engineer >>>>> Mobile:(+94)717600022 >>>>> WSO2 Inc., http://wso2.com/ >>>>> >>>> >>>> >>>> >>>> -- >>>> *Nisala Niroshana Nanayakkara,* >>>> Software Engineer >>>> Mobile:(+94)717600022 >>>> WSO2 Inc., http://wso2.com/ >>>> >>>> _______________________________________________ >>>> Dev mailing list >>>> [email protected] >>>> http://wso2.org/cgi-bin/mailman/listinfo/dev >>>> >>>> >>> >>> >>> -- >>> >>> *Kasun Gajasinghe*Associate Technical Lead, WSO2 Inc. >>> email: kasung AT spamfree wso2.com >>> linked-in: http://lk.linkedin.com/in/gajasinghe >>> blog: http://kasunbg.org >>> >>> >>> >> >> >> >> -- >> *Nisala Niroshana Nanayakkara,* >> Software Engineer >> Mobile:(+94)717600022 >> WSO2 Inc., http://wso2.com/ >> > > > > -- > > *Kasun Gajasinghe*Associate Technical Lead, WSO2 Inc. > email: kasung AT spamfree wso2.com > linked-in: http://lk.linkedin.com/in/gajasinghe > blog: http://kasunbg.org > > > > _______________________________________________ > Dev mailing list > [email protected] > http://wso2.org/cgi-bin/mailman/listinfo/dev > > -- *Sinthuja Rajendran* Technical Lead WSO2, Inc.:http://wso2.com Blog: http://sinthu-rajan.blogspot.com/ Mobile: +94774273955
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
