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]
