I agree with Bryan’s plan. Andy LoPresto [email protected] [email protected] He/Him PGP Fingerprint: 70EC B3E5 98A6 5A3F D3C4 BACE 3C6E F65B 2F7D EF69
> On Apr 6, 2020, at 7:12 AM, Bryan Bende <[email protected]> wrote: > > That makes sense to me. > > I think going forward we should consider switching things around a little > bit and get master back to the state of 0.6.0 and set it to 0.7.0-SNAPSHOT, > and then keep the 1.0.0 work in another branch, mainly because it is > unclear when we would be able to release a 1.0.0 registry which likely > requires a 2.0.0 NiFi. > > We can figure this out after finalizing the 0.6.0 release, so for now what > you suggested seems like the correct thing to do. > > On Mon, Apr 6, 2020 at 9:52 AM Arpad Boda <[email protected]> wrote: > >> Hi, >> >> As you may know, 0.6.0 was technically a patch release, branching from >> master based on 0.5.0 and cherry-picking non-breaking changes from master. >> >> Because of this merging back the release branch to master would just cause >> conflict and master has the proper versions (1.0.0) already set. >> >> To avoid this issue I would just add the release tag to 0.6.0 branch and >> avoid merging. >> >> Please share your opinion, especially in case you have concerns with the >> above. >> >> Cheers, >> Arpad >>
