I know, but this vote/release is about nms-api, not nms-amqp or nms-openwire.
Best Krzysztof On Mon, May 9, 2022 at 10:03 PM Michael André Pearce <michael.andre.pea...@me.com.invalid> wrote: > Probably worth mentioning also Krzysztof that we should probably also pull > this into 1.8.x branch if we are going to release from that not main, there > was a pretty nasty compression back compatibility break which was > in-advertantly introduced in the 1.8.0 release, which is fixed in main. > Should probably be cherry picked also. > > > https://github.com/apache/activemq-nms-openwire/commit/1ca64661b3bcb24e1da81ecfa746e9b5b771dadb > < > https://github.com/apache/activemq-nms-openwire/commit/1ca64661b3bcb24e1da81ecfa746e9b5b771dadb > > > > Best > Mike > > > > > On 9 May 2022, at 15:20, Robbie Gemmell <robbie.gemm...@gmail.com> > wrote: > > > > git-cherry is also useful, especially in simpler cases, giving a quick > > inspection of whether the changes in commits on one branch have landed > > on a target branch yet (not requiring an exact-match for the commit > > itself, since the SHA and line numbers etc may have diverged, but > > instead by comparing the effective changes within the commits). > > > > You basically get a quick list of the commits on the base branch since > > the other branch started, and a note whether each of them has an > > equivalent effective diff on the target branch yet or not, so > > something on a similar lines here might be: > > > > git cherry 1.8.x main -v | less > > > > (A '+' prefix would mean that a commits change/diff only exists on > > main, and '-' prefix means the commit has one with equivalent diff on > > the 1.8.x branch i.e its changes have presumably been picked) > > > > On Mon, 9 May 2022 at 14:30, Clebert Suconic <clebert.suco...@gmail.com> > wrote: > >> > >> the script here will generate an HTML table out of the commits on > >> main. If you were using cherry-pick -x, you would see commits on the > >> XREF column: > >> > >> > >> git clone https://github.com/apache/activemq-nms-amqp.git > >> cd activemq-nms-amqp > >> > >> git checkout 1.8.x > >> git checkout 1.7.x > >> git checkout 2.0.x > >> git checkout main > >> > >> cd .. > >> git clone https://github.com/rh-messaging/jira-git-report.git > >> cd jira-git-report > >> mvn compile assembly:single > >> cd .. > >> java -jar > jira-git-report/target/jira-git-0.1.SNAPSHOT-jar-with-dependencies.jar > >> artemis activemq-nms-amqp out.html 1.8.0 HEAD false 1.8.x 1.8.0 > >> > >> ~ > >> > >> On Mon, May 9, 2022 at 8:10 AM Clebert Suconic > >> <clebert.suco...@gmail.com> wrote: > >>> > >>> The gitreport I use makes it easy to manage cherry picks. Let me know > if you need help. > >>> > >>> On Sat, May 7, 2022 at 2:07 AM Havret <h4v...@gmail.com> wrote: > >>>> > >>>> Thanks Michael, > >>>> > >>>> I will cherry pick the missing license bit. And re-submit the vote. > Closing > >>>> this for now. > >>>> > >>>> Cheers, > >>>> Krzysztof > >>>> > >>>> On Sat, May 7, 2022 at 6:38 AM Michael André Pearce > >>>> <michael.andre.pea...@me.com.invalid> wrote: > >>>> > >>>>> Hi Krzysztof > >>>>> > >>>>> As highlighted by Tim, as you’re realising off the 1.8 branch some > of the > >>>>> maintenance bits we do on master/main need to pulled/cherrypicked > back to > >>>>> the 1.8 branch > >>>>> > >>>>> E.g, these > >>>>> > >>>>> > >>>>> > https://github.com/apache/activemq-nms-api/commit/efc6a84c410d17154f85ad45b050aac31d3959ea > >>>>> > >>>>> > >>>>> > https://github.com/apache/activemq-nms-api/commit/880d682466e13ddf25b9ce8dfab6c28b73fba193 > >>>>> > >>>>> Note it’s important to git cherry pick the original commits, rather > than > >>>>> making new change / commits in 1.8 branch > >>>>> > >>>>> Best > >>>>> Mike > >>>>> > >>>>> Sent from my iPad > >>>>> > >>>>>> On 27 Apr 2022, at 17:41, Timothy Bish <tabish...@gmail.com> wrote: > >>>>>> > >>>>>> On 4/25/22 13:40, Havret wrote: > >>>>>>> Hi all, > >>>>>>> > >>>>>>> I have put together a release of activemq-nms-api, please check it > and > >>>>> vote > >>>>>>> accordingly. > >>>>>>> > >>>>>>> This release contains a single bugfix[1] by Iuliia Fatkullina! > Thank > >>>>> you! > >>>>>>> > >>>>>>> The files can be grabbed from: > >>>>>>> > >>>>> > https://dist.apache.org/repos/dist/dev/activemq/activemq-nms-api/1.8.1-rc1/ > >>>>>>> > >>>>>>> Regards, > >>>>>>> Krzysztof > >>>>>>> > >>>>>>> [1]: https://issues.apache.org/jira/browse/AMQNET-745 > >>>>>>> > >>>>>> I took a brief look at the release, the NOTICE file appears to be > rather > >>>>> out of date (2019). Haven't looked deeper yet. > >>>>>> > >>>>>> -- > >>>>>> Tim Bish > >>>>>> > >>>>> > >>> > >>> -- > >>> Clebert Suconic > >> > >> > >> > >> -- > >> Clebert Suconic > >
