It doesnt need to be 2.19.<1..2..3 etc>-SNAPSHOT (though its probably the most obvious), it could be something else, but I dont think it should really ever be <previously-released-version>-SNAPSHOT though.
I backported the various netty related update commits. On Mon, 17 Jan 2022 at 13:57, Clebert Suconic <clebert.suco...@gmail.com> wrote: > > it sounds that all we need to do now is to cherry-pick netty upgrades > and fixup JIRA. > > > I actually meant for it to be 2.19.0-SNAPSHOT on that branch.. but I > can see it being better on 2.19.1-SNAPSHOT, 2.19-2-SNAPSHOT.. etc.... > > I'm away this week for a few personal issues... and I'm taking > vacation days to take care of those issues... If no one is around to > do a release this week I will do one next week. (the week of Jan-24th > for future references). > > On Mon, Jan 17, 2022 at 6:58 AM Robbie Gemmell <robbie.gemm...@gmail.com> > wrote: > > > > I have fixed the pom to use 2.19.1-SNAPSHOT versions rather than the > > 2.19.0-SNAPSHOT they were using. > > > > I noticed the last commit from > > https://issues.apache.org/jira/browse/ARTEMIS-3461 was not backported > > but all the earlier ones which introduced various issues were, so I > > backported the fixups+tests commit. > > > > I backported a fixup from > > https://issues.apache.org/jira/browse/ARTEMIS-3515 which was found > > with/during the original 2.19.0 release. > > > > I tried but couldnt delete a commit comment from > > https://issues.apache.org/jira/browse/ARTEMIS-3525, as the related > > commit was added and removed from the 2.19.x branch and so hasnt been > > backported as the JIRA now looks to suggest. > > > > A version in JIRA for 2.19.1 needs adding and the related JIRAs > > updated generally. > > > > > > I would suggest the Netty updates (and related fixes in progress) > > should be backported given there were CVE fixes included. Probably > > some other dependency upgrades should similarly be considered for > > their own fixups. > > > > Robbie > > > > On Fri, 14 Jan 2022 at 20:38, Clebert Suconic <clebert.suco...@gmail.com> > > wrote: > > > > > > I have updated the branch with some commits that I think are relevant... > > > > > > I added a few more than just critical bug fixes as it would be > > > difficult to not bring some aesthetical changes due to conflicts > > > between the branches. > > > > > > > > > what I have now on 2.19.x is a proposal.. and we can still push -f > > > before we do a release on that branch. > > > > > > > > > > > > I have updated the report on the activemq-website git project, but for > > > some reason it was not updating (at least until before I sent the > > > email): > > > > > > > > > It may eventually update the report here: > > > > > > > > > otherwise you could check the report by running this (from my first > > > email on this thread): > > > > > > git clone g...@github.com:apache/activemq-artemis.git > > > cd activemq-artemis > > > # needs to make sure 2.19.x is checked out for the script > > > git checkout 2.19.x > > > git checkout main > > > ./scripts/cherry-pick-report.sh > > > > > > > > > On Fri, Jan 14, 2022 at 11:49 AM Clebert Suconic > > > <clebert.suco...@gmail.com> wrote: > > > > > > > > I uploaded a build to the artemis website, just to give you an idea on > > > > what the reporting does: > > > > > > > > https://activemq.apache.org/components/artemis/download/cherry-pick-report > > > > > > > > > > > > notice I used REST=true , as the script is currently doing it as false > > > > > > > > > > > > > > > > We should look into initially cherry-picking all bug fixes between > > > > 2.20.0 and 2.19.x? or just the critical ones? > > > > > > > > > > > > My suggestion is that we initially cherry-pick them all for the first > > > > version, and then only critical fixes as I am not looking to keep > > > > doing this branch forever. > > > > > > > > On Fri, Jan 14, 2022 at 11:30 AM Clebert Suconic > > > > <clebert.suco...@gmail.com> wrote: > > > > > > > > > > if you are interested on helping with 2.19.x, please read this: > > > > > > > > > > > > > > > > > > > > - I have added a branch 2.19.x > > > > > > > > > > Every backport from main into 2.19.x should use "git cherry-pick -x" > > > > > > > > > > > > > > > To help tracking the cherry-picks, I have created a script on main > > > > > that will generate a report of cherrypicks and commits between main > > > > > and 2.19.x > > > > > > > > > > To run it, you should have your git clone updated on main and > > > > > 2.19.x... > > > > > > > > > > and run the script... > > > > > > > > > > > > > > > the following scriptlet would actually work: > > > > > > > > > > --------------- > > > > > git clone g...@github.com:apache/activemq-artemis.git > > > > > cd activemq-artemis > > > > > # needs to make sure 2.19.x is checked out for the script > > > > > git checkout 2.19.x > > > > > git checkout main > > > > > ./scripts/cherry-pick-report.sh > > > > > > > > > > --------------- > > > > > > > > > > > > > > > After you executed cherry-pick report.sh from the root folder from the > > > > > clone, you will see this: > > > > > > > > > > ============================================================================================================================== > > > > > Report generated at > > > > > ./target/cherry-pick-report/cherry-pick-report.html > > > > > ============================================================================================================================== > > > > > > > > > > > > > > > > > > > > Which will have a list of commits on main since 2.19.0 and it will > > > > > show the cherry-pick points on 2.19.x (if you used cherry-pick -x, > > > > > hence why I'm asking for people to use the -x when cherry-picking it) > > > > > > > > > > > > > > > > > > > > > > > > > (this report could actually be used on ActiveMQ classic.. I think it's > > > > > quite useful on managing xrefs of cherry-picks between branches.) > > > > > > > > > > -- > > > > > Clebert Suconic > > > > > > > > > > > > > > > > -- > > > > Clebert Suconic > > > > > > > > > > > > -- > > > Clebert Suconic > > > > -- > Clebert Suconic
