On Mon, Jul 18, 2016 at 2:45 PM, Nisala Nanayakkara <nis...@wso2.com> 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? 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. Thanks, KasunG > Thanks, > Nisala > > On Mon, Jul 18, 2016 at 2:05 PM, KasunG Gajasinghe <kas...@wso2.com> > wrote: > >> Hi Nisala, >> >> On Thu, Jun 30, 2016 at 7:17 AM, Nisala Nanayakkara <nis...@wso2.com> >> 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 <nis...@wso2.com> >>> 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 >>> Dev@wso2.org >>> 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 Dev@wso2.org http://wso2.org/cgi-bin/mailman/listinfo/dev
