Thanks Hervé, Much appreciated. Regards, Konrad
> On 3. Apr 2026, at 11:02, Hervé Boutemy <[email protected]> wrote: > > thanks for the hint > > master is now reset to the latest state for Maven Site Plugin > 3.21.1-SNAPSHOT, > where everything from former master had been backported > > former master and maven-site-plugin-3.x have been copied to tmp/ > master-20260403 and tmp/maven-site-plugin-3.x-20260403 > ready to be deleted once everybody feels fully safe > > we're back to normal operations on Maven Site Plugin 3.x (and no 4.x for > Maven > 4 work planned in the near future) > > just need to update release drafter and dependabot configuration as > necessary: > will be done soon when Slawek has time, thanks Slawek > > and probably a few PRs to drop or rework to match new master > > Regards, > > Hervé > > Le vendredi 3 avril 2026, 09:17:16 CEST Slawomir Jaranowski a écrit : >> On Fri, 3 Apr 2026 at 08:23, Hervé Boutemy <[email protected]> wrote: >>> ok, I reviewed every differences between master and maven-site-plugin-3.x, >>> and I backported every change to master that was missing >>> >>> now, remaining differences between these 2 branches is only .asf.yaml and >>> release drafter conf (+ pom.xml, as expected) = what is normal to match >>> branch names >>> >>> It's now time to drop existing master and replace it with >>> maven-site-plugin-3.x: I don't know precisely how to do that, help welcome >>> (perhaps with infra, as master branch protection may block such sensitive >>> exceptional actions) >> >> We can temporally remove branch protection by editing asf.yml >> reset branch locally and force push >> >>> Regards, >>> >>> Hervé >>> >>> On 2026/04/01 06:53:48 Hervé Boutemy wrote: >>>> there has been a large confusion in the past between the meaning of >>> >>> 4.0.0-M* >>> >>>> (associated to Doxia 2.0.0-M*) and later 4 meaning "Maven 4" >>>> >>>> we'll have to sort that out by hand >>>> >>>> I don't think working at Git commit level will help much: diff on >>> >>> content will >>> >>>> be IMHO simpler >>>> >>>> I just tried to create a tar file for both branches (reproducible to >>> >>> avoid >>> >>>> timestamp noise) and diffoscope them: the result is IMHO small enough >>>> >>>> FYI, the command to create the tar: >>>> tar --exclude='./.git' --sort=name \ >>>> >>>> --mtime="@0" \ >>>> --owner=0 --group=0 --numeric-owner \ >>>> --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime >>> >>> \ >>> >>>> -cf ../maven-site-plugin.tar . >>>> >>>> diffoscope then gives the list of files to review and see what we should >>> >>> bring >>> >>>> to the 3.x branch before it replaces master >>>> => with a few PRs to review to 3.x, we should be clear >>>> >>>> Regards, >>>> >>>> Hervé >>>> >>>> Le mardi 31 mars 2026, 19:38:04 CEST Konrad Windszus a écrit : >>>>> Which commits in master are not compatible with Maven 3? Why have you >>> >>> only >>> >>>>> cherry-picked some for the last release? >>>>> >>>>> I don't think anyone else is able to quickly decide which ones were >>> >>> left out >>> >>>>> deliberately vs which ones were missed, so it would be much >>> >>> appreciated if >>> >>>>> you could do that cleanup work. Can you dedicate some time? >>>>> >>>>> The longer we wait the more challenging the cleanup... >>>>> >>>>> Thanks, >>>>> Konrad >>>>> >>>>> On 2026/03/28 18:27:26 Michael Osipov wrote: >>>>>> On 2026/03/28 09:44:08 Konrad Windszus wrote: >>>>>>> Hi, >>>>>>> I see that we have the following long living branches in >>>>>>> maven-site-plugin >>>>>>> >>>>>>> 1. Master (currently version is still at 4.0.0-M17-SNAPSHOT for >>>>>>> historical reasons but this should be targeting the next 3.x >>> >>> release >>> >>>>>>> IMHO) 2. maven-site-plugin-3.x >>> >>>>>>> However both branches deviate quite a lot: >>> https://github.com/apache/maven-site-plugin/compare/master...maven-site >>> >>>>>>> -plugin-3.x. >>>>>>> >>>>>>> Can someone clarify why we need two different ones, and what is >>>>>>> the >>>>>>> version which should be built from master?> >>>>>> >>>>>> It shouldn't. I had a private discussion with hboutemy@ about this >>> >>> as >>> >>>>>> well. Let me lay out what has been done: >>>>>> >>>>>> When I started the work on Doxia 2 I has to seperate the plugin >>> >>> between a >>> >>>>>> working release and a milestone release train. I have chosen 4.x-My >>> >>> as a >>> >>>>>> compromise to denote that to our users. Over tme (3+ years) when the >>> >>> all >>> >>>>>> milestones were implemented I have cherry-picked ALL necessary >>> >>> commits to >>> >>>>>> 3.x and released as 3.20+. I have retained master as a future branch >>> >>> for >>> >>>>>> Maven 4 since there are issue with it on 3.x. I haven't touched >>> >>> master >>> >>>>>> since then after the Doxia 2.0 GA. Except a few updates the branch >>>>>> is >>>>>> abandoned. I am a bit suprised why the diff is so huge, it makes no >>>>>> sense. >>>>>> >>>>>> What needs to be done: >>>>>> * Identify all commits on master which aren't on 3.x >>>>>> * Review them >>>>>> * Pick as necessary >>>>>> * Request hard reset on master to 3.x >>>>>> * Perform a release (optional) >>>>>> >>>>>> Maven 4.x compat should be done in a separate branch, not in >>>>>> mastesr. >>>>>> >>>>>> Michael >>>>>> >>>>>> -------------------------------------------------------------------- >>>>>> - >>>>>> To unsubscribe, e-mail: [email protected] >>>>>> For additional commands, e-mail: [email protected] >>>>> >>>>> --------------------------------------------------------------------- >>>>> To unsubscribe, e-mail: [email protected] >>>>> For additional commands, e-mail: [email protected] >>>> >>>> --------------------------------------------------------------------- >>>> To unsubscribe, e-mail: [email protected] >>>> For additional commands, e-mail: [email protected] >>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: [email protected] >>> For additional commands, e-mail: [email protected] > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > <mailto:[email protected]> > For additional commands, e-mail: [email protected] > <mailto:[email protected]>
