You're right. Right now master is only behind EDR1 (no fork). If it's
bothering people here (like you ;) ) I can still put a tag on current
master to keep track of "before EDR1" and merge the whole stuff.
Antoine
Le mer. 30 sept. 2015 à 10:00, Mark Struberg <struberg(a)yahoo.de> a écrit :
Oki, thanks for clarifying!
The goal should be to make it as easy as possible for interested persons
to contribute. And this requires to really push them to the current state
(s)he can pull new changes from and apply their contributions on.
Merging with Git is easier than with other scm systems, but it is not for
free neither. It’s still much better to avoid merge conflicts than to have
to merge sentences by hand.
txs and LieGrue,
strub
> Am 30.09.2015 um 09:56 schrieb Antoine Sabot-Durand <
antoine(a)sabot-durand.net>:
>
> No it has to do with JCP process :
https://www.jcp.org/ja/procedures/jcp2#3.1
> and no EDR 1 is not "FINISHED!". Draft is finished but review part will
be in 5 days (oct 5) :
https://jcp.org/en/jsr/detail?id=365
> There will be a ballot on it starting oct 5.
>
> This said, you're right, we won't continue on this branch. I said that
there's no urgence since we don't have things to commit right away (to my
knowledge). It'll change in the coming days.
>
> Antoine
>
>
> Le mer. 30 sept. 2015 à 09:34, Mark Struberg <struberg(a)yahoo.de> a
écrit :
> This has nothing to do with the technical ability to find the last
commit.
> It has purely to do that EDR-1 is FINISHED! This was a nice pun that we
do it the wrong way if we continue on this branch…
>
> I suggest we update the docs in master and pull over the parts we like
from EDR-1 and put the rest on the TODO list.
> You can also create a new branch for EDR-2 or CDI20-M2 or whatever you
like to call it.
>
> LieGrue,
> strub
>
> > Am 30.09.2015 um 08:38 schrieb Antoine Sabot-Durand <
antoine(a)sabot-durand.net>:
> >
> > Still have the 2.0-EDR1 branch.
> >
> > I still don't see the urgence to merge it to master, since we are
thinking about reviewing SE boot. But I put 2.0-EDR1 as default branch on
Github.
> > Honestly I don't think people unable to find last commit in a github
repo are the best choice for contributors to the spec ;).
> >
> > Antoine
> >
> >
> > Le mer. 30 sept. 2015 à 08:29, Mark Struberg <struberg(a)yahoo.de> a
écrit :
> > Hi Antoine!
> >
> > Side question: what is the state of our GIT repo?
> > Where can we find the latest and greatest and a set of things
(branches) people are working on.
> > Master still seems to not reflect the latest changes. Anyone has an
oversight and can fix this please?
> >
> > txs and LieGrue,
> > strub
> >
> > > Am 29.09.2015 um 11:36 schrieb Antoine Sabot-Durand <
antoine(a)sabot-durand.net>:
> > >
> > > Hi guys,
> > >
> > > The blog post is here :
> > >
http://www.cdi-spec.org/news/2015/09/29/Second-F2F-meeting/
> > >
> > > I probably forgot a few stuff (I still have to check in everybody's
note) but the main topics are here.
> > >
> > > As always, feed is welcome and we'll discuss these point sin
today's
meeting.
> > >
> > > Antoine
> > > _______________________________________________
> > > cdi-dev mailing list
> > > cdi-dev(a)lists.jboss.org
> > >
https://lists.jboss.org/mailman/listinfo/cdi-dev
> > >
> > > Note that for all code provided on this list, the provider licenses
the code under the Apache License, Version 2 (
http://www.apache.org/licenses/LICENSE-2.0.html). For all other ideas
provided on this list, the provider waives all patent and other
intellectual property rights inherent in such information.
> >
>