Hi Harald, before switching the master to 5.0 I have merged the milestone branch into the 4.x line by cheripicking/resolving each commit from the target-milestone see https://ops4j1.jira.com/browse/PAXEXAM-829 and resolved the conflict that where ther at that time with the 4.x line so maybe this would be a better starting point for branching? There was also a bug there with PerMethod Annotation https://ops4j1.jira.com/browse/PAXEXAM-841 Toni fixed that.
Sadly noone on the mailing list was able to tell how to run all itest localy I tried that but has only little success so if you can explain how to do that I'll take alook at that but would definately need some help in debugging this, becuase the container it self seem to work (at least OSGi container) and the default JUnit-Tests are all running, so it might have to do with dependecies that needed to be updated? About feature-branches: I think that is okay but we should then make sure that all feature branches are synced with the master at regular intervalls to make them mergable and we must note somewhere how a feature gets into the master. I also think we should the definately use some kind of Jira-Epics to describe whats going on on these branches so it is clear what they are for, who supports them and so on... I tried to structure things already in the JIRA a bit and linked those in the Pax Exam 5 Vision page. Am Sonntag, 12. November 2017 18:51:28 UTC+1 schrieb Harald Wellmann: > > Sorry for being rather silent on this list for quite some time - I've > been busy with too many other things, but now I'm back to what I had in > mind last year, when I started the exam5-milestones branch, mainly for > API cleanup, Java 8 upgrade and JUnit 5 support. > > I noticed that the GitHub master branch has been on 5.0.0-SNAPSHOT for a > while, causing conflicts with the exam5-milestones branch which used the > same version. > > I've changed the version on exam5-milestones to 5.0.0.M2-SNAPSHOT for > now, just to avoid any conflicts in Nexus. (M2, because there is a M1 > tag on the Git repo.) > > There are now 3 Jenkins jobs > > org.ops4j.pax.exam-4.x (Branch v4.x) > org.ops4j.pax.exam-5.x (Branch exam5-milestones) > org.ops4j.pax.exam-master (Branch master) > > and corresponding integration test jobs suffixed with -itest. > > I think we should find a way to deal with the two competing 5.x branches. > > Since master is currently unstable (most integration tests are failing), > I've continued working on exam5-milestones, adding some new modules for > JUnit 5 that had been lying around on my local disk, making sure that > all tests pass, and merging all maintenance work from the v4.x branch. > > So much for the current status. > > Now how can we consolidate all that ongoing work? > > I would just like to discuss process and not features - each item of the > Pax Exam 5 Vision [1] deserves a separate discussion. > > At the moment, it seems that at least three people (Christoph, Toni and > myself) are working on non-trivial new features that could do with some > more specification, tests or documentation. > > What I'd like to achieve for future releases is less experimental, > undocumented or unused code and features. > > So maybe we should switch to some kind of feature branch workflow, where > people can work on their own branch/feature for weeks or months, > regularly merging master into their branch, until the feature is stable > enough to be merged into master or a given release branch. > > What do you think? > > [1] > > https://ops4j1.jira.com/wiki/spaces/PAXEXAM4/pages/133333475/Pax+Exam+5+Vision > > > Cheers, > Harald > > -- -- ------------------ OPS4J - http://www.ops4j.org - [email protected] --- You received this message because you are subscribed to the Google Groups "OPS4J" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
