I pushed the changes. Le mer. 11 janv. 2023 à 10:54, Claus Ibsen <claus.ib...@gmail.com> a écrit :
> Hi > > Guillaume is ready for pushing v4 to main branch. So he is doing this now. > Until he is done then please do not commit directly to main, but only do > PRs > > On Wed, Jan 11, 2023 at 9:57 AM Andrea Cosentino > <ancosen1...@yahoo.com.invalid> wrote: > > > Branches have been created. > > > > CI jobs should updated. > > > > I guess we need to aling the regen action for 3.x, by pointing to the new > > branches. > > > > If something is missing, please report. > > > > Thanks > > > > -- > > Andrea Cosentino > > ---------------------------------- > > Apache Camel PMC Chair > > Apache Karaf Committer > > Apache Servicemix PMC Member > > Email: ancosen1...@yahoo.com > > Twitter: @oscerd2 > > Github: oscerd > > > > > > > > > > > > > > On Tuesday, January 10, 2023 at 11:25:54 AM GMT+1, Andrea Cosentino > > <ancosen1...@yahoo.com.invalid> wrote: > > > > > > > > > > > > There are some pending PRs waiting to be merged. > > > > Once they are, we could create the branches. > > > > -- > > Andrea Cosentino > > ---------------------------------- > > Apache Camel PMC Chair > > Apache Karaf Committer > > Apache Servicemix PMC Member > > Email: ancosen1...@yahoo.com > > Twitter: @oscerd2 > > Github: oscerd > > > > > > > > > > > > > > On Tuesday, January 10, 2023 at 10:42:57 AM GMT+1, Claus Ibsen < > > claus.ib...@gmail.com> wrote: > > > > > > > > > > > > Hi > > > > Lets try to get ready this week for switching main to v4. > > Guillaume is back from PTO and will prepare his work today so it can be > > ready for the switch. > > In the meantime we need to prepare for the switch. > > > > We need to setup branches for v3 as its "main" branch. > > - camel-3.x > > - camel-spring-boot-3.x > > - camel-karaf-3.x > > > > And have ASF CI servers able to build and test these branches (as it does > > today via main branch). > > This allows Camel v3 to continue as is, as we need to keep maintaining it > > till the end of 2023. > > > > When we have these branches, then we need to remember to backport commits > > to these branches as well, > > that need to go into v3 for 3.21.0 and 3.22.0 releases. This means that > > backporting commits is now potentially more branches: > > > > main > > camel-3.x > > camel-3.20.x > > camel-3.18.x > > camel-3.14.x > > > > It may be that before making the switch then Guillaume needs the "main" > > branch to not have new commits for a couple of hours. > > If so then lets us know Guillaume, as we can in the mean time then send > > only work as PRs and then apply these after the switch. > > > > However when you are getting closer to make the switch then give us a > heads > > up here in this mail thread, thanks. > > > > > > > > > > > > On Tue, Jan 3, 2023 at 11:46 AM Claus Ibsen <claus.ib...@gmail.com> > wrote: > > > > > Hi > > > > > > The work on Camel v4 is starting and we will publish a blog post on the > > > roadmap and timeline for Camel v4 later this week. > > > > > > Some time next week we would like to switch "main" branch to v4, and > then > > > create a new camel-3.x branch as the active branch for future Camel v3 > > > releases (next will be 3.21). > > > > > > The v4 is work in progress and in the beginning there will be plenty of > > > stuff that fail tests, and components disabled as they have not yet > been > > > migrated to jakarta spec etc. So when we have the main branch switched > > then > > > more people can help with this work - where we can work on a per > > component > > > style to fix tests, upgrade dependencies, and whatnot. > > > > > > > > > > > > -- > > > Claus Ibsen > > > ----------------- > > > @davsclaus > > > Camel in Action 2: https://www.manning.com/ibsen2 > > > > > > > > > > > -- > > Claus Ibsen > > ----------------- > > @davsclaus > > Camel in Action 2: https://www.manning.com/ibsen2 > > > > > -- > Claus Ibsen > ----------------- > @davsclaus > Camel in Action 2: https://www.manning.com/ibsen2 > -- ------------------------ Guillaume Nodet
