Le 30/11/2017 à 22:32, Stefan Seelmann a écrit : > On 10/01/2017 09:19 PM, Stefan Seelmann wrote: >> Hi, >> >> For API, server, and studio we have the "value" branches. Should we >> merge them back to trunk/master? >> >> Second question is if we should move to git/gitbox with all the >> remaining projects (server, studio, mavibot, project) > Now that git migration is done back to the first question :) > > Can we merge the "value" branches to master?
I think that is the plan. > > The branch exists in > * Mavibot > * LDAP API > * Server > * Studio > > The Mavibot branch doesn't compile. However I think we don't need to > merge it right now because the Server branch still uses 1.0.0.M8 so > doesn't depend on the branch. Right. I still have some fixes to apply in Mavibot to make it compile, at least in trunk. > > The other 3 branches compile but there are some test failures (~40 in > API, ~80 in Server, 3 in Studio excluing UI tests). Otherwise it looks > good, I can start Studio and run an ApacheDS can connect to it :) I have 2 errors in API, due to some late changes I have done - and I just have fixed some of the other failures in ldap-model -. I haven't yet checked apacheds, but I belive the failures are all due to teh change I made in teh API, related to the isHR flag in Value (this is related to an issue reported in Studio 3 weeks ago). This should not be too complex to fix. > > I'd suggest we first try to fix the tests in the branch first. I'll try > to help, probably not much in the next days but next week then. I'll take the necessary time to get this fixed. This was building 1 month ago, I broke it. We both have little time to dedicate to that, don't waste your time fixing my mistakes :-) Once we get both API and ApacheDS building, yes, we can merge them in trunk. Note that the API has changed, so it should probably be a 2.0 at this point. Thanks ! -- Emmanuel Lecharny Symas.com directory.apache.org
