[RESULT] [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-09 Thread Stephen Connolly
On 4 January 2017 at 12:16, Stephen Connolly <
stephen.alan.conno...@gmail.com> wrote:

> 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/bce33aa2662a51d18cb00347cf2fb174dc195fb1)
>
> 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/f31241ad6cb6474e559289f1bd7110ea5d5a4fba)
>
> 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/b74f7a1e8837875b4780199f644119f55d22465d), 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%
> 2BnPnMxERdjJq5ChMNP-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
>

This vote has passed:

+1: Stephen C, Anders H, Andreas G., Igor F, Robert S, Benson M, Manfred M,
Michael O, Christian S, Guillaume B, Tibor D, Arnaud H, Stephane N, Hervé
B, Karl H M, Olivier L, Dan T.
0:
-1:

I will now proceed with the agreed actions.

Once the reset has been performed I will send a mail to the announce list.

I request that all changes are verified as passing the tests on
https://builds.apache.org/job/maven-jenkinsfile/ before we merge (if you
create a branch with a Jenkinsfile in the root, then the branch should be
picked up and built within 15 minutes (though the build takes closer to 2h
as it runs the tests on unix and windows with java 7 and 8)

One feature per branch is my recommendation, and let's try and get
agreement before we merge each branch

-Stephen

>
> -Stephen
> --
> Sent from my phone
>


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-09 Thread Mark Struberg
> I like this idea of avoiding force pushing, but I'm not git expert to know 
> exactly if this gives exactly the intended result = start clean and not
> have noise when doing bisects or git blame

It's clean for our own repo but might probably screw up cloned repos as they 
cannot just git-pull anymore.

LieGrue,
strub

> Am 08.01.2017 um 11:41 schrieb Hervé BOUTEMY :
> 
> I like this idea of avoiding force pushing, but I'm not git expert to know 
> exactly if this gives exactly the intended result = start clean and not have 
> noise when doing bisects or git blame
> 
> this technical discussion should probably on a separate email thread, to not 
> pollute the vote thread
> 
> Any git experts to evaluate this implementation strategy?
> 
> Regards,
> 
> Hervé
> 
> Le jeudi 5 janvier 2017, 10:12:10 CET Mark Derricutt a écrit :
>> On 5 Jan 2017, at 1:16, Stephen Connolly wrote:
>> 
>> As this involves a --force push on the `master` branch, we want to get the
>> approval of the committers before continuing.
>> 
>> You could branch at the point you want to reset to, then use an ours/theirs
>> merge strategy which creates a merge commit that ONLY takes one side.
>> Effectively resetting, keeping the fact we did this reversal, and doesn't
>> force everyone to re-clone.
>> 
>> From https://git-scm.com/docs/merge-strategies:
>> 
>> ours: This resolves any number of heads, but the resulting tree of the merge
>> is always that of the current branch head, effectively ignoring all changes
>> from all other branches. It is meant to be used to supersede old
>> development history of side branches. Note that this is different from the
>> -Xours option to the 'recursive' merge strategy.
>> 
>> Would something like this be better than force pushing?
>> 
>> --
>> Mark Derricutt
>> http://www.theoryinpractice.net
>> http://www.chaliceofblood.net
>> http://plus.google.com/+MarkDerricutt
>> http://twitter.com/talios
>> http://facebook.com/mderricutt
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
> For additional commands, e-mail: dev-h...@maven.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org



Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-08 Thread Dan Tran
+1 (Committer)

Special thanks for pulling all these together

-D

On Sun, Jan 8, 2017 at 1:05 PM, Olivier Lamy  wrote:

> +1
>
> On Sun, 8 Jan 2017 at 6:40 pm, Karl Heinz Marbaise 
> wrote:
>
> > Hi,
> >
> >
> >
> > +1 (PMC + Committer)
> >
> >
> >
> > Kind regards
> >
> > Karl Heinz Marbaise
> >
> >
> >
> > On 08/01/17 05:48, Tibor Digana wrote:
> >
> > > +1
> >
> > >
> >
> > > On Wed, Jan 4, 2017 at 1:16 PM, Stephen Connolly <
> >
> > > stephen.alan.conno...@gmail.com> wrote:
> >
> > >
> >
> > >> 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/bce33aa2662a51d18cb00347cf2fb1
> >
> > >> 74dc195fb1
> >
> > >> )
> >
> > >>
> >
> > >> 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/
> >
> > >> f31241ad6cb6474e559289f1bd7110ea5d5a4fba
> >
> > >> )
> >
> > >>
> >
> > >> 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/
> >
> > >> b74f7a1e8837875b4780199f644119f55d22465d),
> >
> > >> 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%
> >
> > >> 2BnPnMxERdjJq5ChMNP-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
> >
> > >> --
> >
> > >> Sent from my phone
> >
> > >>
> >
> >
> >
> > -
> >
> > To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
> >
> > For additional commands, e-mail: dev-h...@maven.apache.org
> >
> >
> >
> >
>


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-08 Thread Olivier Lamy
+1

On Sun, 8 Jan 2017 at 6:40 pm, Karl Heinz Marbaise 
wrote:

> Hi,
>
>
>
> +1 (PMC + Committer)
>
>
>
> Kind regards
>
> Karl Heinz Marbaise
>
>
>
> On 08/01/17 05:48, Tibor Digana wrote:
>
> > +1
>
> >
>
> > On Wed, Jan 4, 2017 at 1:16 PM, Stephen Connolly <
>
> > stephen.alan.conno...@gmail.com> wrote:
>
> >
>
> >> 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/bce33aa2662a51d18cb00347cf2fb1
>
> >> 74dc195fb1
>
> >> )
>
> >>
>
> >> 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/
>
> >> f31241ad6cb6474e559289f1bd7110ea5d5a4fba
>
> >> )
>
> >>
>
> >> 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/
>
> >> b74f7a1e8837875b4780199f644119f55d22465d),
>
> >> 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%
>
> >> 2BnPnMxERdjJq5ChMNP-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
>
> >> --
>
> >> Sent from my phone
>
> >>
>
>
>
> -
>
> To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
>
> For additional commands, e-mail: dev-h...@maven.apache.org
>
>
>
>


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-08 Thread Karl Heinz Marbaise

Hi,

+1 (PMC + Committer)

Kind regards
Karl Heinz Marbaise

On 08/01/17 05:48, Tibor Digana wrote:

+1

On Wed, Jan 4, 2017 at 1:16 PM, Stephen Connolly <
stephen.alan.conno...@gmail.com> wrote:


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/bce33aa2662a51d18cb00347cf2fb1
74dc195fb1
)

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/
f31241ad6cb6474e559289f1bd7110ea5d5a4fba
)

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/
b74f7a1e8837875b4780199f644119f55d22465d),
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%
2BnPnMxERdjJq5ChMNP-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
--
Sent from my phone



-
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org



Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-08 Thread Stephen Connolly
If we were *throwing away* the other commits then that would work.

But as I understand it, ours would mean that the commits are part of the
history, so merging would not apply them... tooling to check if they need
to be cherry picked would show as already merged... I'd need to check if
cherry pick would work without additional options...

And on top of that the history for mortal users would show the fixes "as
present in the history"

It would be great if Kristian R. Could confirm my understanding.

-Stephen

On Sun 8 Jan 2017 at 10:41, Hervé BOUTEMY  wrote:

> I like this idea of avoiding force pushing, but I'm not git expert to know
>
> exactly if this gives exactly the intended result = start clean and not
> have
>
> noise when doing bisects or git blame
>
>
>
> this technical discussion should probably on a separate email thread, to
> not
>
> pollute the vote thread
>
>
>
> Any git experts to evaluate this implementation strategy?
>
>
>
> Regards,
>
>
>
> Hervé
>
>
>
> Le jeudi 5 janvier 2017, 10:12:10 CET Mark Derricutt a écrit :
>
> > On 5 Jan 2017, at 1:16, Stephen Connolly wrote:
>
> >
>
> > As this involves a --force push on the `master` branch, we want to get
> the
>
> > approval of the committers before continuing.
>
> >
>
> > You could branch at the point you want to reset to, then use an
> ours/theirs
>
> > merge strategy which creates a merge commit that ONLY takes one side.
>
> > Effectively resetting, keeping the fact we did this reversal, and doesn't
>
> > force everyone to re-clone.
>
> >
>
> > From https://git-scm.com/docs/merge-strategies:
>
> >
>
> > ours: This resolves any number of heads, but the resulting tree of the
> merge
>
> > is always that of the current branch head, effectively ignoring all
> changes
>
> > from all other branches. It is meant to be used to supersede old
>
> > development history of side branches. Note that this is different from
> the
>
> > -Xours option to the 'recursive' merge strategy.
>
> >
>
> > Would something like this be better than force pushing?
>
> >
>
> > --
>
> > Mark Derricutt
>
> > http://www.theoryinpractice.net
>
> > http://www.chaliceofblood.net
>
> > http://plus.google.com/+MarkDerricutt
>
> > http://twitter.com/talios
>
> > http://facebook.com/mderricutt
>
>
>
>
>
>
>
> -
>
> To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
>
> For additional commands, e-mail: dev-h...@maven.apache.org
>
>
>
> --
Sent from my phone


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-08 Thread Hervé BOUTEMY
+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



Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-08 Thread Hervé BOUTEMY
I like this idea of avoiding force pushing, but I'm not git expert to know 
exactly if this gives exactly the intended result = start clean and not have 
noise when doing bisects or git blame

this technical discussion should probably on a separate email thread, to not 
pollute the vote thread

Any git experts to evaluate this implementation strategy?

Regards,

Hervé

Le jeudi 5 janvier 2017, 10:12:10 CET Mark Derricutt a écrit :
> On 5 Jan 2017, at 1:16, Stephen Connolly wrote:
> 
> As this involves a --force push on the `master` branch, we want to get the
> approval of the committers before continuing.
> 
> You could branch at the point you want to reset to, then use an ours/theirs
> merge strategy which creates a merge commit that ONLY takes one side.
> Effectively resetting, keeping the fact we did this reversal, and doesn't
> force everyone to re-clone.
> 
> From https://git-scm.com/docs/merge-strategies:
> 
> ours: This resolves any number of heads, but the resulting tree of the merge
> is always that of the current branch head, effectively ignoring all changes
> from all other branches. It is meant to be used to supersede old
> development history of side branches. Note that this is different from the
> -Xours option to the 'recursive' merge strategy.
> 
> Would something like this be better than force pushing?
> 
> --
> Mark Derricutt
> http://www.theoryinpractice.net
> http://www.chaliceofblood.net
> http://plus.google.com/+MarkDerricutt
> http://twitter.com/talios
> http://facebook.com/mderricutt



-
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org



Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-08 Thread Stephane Nicoll
+1


On Wed, 4 Jan 2017 at 17:39, Manfred Moser  wrote:

> +1 (committer)
>
>
>
> Stephen Connolly wrote on 2017-01-04 04:16:
>
>
>
> > 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/bce33aa2662a51d18cb00347cf2fb174dc195fb1
>
> > )
>
> >
>
> > 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/f31241ad6cb6474e559289f1bd7110ea5d5a4fba
>
> > )
>
> >
>
> > 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/b74f7a1e8837875b4780199f644119f55d22465d
> ),
>
> > 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%2BnPnMxERdjJq5ChMNP-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
>
> > --
>
> > Sent from my phone
>
> >
>
>
>
>
>
> -
>
> To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
>
> For additional commands, e-mail: dev-h...@maven.apache.org
>
>
>
> --
Sent from my phone


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-08 Thread Arnaud Héritier
+1

Le dim. 8 janv. 2017 à 05:48, Tibor Digana  a
écrit :

> +1
>
>
>
> On Wed, Jan 4, 2017 at 1:16 PM, Stephen Connolly <
>
> stephen.alan.conno...@gmail.com> wrote:
>
>
>
> > 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/bce33aa2662a51d18cb00347cf2fb1
>
> > 74dc195fb1
>
> > )
>
> >
>
> > 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/
>
> > f31241ad6cb6474e559289f1bd7110ea5d5a4fba
>
> > )
>
> >
>
> > 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/
>
> > b74f7a1e8837875b4780199f644119f55d22465d),
>
> > 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%
>
> > 2BnPnMxERdjJq5ChMNP-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
>
> > --
>
> > Sent from my phone
>
> >
>
>
>
>
>
>
>
> --
>
> Cheers
>
> Tibor
>
>


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-07 Thread Tibor Digana
+1

On Wed, Jan 4, 2017 at 1:16 PM, Stephen Connolly <
stephen.alan.conno...@gmail.com> wrote:

> 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/bce33aa2662a51d18cb00347cf2fb1
> 74dc195fb1
> )
>
> 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/
> f31241ad6cb6474e559289f1bd7110ea5d5a4fba
> )
>
> 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/
> b74f7a1e8837875b4780199f644119f55d22465d),
> 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%
> 2BnPnMxERdjJq5ChMNP-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
> --
> Sent from my phone
>



-- 
Cheers
Tibor


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-07 Thread Stephen Connolly
I'll give the vote until monday just in case anyone missed it

On 4 January 2017 at 12:16, Stephen Connolly <
stephen.alan.conno...@gmail.com> wrote:

> 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/bce33aa2662a51d18cb00347cf2fb174dc195fb1)
>
> 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/f31241ad6cb6474e559289f1bd7110ea5d5a4fba)
>
> 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/b74f7a1e8837875b4780199f644119f55d22465d), 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%
> 2BnPnMxERdjJq5ChMNP-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
> --
> Sent from my phone
>


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Guillaume Boué

+1 (committer)


Le 04/01/2017 à 13:16, 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/bce33aa2662a51d18cb00347cf2fb174dc195fb1
)

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/f31241ad6cb6474e559289f1bd7110ea5d5a4fba
)

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/b74f7a1e8837875b4780199f644119f55d22465d),
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%2BnPnMxERdjJq5ChMNP-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



---
L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel 
antivirus Avast.
https://www.avast.com/antivirus


-
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org



Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Christian Schulte
+1 (committer)

Am 01/04/17 um 13:16 schrieb Stephen Connolly:
> 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/bce33aa2662a51d18cb00347cf2fb174dc195fb1
> )
> 
> 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/f31241ad6cb6474e559289f1bd7110ea5d5a4fba
> )
> 
> 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/b74f7a1e8837875b4780199f644119f55d22465d),
> 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%2BnPnMxERdjJq5ChMNP-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



[DISCUSS] [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Stephen Connolly
This would be better on the discuss thread, but here is my answer anyway:

Well we want to bring most of that history back in for 3.5.1+ so, no that
wouldn't work AIUI.

Part of the issue is the to and fro with things like the bump of
modelVersion to 4.1.0 and then the revert, etc.

Plus if the commits are in history how can mortal git users determine what
is included.

On Wed 4 Jan 2017 at 21:12, Mark Derricutt  wrote:

>
>
> On 5 Jan 2017, at 1:16, Stephen Connolly wrote:
>
>
>
>
>
>
> As this involves a --force push on the `master` branch, we want to get the
>
>
> approval of the committers before continuing.
>
>
>
>
>
>
>
>
>
>
> You *could* branch at the point you want to reset to, then use an
> ours/theirs merge strategy which creates a merge commit that ONLY takes one
> side. Effectively resetting, keeping the fact we did this reversal, and
> doesn't force everyone to re-clone.
>
>
>
>
> From https://git-scm.com/docs/merge-strategies:
>
>
>
>
> *ours:* This resolves any number of heads, but the resulting tree of the
> merge is always that of the current branch head, effectively ignoring all
> changes from all other branches. It is meant to be used to supersede old
> development history of side branches. Note that this is different from the
> -Xours option to the 'recursive' merge strategy.
>
>
>
>
> Would something like this be better than force pushing?
>
>
>
>
> --
>
>
> Mark Derricutt
>
>
> http://www.theoryinpractice.net
>
>
> http://www.chaliceofblood.net
>
>
> http://plus.google.com/+MarkDerricutt
>
>
> http://twitter.com/talios
>
>
> http://facebook.com/mderricutt
>
>
> --
Sent from my phone


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Mark Derricutt
On 5 Jan 2017, at 1:16, Stephen Connolly wrote:

> As this involves a --force push on the `master` branch, we want to get the
> approval of the committers before continuing.

You _could_ branch at the point you want to reset to, then use an ours/theirs 
merge strategy which creates a merge commit that ONLY takes one side.  
Effectively resetting, keeping the fact we did this reversal, and doesn't force 
everyone to re-clone.

From https://git-scm.com/docs/merge-strategies:

**ours:** This resolves any number of heads, but the resulting tree of the 
merge is always that of the current branch head, effectively ignoring all 
changes from all other branches. It is meant to be used to supersede old 
development history of side branches. Note that this is different from the 
-Xours option to the 'recursive' merge strategy.

Would something like this be better than force pushing?

-- 
Mark Derricutt
http://www.theoryinpractice.net
http://www.chaliceofblood.net
http://plus.google.com/+MarkDerricutt
http://twitter.com/talios
http://facebook.com/mderricutt


signature.asc
Description: OpenPGP digital signature


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Michael Osipov

+1 (PMC & committer)

Am 2017-01-04 um 13:16 schrieb Stephen Connolly:

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/bce33aa2662a51d18cb00347cf2fb174dc195fb1
)

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/f31241ad6cb6474e559289f1bd7110ea5d5a4fba
)

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/b74f7a1e8837875b4780199f644119f55d22465d),
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%2BnPnMxERdjJq5ChMNP-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



Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Manfred Moser
+1 (committer)

Stephen Connolly wrote on 2017-01-04 04:16:

> 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/bce33aa2662a51d18cb00347cf2fb174dc195fb1
> )
> 
> 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/f31241ad6cb6474e559289f1bd7110ea5d5a4fba
> )
> 
> 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/b74f7a1e8837875b4780199f644119f55d22465d),
> 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%2BnPnMxERdjJq5ChMNP-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
> -- 
> Sent from my phone
> 


-
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org



Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Benson Margulies
+1

On Jan 4, 2017 10:03 AM, "Robert Scholte"  wrote:

> +1
>
> On Wed, 04 Jan 2017 13:16:11 +0100, Stephen Connolly <
> stephen.alan.conno...@gmail.com> wrote:
>
> 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/bce33aa2662a51d18cb00
>> 347cf2fb174dc195fb1
>> )
>>
>> 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/f
>> 31241ad6cb6474e559289f1bd7110ea5d5a4fba
>> )
>>
>> 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/b74f7a1e8837
>> 875b4780199f644119f55d22465d),
>> 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.m
>> box/%3CCA%2BnPnMxERdjJq5ChMNP-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
>
>


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Robert Scholte

+1

On Wed, 04 Jan 2017 13:16:11 +0100, Stephen Connolly  
 wrote:



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/bce33aa2662a51d18cb00347cf2fb174dc195fb1
)

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/f31241ad6cb6474e559289f1bd7110ea5d5a4fba
)

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/b74f7a1e8837875b4780199f644119f55d22465d),
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%2BnPnMxERdjJq5ChMNP-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



Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Igor Fedorenko
+1

-- 
Regards,
Igor

On Wed, Jan 4, 2017, at 08:31 AM, Andreas Gudian wrote:
> +1
> 
> 
> Anders Hammar  schrieb am Mi. 4. Jan. 2017 um 13:22:
> 
> > +1
> >
> >
> >
> > /Anders
> >
> >
> >
> > On Wed, Jan 4, 2017 at 1:16 PM, Stephen Connolly <
> >
> > stephen.alan.conno...@gmail.com> wrote:
> >
> >
> >
> > > 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/bce33aa2662a51d18cb00347cf2fb1
> >
> > > 74dc195fb1
> >
> > > )
> >
> > >
> >
> > > 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/
> >
> > > f31241ad6cb6474e559289f1bd7110ea5d5a4fba
> >
> > > )
> >
> > >
> >
> > > 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/
> >
> > > b74f7a1e8837875b4780199f644119f55d22465d),
> >
> > > 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%
> >
> > > 2BnPnMxERdjJq5ChMNP-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
> >
> > > --
> >
> > > Sent from my phone
> >
> > >
> >
> >

-
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org



Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Andreas Gudian
+1


Anders Hammar  schrieb am Mi. 4. Jan. 2017 um 13:22:

> +1
>
>
>
> /Anders
>
>
>
> On Wed, Jan 4, 2017 at 1:16 PM, Stephen Connolly <
>
> stephen.alan.conno...@gmail.com> wrote:
>
>
>
> > 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/bce33aa2662a51d18cb00347cf2fb1
>
> > 74dc195fb1
>
> > )
>
> >
>
> > 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/
>
> > f31241ad6cb6474e559289f1bd7110ea5d5a4fba
>
> > )
>
> >
>
> > 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/
>
> > b74f7a1e8837875b4780199f644119f55d22465d),
>
> > 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%
>
> > 2BnPnMxERdjJq5ChMNP-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
>
> > --
>
> > Sent from my phone
>
> >
>
>


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Anders Hammar
+1

/Anders

On Wed, Jan 4, 2017 at 1:16 PM, Stephen Connolly <
stephen.alan.conno...@gmail.com> wrote:

> 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/bce33aa2662a51d18cb00347cf2fb1
> 74dc195fb1
> )
>
> 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/
> f31241ad6cb6474e559289f1bd7110ea5d5a4fba
> )
>
> 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/
> b74f7a1e8837875b4780199f644119f55d22465d),
> 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%
> 2BnPnMxERdjJq5ChMNP-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
> --
> Sent from my phone
>


Re: [VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Stephen Connolly
+1 (PMC & committer)

On Wed 4 Jan 2017 at 12:16, Stephen Connolly <
stephen.alan.conno...@gmail.com> wrote:

> 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/bce33aa2662a51d18cb00347cf2fb174dc195fb1
> )
>
> 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/f31241ad6cb6474e559289f1bd7110ea5d5a4fba
> )
>
> 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/b74f7a1e8837875b4780199f644119f55d22465d),
> 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%2BnPnMxERdjJq5ChMNP-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
> --
> Sent from my phone
>
-- 
Sent from my phone


[VOTE] Reset Maven Core, Integration Tests and Resolver repository master branches

2017-01-04 Thread Stephen Connolly
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/bce33aa2662a51d18cb00347cf2fb174dc195fb1
)

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/f31241ad6cb6474e559289f1bd7110ea5d5a4fba
)

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/b74f7a1e8837875b4780199f644119f55d22465d),
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%2BnPnMxERdjJq5ChMNP-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
-- 
Sent from my phone