You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@activemq.apache.org by Clebert Suconic <cl...@gmail.com> on 2022/01/14 16:30:39 UTC
ActiveMQ Artemis 2.19.x and cherry-pick -x
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 git@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
Re: ActiveMQ Artemis 2.19.x and cherry-pick -x
Posted by Robbie Gemmell <ro...@gmail.com>.
I happened to already be looking at updating the JIRAs when you sent
this, as you can probably now tell :)
On Thu, 20 Jan 2022 at 14:00, Clebert Suconic <cl...@gmail.com> wrote:
>
> I have a tool to generate a query for all the JIRAs on the release (the
> jira-git-report).
>
>
> I will set the releases when I am back working on next week.
>
> On Tue, Jan 18, 2022 at 12:41 PM Robbie Gemmell <ro...@gmail.com>
> wrote:
>
> > 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 the various netty related update commits.
> >
> > On Mon, 17 Jan 2022 at 13:57, Clebert Suconic <cl...@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 <ro...@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.suconic@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 git@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
> > > > > <cl...@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
> > > > > > <cl...@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 git@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
> >
> --
> Clebert Suconic
Re: ActiveMQ Artemis 2.19.x and cherry-pick -x
Posted by Clebert Suconic <cl...@gmail.com>.
I have a tool to generate a query for all the JIRAs on the release (the
jira-git-report).
I will set the releases when I am back working on next week.
On Tue, Jan 18, 2022 at 12:41 PM Robbie Gemmell <ro...@gmail.com>
wrote:
> 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 the various netty related update commits.
>
> On Mon, 17 Jan 2022 at 13:57, Clebert Suconic <cl...@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 <ro...@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.suconic@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 git@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
> > > > <cl...@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
> > > > > <cl...@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 git@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
>
--
Clebert Suconic
Re: ActiveMQ Artemis 2.19.x and cherry-pick -x
Posted by Robbie Gemmell <ro...@gmail.com>.
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 <cl...@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 <ro...@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 <cl...@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 git@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
> > > <cl...@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
> > > > <cl...@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 git@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
Re: ActiveMQ Artemis 2.19.x and cherry-pick -x
Posted by Clebert Suconic <cl...@gmail.com>.
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 <ro...@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 <cl...@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 git@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
> > <cl...@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
> > > <cl...@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 git@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
Re: ActiveMQ Artemis 2.19.x and cherry-pick -x
Posted by Robbie Gemmell <ro...@gmail.com>.
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 <cl...@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 git@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
> <cl...@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
> > <cl...@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 git@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
Re: ActiveMQ Artemis 2.19.x and cherry-pick -x
Posted by Emmanuel Hugonnet <eh...@redhat.com>.
Le 17/01/2022 à 15:22, Clebert Suconic a écrit :
> @Emmanuel perhaps you're referring to a different thing. You have sent
> a commit post 2.20.0 and I believe you are referring to that one.
Yes
>
>
> What I meant to say was 2.19.x does not have the JSON wrapper at all.
> It's just the direct javax JSON usage we always had simple and plain.
Yes I understood that. I did some poc using different classloaders to isolate the JSON usage in Artemis from WildFly.
>
>
> If you need the new JSON wrapper currently you will need 2.20.x.. if
> you need that improvement back ported we will need to bring it somehow
> and that's what I was asking you.
I don't need it for now I think. When WildFly moves to jakartaEE 10 then things will be different.
Cheers,
Emmanuel
>
> On Mon, Jan 17, 2022 at 2:41 AM Emmanuel Hugonnet <eh...@redhat.com> wrote:
>>
>>
>> Le 14/01/2022 à 22:24, Clebert Suconic a écrit :
>>> I'm not sure what to do with the JSON wrapper.. I don't think it
>>> should be brought into 2.19.x... as it's clearly an improvement...
>>>
>>>
>>> @Emmanuel Hugonnet is there anything on wildfly that would require it
>>> being pulled into 2.19.2?
>> No, I can live with the small fix I asked for which enable me not to use JSON API in WildFly and use Artemis code instead thus using only
>> 'on' version of JSON.
>> Cheers,
>> Emmanuel
>>> On Fri, Jan 14, 2022 at 3:38 PM Clebert Suconic
>>> <cl...@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 git@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
>>>> <cl...@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
>>>>> <cl...@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 git@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
>>>
>
Re: ActiveMQ Artemis 2.19.x and cherry-pick -x
Posted by Clebert Suconic <cl...@gmail.com>.
@Emmanuel perhaps you're referring to a different thing. You have sent
a commit post 2.20.0 and I believe you are referring to that one.
What I meant to say was 2.19.x does not have the JSON wrapper at all.
It's just the direct javax JSON usage we always had simple and plain.
If you need the new JSON wrapper currently you will need 2.20.x.. if
you need that improvement back ported we will need to bring it somehow
and that's what I was asking you.
On Mon, Jan 17, 2022 at 2:41 AM Emmanuel Hugonnet <eh...@redhat.com> wrote:
>
>
>
> Le 14/01/2022 à 22:24, Clebert Suconic a écrit :
> > I'm not sure what to do with the JSON wrapper.. I don't think it
> > should be brought into 2.19.x... as it's clearly an improvement...
> >
> >
> > @Emmanuel Hugonnet is there anything on wildfly that would require it
> > being pulled into 2.19.2?
>
> No, I can live with the small fix I asked for which enable me not to use JSON API in WildFly and use Artemis code instead thus using only
> 'on' version of JSON.
> Cheers,
> Emmanuel
> >
> > On Fri, Jan 14, 2022 at 3:38 PM Clebert Suconic
> > <cl...@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 git@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
> >> <cl...@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
> >>> <cl...@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 git@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
Re: ActiveMQ Artemis 2.19.x and cherry-pick -x
Posted by Emmanuel Hugonnet <eh...@redhat.com>.
Le 14/01/2022 à 22:24, Clebert Suconic a écrit :
> I'm not sure what to do with the JSON wrapper.. I don't think it
> should be brought into 2.19.x... as it's clearly an improvement...
>
>
> @Emmanuel Hugonnet is there anything on wildfly that would require it
> being pulled into 2.19.2?
No, I can live with the small fix I asked for which enable me not to use JSON API in WildFly and use Artemis code instead thus using only
'on' version of JSON.
Cheers,
Emmanuel
>
> On Fri, Jan 14, 2022 at 3:38 PM Clebert Suconic
> <cl...@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 git@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
>> <cl...@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
>>> <cl...@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 git@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
>
>
Re: ActiveMQ Artemis 2.19.x and cherry-pick -x
Posted by Clebert Suconic <cl...@gmail.com>.
I'm not sure what to do with the JSON wrapper.. I don't think it
should be brought into 2.19.x... as it's clearly an improvement...
@Emmanuel Hugonnet is there anything on wildfly that would require it
being pulled into 2.19.2?
On Fri, Jan 14, 2022 at 3:38 PM Clebert Suconic
<cl...@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 git@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
> <cl...@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
> > <cl...@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 git@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
Re: ActiveMQ Artemis 2.19.x and cherry-pick -x
Posted by Clebert Suconic <cl...@gmail.com>.
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 git@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
<cl...@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
> <cl...@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 git@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
Re: ActiveMQ Artemis 2.19.x and cherry-pick -x
Posted by Robbie Gemmell <ro...@gmail.com>.
git-cherry can also be quite useful in cases like this, it is used to
check if changes (the same effective diff of a commit, rather than the
exact same commit since SHAs / line numbers etc can differ) from a
branch have landed on a target branch yet.
You can essentially run it and get a succinct list of all the commits
on main since the branch happened and whether they have an equivalent
effective change yet on the release branch, so something on a similar
lines here might be:
git cherry 2.19.x main -v | less
(A '+' prefix would mean the commit changes only exists on main, and
'-' prefix means they have an matching equivalent change commit on the
backport branch i.e have been picked)
On Fri, 14 Jan 2022 at 16:49, Clebert Suconic <cl...@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
> <cl...@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 git@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
Re: ActiveMQ Artemis 2.19.x and cherry-pick -x
Posted by Clebert Suconic <cl...@gmail.com>.
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
<cl...@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 git@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