Matt You are referring to NIFI-12998 and it causing rebasing to be necessary for outstanding PRs?
The rebase should be quite straight forward for most cases. If you have any questions Im happy to help. I rebased a tremendous number of times to keep up with main changing while the PR took several weeks to create and test and validate against previous builds. Also rebased repeatedly during the review and feedback stage. As a result I got to practice my rebase skills about 20 times across 50 or more commits to main during that time. On your pr branch git fetch —all git rebase upstream/main git status fix any conflicts git add . git rebase —continue If any conflicts it would likely be for new modules created in the pr which would just be moving from a path in nifi-nar-bundles to nifi-extension-bundles. If you have a pr in mind you have a question on for the rebase let me know. Thanks Joe On Wed, May 1, 2024 at 9:51 PM Matt Burgess <mattyb...@gmail.com> wrote: > One thing that was mentioned was an included Jira for "providing a clearer > distinction between framework and > extensions," This involved moving extensions to a new module and for > community folks this is causing problems with any > new improvements in-flight before that. Seems like it needed more > announcement than an upcoming RC due to the impact? > > On Mon, Apr 29, 2024 at 10:22 AM David Handermann < > exceptionfact...@apache.org> wrote: > > > Team, > > > > We are getting closer to ready for a release candidate build. Based on > > some conversations with those working on the user interface, there are > > still a couple more items to complete this week. Getting a solid build > > of the new UI into this next version will be very helpful, so getting > > a few more of those issues resolved should put things in a good > > position. > > > > Regards, > > David Handermann > > > > On Wed, Apr 24, 2024 at 8:32 AM Joe Witt <joe.w...@gmail.com> wrote: > > > > > > Also agreed there. Profile should be there to exclude perhaps but > > include > > > should be default. > > > > > > On Wed, Apr 24, 2024 at 6:30 AM David Handermann < > > > exceptionfact...@apache.org> wrote: > > > > > > > Thanks for the replies thus far! > > > > > > > > With the goal of including the new UI, it seems like a good time to > > > > move the module from an optional profile to part of the standard > > > > build. That would make the release candidate build and review process > > > > simpler, not requiring the optional build profile. > > > > > > > > Regards, > > > > David Handermann > > > > > > > > On Tue, Apr 23, 2024 at 2:42 PM Matt Gilman <matt.c.gil...@gmail.com > > > > > > wrote: > > > > > > > > > > I agree. Including the updated UI and getting some feedback would > be > > > > great. > > > > > > > > > > On Mon, Apr 22, 2024 at 8:50 PM Joe Witt <joe.w...@gmail.com> > wrote: > > > > > > > > > > > Id be a big fan of including the new UI. > > > > > > > > > > > > On Mon, Apr 22, 2024 at 5:45 PM Pierre Villard < > > > > > > pierre.villard...@gmail.com> > > > > > > wrote: > > > > > > > > > > > > > Thanks David, I'm happy to take care of a 1.26 release at the > > same > > > > time. > > > > > > > > > > > > > > Regarding the M3 release, should the new UI be included and > > > > instructions > > > > > > > given on how to access it to start collecting feedback? I'm > > under the > > > > > > > impression that almost all of the work has been done, no? > > > > > > > > > > > > > > Thanks, > > > > > > > Pierre > > > > > > > > > > > > > > Le mar. 23 avr. 2024, 02:03, David Handermann < > > > > > > exceptionfact...@apache.org > > > > > > > > > > > > > > > a écrit : > > > > > > > > > > > > > > > Team, > > > > > > > > > > > > > > > > We are approaching 300 Jira issues resolved for version > > 2.0.0-M3 > > > > [1], > > > > > > > > including a number of important dependency upgrades and > Python > > > > > > > > framework improvements. > > > > > > > > > > > > > > > > There are several open pull requests that are getting close > to > > > > > > > > completion, which should be possible to include in an > upcoming > > > > release > > > > > > > > version. There is also a significant pull request [2] for > > > > NIFI-12998 > > > > > > > > [3] that includes some important changes to module directory > > > > > > > > hierarchy, providing a clearer distinction between framework > > and > > > > > > > > extensions, and implementing significant cleanup of > dependency > > > > > > > > declarations across the repository. > > > > > > > > > > > > > > > > With these changes in view, we should be ready for another > > > > milestone > > > > > > > > release soon after merging the above pull request. > > > > > > > > > > > > > > > > Another milestone release seems to be the best course of > > action for > > > > > > > > now, providing the opportunity for additional review and > > testing > > > > > > > > before a full 2.0.0 release version. > > > > > > > > > > > > > > > > I would be glad to handle Release Manager responsibilities > for > > > > > > > > 2.0.0-M3 when things are ready. > > > > > > > > > > > > > > > > Regards, > > > > > > > > David Handermann > > > > > > > > > > > > > > > > [1] > > > > > > > > > > > > > > > > > > > > > > > > > > > > https://issues.apache.org/jira/issues/?jql=project%20%3D%20NIFI%20AND%20fixVersion%20%3D%202.0.0-M3 > > > > > > > > [2] https://github.com/apache/nifi/pull/8677 > > > > > > > > [3] https://issues.apache.org/jira/browse/NIFI-12998 > > > > > > > > > > > > > > > > > > > > > > > > > > > >
