+1 (committer & PMC) notice that the merge ours implementation strategy may be a better implementation than force push with branches renaming
If some git expert can dig into implementaion strategies, please, that would be great what is important to me is the vote to reset and to define the new starting point implementation strategy detail can be changed without issue Regards, Hervé Le mercredi 4 janvier 2017, 12:16:11 CET Stephen Connolly a écrit : > Hi, > > We have collectively managed to mess up our ability to follow the original > release plan for 3.4.0 which was originally supposed to consist of an > effective no-op change of Eclipse's Aether for the code after migration to > Apache's Maven Resolver plus some other orthogonal changes around logging > colourization and launcher script bug fixes. > > Given that some developer private builds of the current master branch have > been shared with as 3.4.0-SNAPSHOT. More critically, JIRA issues have been > closed with a fixed version of 3.4.0. > > For us to release a 3.4.0 with those fixes reverted, could cause confusion > with our user community. > > Additionally the informal practice of keeping existing integration tests as > RTC has not been followed, leading to some people to question whether the > integration tests remain valid. > > For all the above reasons it is proposed to do *all* the following as an > whole: > > 1. In git://git.apache.org/maven.git we will rename the current master > branch to `pre-reset-master` and recreate `master` > as bce33aa2662a51d18cb00347cf2fb174dc195fb1 ( > https://github.com/apache/maven/commit/bce33aa2662a51d18cb00347cf2fb174dc195 > fb1 ) > > 2. In git://git.apache.org/maven-integration-testing.git we will rename the > current master branch to `pre-reset-master` and recreate `master` > as f31241ad6cb6474e559289f1bd7110ea5d5a4fba ( > https://github.com/apache/maven-integration-testing/commit/f31241ad6cb6474e5 > 59289f1bd7110ea5d5a4fba ) > > 3. In git://git.apache.org/maven-resolver.git we will rename the current > master branch to `pre-reset-master` and recreate `master` > as b74f7a1e8837875b4780199f644119f55d22465d ( > https://github.com/apache/maven-resolver/commit/b74f7a1e8837875b4780199f6441 > 19f55d22465d), i.e. the 1.0.x branch > > We will then proceed to have (ideally) the original committers cherry-pick > (and tidy up an squash... if the original committers are not able to assist > then squashing may not be practicable) those changes that have been agreed > for 3.5.0 as summarized on the > https://cwiki.apache.org/confluence/display/MAVEN/Roadmap+2017 wiki page > (authorative source of the decisions summarized in the wiki page is the > mail thread: > https://mail-archives.apache.org/mod_mbox/maven-dev/201612.mbox/%3CCA%2BnPnM > xERdjJq5ChMNP-HN_AvZOs8sm7Ud5aVcEza0BPnm5ZOw%40mail.gmail.com%3E ). > > As this involves a --force push on the `master` branch, we want to get the > approval of the committers before continuing. > > The vote will be open for at least 72 hours. > > The vote will be decided by a simple majority of valid votes cast. There is > no veto. > > The vote is open to all committers. > > In addition, for the vote to be valid, there must be at least 3x+1 votes > from PMC members > > [ ] +1: Yes > [ ] 0: > [ ] -1: No > > -Stephen --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
