You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2013/07/27 03:45:43 UTC
[1/2] git commit: o update to sisu 0.0.0.M5
Updated Branches:
refs/heads/master 5cfcb2f5b -> e084ff3b8
o update to sisu 0.0.0.M5
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/06095041
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/06095041
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/06095041
Branch: refs/heads/master
Commit: 060950413361f788484e167a6e9b7c611d50de86
Parents: 5cfcb2f
Author: Jason van Zyl <ja...@tesla.io>
Authored: Fri Jul 26 20:59:54 2013 -0400
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Fri Jul 26 20:59:54 2013 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/06095041/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3a54c85..4a4535a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
<!-- last Java5 release of Guava -->
<guavaVersion>11.0.2</guavaVersion>
<guiceVersion>3.1.3</guiceVersion>
- <sisuInjectVersion>0.0.0.M2a</sisuInjectVersion>
+ <sisuInjectVersion>0.0.0.M5</sisuInjectVersion>
<wagonVersion>2.4</wagonVersion>
<securityDispatcherVersion>1.3</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion>
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Barrie Treloar <ba...@gmail.com>.
On 28 July 2013 00:24, Kristian Rosenvold <kr...@gmail.com> wrote:
> It's ok if not pushed, but I think it should be made a lot clearer in the guide.
Do we have a "how to" guide for using Git?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Kristian Rosenvold <kr...@gmail.com>.
It's ok if not pushed, but I think it should be made a lot clearer in the guide.
We could install commit hooks into the repo that enforce specific
patterns on commits,
like [\d].* *or* starts with an "o ". But then again the "o " seems to
be under attack too :)
Kristian
2013/7/27 Hervé BOUTEMY <he...@free.fr>:
> so http://maven.apache.org/developers/conventions/git.html#Edit_Commit_Message
> is wrong? or ok only if not pushed?
>
> Le samedi 27 juillet 2013 15:36:03 Arnaud Héritier a écrit :
>> At Apache it is forbidden to rewrite the history of the master branch.
>> Which isn't so bad.
>>
>> ---------
>> Arnaud
>>
>> Le 27 juil. 2013 à 15:19, Jeff Jensen
>>
>> <je...@upstairstechnology.com> a écrit :
>> > That message indicates you need to git pull first. Even though you
>> > may already have done so and no one else has pushed since, this usually
>> > happens when modifying a commit that has been pushed/shared.
>> >
>> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <he...@free.fr>
> wrote:
>> >> the last 2 commits are to be amended: lst one for MNG-5499, previous one
>> >> for MNG-5495
>> >>
>> >> I tried git commit --amend -m "[MNG-5499]..." for the last one, but when
>> >> I git push, I get
>> >>
>> >> To https://git-wip-us.apache.org/repos/asf/maven.git
>> >> ! [rejected] master -> master (non-fast-forward)
>> >> error: failed to push some refs to
>> >> 'https://git-wip-us.apache.org/repos/asf/maven.git' hint: Updates were
>> >> rejected because the tip of your current branch is behind hint: its
>> >> remote counterpart. Merge the remote changes (e.g. 'git pull') hint:
>> >> before pushing again.
>> >> hint: See the 'Note about fast-forwards' in 'git push --help' for
>> >> details.
>> >>
>> >>
>> >> Did I do something wrong? Or git repo at ASF is configured to avoid such
>> >> things?
>> >>
>> >> Regards,
>> >>
>> >> Hervé
>> >>
>> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
>> >>> Of course, if anyone is working down stream of this, they will hate you,
>> >>> and it should be left as is.
>> >>>
>> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com>
> wrote:
>> >>>> Yes, easily, if it's the HEAD just do a --amend on it and update it
>> >>>> yourself, Jason's name will be retained. If it's not HEAD then do
>> >>>> rebase
>> >>>> -i
>> >>>> <previous hash to the one of interest> then mark the one of interest
>> >>>> for
>> >>>> comment edit and proceed.
>> >>>>
>> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
>> >>
>> >> <he...@free.fr>wrote:
>> >>>>> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
>> >>>>>
>> >>>>> I'm not a git blackbelt: can the comment be updated to add the
>> >>>>> classical
>> >>>>> [MNG-5499]?
>> >>>>> (and next time not be forgotten from initial comment :) )
>> >>>>>
>> >>>>> I'm adding a reference to the commit in the Jira issue
>> >>>>>
>> >>>>> Regards,
>> >>>>>
>> >>>>> Hervé
>> >>>>>
>> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
>> >>>>>> o change the scope of org.eclipse.sisu to test in the
>> >>>>>
>> >>>>> maven-aether-provider
>> >>>>>
>> >>>>>> to prevent it from leaking out to clients.
>> >>>>>>
>> >>>>>>
>> >>>>>> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
>> >>>>>> Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
>> >>>>>> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
>> >>>>>> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
>> >>>>>>
>> >>>>>> Branch: refs/heads/master
>> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
>> >>>>>> Parents: 0609504
>> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
>> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
>> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
>> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
>> >>>>>>
>> >>>>>> ---------------------------------------------------------------------
>> >>>>>> -
>> >>>>>>
>> >>>>>> maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
>> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
>> >>>>>>
>> >>>>>> ---------------------------------------------------------------------
>> >>>>>> -
>> >>>>>
>> >>>>> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aethe
>> >>>>> r-p
>> >>>>> rov>>
>> >>>>>
>> >>>>>> ider/pom.xml
>> >>>>>> ---------------------------------------------------------------------
>> >>>>>> -
>> >>>>>
>> >>>>> diff
>> >>>>>
>> >>>>>> --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
>> >>>>>
>> >>>>> index
>> >>>>>
>> >>>>>> 910fab6..9235f1c 100644
>> >>>>>> --- a/maven-aether-provider/pom.xml
>> >>>>>> +++ b/maven-aether-provider/pom.xml
>> >>>>>> @@ -63,20 +63,6 @@ under the License.
>> >>>>>>
>> >>>>>> <artifactId>aether-impl</artifactId>
>> >>>>>>
>> >>>>>> </dependency>
>> >>>>>> <dependency>
>> >>>>>>
>> >>>>>> - <groupId>org.eclipse.aether</groupId>
>> >>>>>> - <artifactId>aether-connector-wagon</artifactId>
>> >>>>>> - <scope>test</scope>
>> >>>>>> - </dependency>
>> >>>>>> - <dependency>
>> >>>>>> - <groupId>org.apache.maven.wagon</groupId>
>> >>>>>> - <artifactId>wagon-file</artifactId>
>> >>>>>> - <scope>test</scope>
>> >>>>>> - </dependency>
>> >>>>>> - <dependency>
>> >>>>>> - <groupId>org.eclipse.sisu</groupId>
>> >>>>>> - <artifactId>org.eclipse.sisu.plexus</artifactId>
>> >>>>>> - </dependency>
>> >>>>>> - <dependency>
>> >>>>>>
>> >>>>>> <groupId>org.codehaus.plexus</groupId>
>> >>>>>> <artifactId>plexus-component-annotations</artifactId>
>> >>>>>>
>> >>>>>> </dependency>
>> >>>>>>
>> >>>>>> @@ -96,6 +82,22 @@ under the License.
>> >>>>>>
>> >>>>>> </exclusion>
>> >>>>>>
>> >>>>>> </exclusions>
>> >>>>>>
>> >>>>>> </dependency>
>> >>>>>>
>> >>>>>> + <!-- Testing -->
>> >>>>>> + <dependency>
>> >>>>>> + <groupId>org.eclipse.aether</groupId>
>> >>>>>> + <artifactId>aether-connector-wagon</artifactId>
>> >>>>>> + <scope>test</scope>
>> >>>>>> + </dependency>
>> >>>>>> + <dependency>
>> >>>>>> + <groupId>org.apache.maven.wagon</groupId>
>> >>>>>> + <artifactId>wagon-file</artifactId>
>> >>>>>> + <scope>test</scope>
>> >>>>>> + </dependency>
>> >>>>>> + <dependency>
>> >>>>>> + <groupId>org.eclipse.sisu</groupId>
>> >>>>>> + <artifactId>org.eclipse.sisu.plexus</artifactId>
>> >>>>>> + <scope>test</scope>
>> >>>>>> + </dependency>
>> >>>>>>
>> >>>>>> </dependencies>
>> >>>>>>
>> >>>>>> <build>
>> >>>>>
>> >>>>> ---------------------------------------------------------------------
>> >>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
>> >>
>> >> ---------------------------------------------------------------------
>> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> >> For additional commands, e-mail: dev-help@maven.apache.org
>> >
>> > ---------------------------------------------------------------------
>> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> > For additional commands, e-mail: dev-help@maven.apache.org
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Hervé BOUTEMY <he...@free.fr>.
so http://maven.apache.org/developers/conventions/git.html#Edit_Commit_Message
is wrong? or ok only if not pushed?
Le samedi 27 juillet 2013 15:36:03 Arnaud Héritier a écrit :
> At Apache it is forbidden to rewrite the history of the master branch.
> Which isn't so bad.
>
> ---------
> Arnaud
>
> Le 27 juil. 2013 à 15:19, Jeff Jensen
>
> <je...@upstairstechnology.com> a écrit :
> > That message indicates you need to git pull first. Even though you
> > may already have done so and no one else has pushed since, this usually
> > happens when modifying a commit that has been pushed/shared.
> >
> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <he...@free.fr>
wrote:
> >> the last 2 commits are to be amended: lst one for MNG-5499, previous one
> >> for MNG-5495
> >>
> >> I tried git commit --amend -m "[MNG-5499]..." for the last one, but when
> >> I git push, I get
> >>
> >> To https://git-wip-us.apache.org/repos/asf/maven.git
> >> ! [rejected] master -> master (non-fast-forward)
> >> error: failed to push some refs to
> >> 'https://git-wip-us.apache.org/repos/asf/maven.git' hint: Updates were
> >> rejected because the tip of your current branch is behind hint: its
> >> remote counterpart. Merge the remote changes (e.g. 'git pull') hint:
> >> before pushing again.
> >> hint: See the 'Note about fast-forwards' in 'git push --help' for
> >> details.
> >>
> >>
> >> Did I do something wrong? Or git repo at ASF is configured to avoid such
> >> things?
> >>
> >> Regards,
> >>
> >> Hervé
> >>
> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
> >>> Of course, if anyone is working down stream of this, they will hate you,
> >>> and it should be left as is.
> >>>
> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com>
wrote:
> >>>> Yes, easily, if it's the HEAD just do a --amend on it and update it
> >>>> yourself, Jason's name will be retained. If it's not HEAD then do
> >>>> rebase
> >>>> -i
> >>>> <previous hash to the one of interest> then mark the one of interest
> >>>> for
> >>>> comment edit and proceed.
> >>>>
> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
> >>
> >> <he...@free.fr>wrote:
> >>>>> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
> >>>>>
> >>>>> I'm not a git blackbelt: can the comment be updated to add the
> >>>>> classical
> >>>>> [MNG-5499]?
> >>>>> (and next time not be forgotten from initial comment :) )
> >>>>>
> >>>>> I'm adding a reference to the commit in the Jira issue
> >>>>>
> >>>>> Regards,
> >>>>>
> >>>>> Hervé
> >>>>>
> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
> >>>>>> o change the scope of org.eclipse.sisu to test in the
> >>>>>
> >>>>> maven-aether-provider
> >>>>>
> >>>>>> to prevent it from leaking out to clients.
> >>>>>>
> >>>>>>
> >>>>>> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
> >>>>>> Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
> >>>>>> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
> >>>>>> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
> >>>>>>
> >>>>>> Branch: refs/heads/master
> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
> >>>>>> Parents: 0609504
> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
> >>>>>>
> >>>>>> ---------------------------------------------------------------------
> >>>>>> -
> >>>>>>
> >>>>>> maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
> >>>>>>
> >>>>>> ---------------------------------------------------------------------
> >>>>>> -
> >>>>>
> >>>>> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aethe
> >>>>> r-p
> >>>>> rov>>
> >>>>>
> >>>>>> ider/pom.xml
> >>>>>> ---------------------------------------------------------------------
> >>>>>> -
> >>>>>
> >>>>> diff
> >>>>>
> >>>>>> --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
> >>>>>
> >>>>> index
> >>>>>
> >>>>>> 910fab6..9235f1c 100644
> >>>>>> --- a/maven-aether-provider/pom.xml
> >>>>>> +++ b/maven-aether-provider/pom.xml
> >>>>>> @@ -63,20 +63,6 @@ under the License.
> >>>>>>
> >>>>>> <artifactId>aether-impl</artifactId>
> >>>>>>
> >>>>>> </dependency>
> >>>>>> <dependency>
> >>>>>>
> >>>>>> - <groupId>org.eclipse.aether</groupId>
> >>>>>> - <artifactId>aether-connector-wagon</artifactId>
> >>>>>> - <scope>test</scope>
> >>>>>> - </dependency>
> >>>>>> - <dependency>
> >>>>>> - <groupId>org.apache.maven.wagon</groupId>
> >>>>>> - <artifactId>wagon-file</artifactId>
> >>>>>> - <scope>test</scope>
> >>>>>> - </dependency>
> >>>>>> - <dependency>
> >>>>>> - <groupId>org.eclipse.sisu</groupId>
> >>>>>> - <artifactId>org.eclipse.sisu.plexus</artifactId>
> >>>>>> - </dependency>
> >>>>>> - <dependency>
> >>>>>>
> >>>>>> <groupId>org.codehaus.plexus</groupId>
> >>>>>> <artifactId>plexus-component-annotations</artifactId>
> >>>>>>
> >>>>>> </dependency>
> >>>>>>
> >>>>>> @@ -96,6 +82,22 @@ under the License.
> >>>>>>
> >>>>>> </exclusion>
> >>>>>>
> >>>>>> </exclusions>
> >>>>>>
> >>>>>> </dependency>
> >>>>>>
> >>>>>> + <!-- Testing -->
> >>>>>> + <dependency>
> >>>>>> + <groupId>org.eclipse.aether</groupId>
> >>>>>> + <artifactId>aether-connector-wagon</artifactId>
> >>>>>> + <scope>test</scope>
> >>>>>> + </dependency>
> >>>>>> + <dependency>
> >>>>>> + <groupId>org.apache.maven.wagon</groupId>
> >>>>>> + <artifactId>wagon-file</artifactId>
> >>>>>> + <scope>test</scope>
> >>>>>> + </dependency>
> >>>>>> + <dependency>
> >>>>>> + <groupId>org.eclipse.sisu</groupId>
> >>>>>> + <artifactId>org.eclipse.sisu.plexus</artifactId>
> >>>>>> + <scope>test</scope>
> >>>>>> + </dependency>
> >>>>>>
> >>>>>> </dependencies>
> >>>>>>
> >>>>>> <build>
> >>>>>
> >>>>> ---------------------------------------------------------------------
> >>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> >> For additional commands, e-mail: dev-help@maven.apache.org
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Vincent Latombe <vi...@gmail.com>.
When you rewrite history of something that has been already pushed, you
need to push and add --force to rewrite history on the remote repo.
Of course, as Fred mentioned, this isn't recommended for branches that have
been pulled by other people, because it will mess their next pull.
Vincent
2013/7/27 Jeff Jensen <je...@upstairstechnology.com>
> That message indicates you need to git pull first. Even though you
> may already have done so and no one else has pushed since, this usually
> happens when modifying a commit that has been pushed/shared.
>
> On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <he...@free.fr>
> wrote:
> > the last 2 commits are to be amended: lst one for MNG-5499, previous one
> for
> > MNG-5495
> >
> > I tried git commit --amend -m "[MNG-5499]..." for the last one, but when
> I git
> > push, I get
> >
> > To https://git-wip-us.apache.org/repos/asf/maven.git
> > ! [rejected] master -> master (non-fast-forward)
> > error: failed to push some refs to '
> https://git-wip-us.apache.org/repos/asf/maven.git'
> > hint: Updates were rejected because the tip of your current branch is
> behind
> > hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
> > hint: before pushing again.
> > hint: See the 'Note about fast-forwards' in 'git push --help' for
> details.
> >
> >
> > Did I do something wrong? Or git repo at ASF is configured to avoid such
> > things?
> >
> > Regards,
> >
> > Hervé
> >
> > Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
> >> Of course, if anyone is working down stream of this, they will hate you,
> >> and it should be left as is.
> >>
> >> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com>
> wrote:
> >> > Yes, easily, if it's the HEAD just do a --amend on it and update it
> >> > yourself, Jason's name will be retained. If it's not HEAD then do
> rebase
> >> > -i
> >> > <previous hash to the one of interest> then mark the one of interest
> for
> >> > comment edit and proceed.
> >> >
> >> > On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
> > <he...@free.fr>wrote:
> >> >> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
> >> >>
> >> >> I'm not a git blackbelt: can the comment be updated to add the
> classical
> >> >> [MNG-5499]?
> >> >> (and next time not be forgotten from initial comment :) )
> >> >>
> >> >> I'm adding a reference to the commit in the Jira issue
> >> >>
> >> >> Regards,
> >> >>
> >> >> Hervé
> >> >>
> >> >> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
> >> >> > o change the scope of org.eclipse.sisu to test in the
> >> >>
> >> >> maven-aether-provider
> >> >>
> >> >> > to prevent it from leaking out to clients.
> >> >> >
> >> >> >
> >> >> > Project: http://git-wip-us.apache.org/repos/asf/maven/repo
> >> >> > Commit:
> http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
> >> >> > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
> >> >> > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
> >> >> >
> >> >> > Branch: refs/heads/master
> >> >> > Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
> >> >> > Parents: 0609504
> >> >> > Author: Jason van Zyl <ja...@tesla.io>
> >> >> > Authored: Fri Jul 26 21:09:50 2013 -0400
> >> >> > Committer: Jason van Zyl <ja...@tesla.io>
> >> >> > Committed: Fri Jul 26 21:09:50 2013 -0400
> >> >> >
> >> >> >
> ----------------------------------------------------------------------
> >> >> >
> >> >> > maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
> >> >> > 1 file changed, 16 insertions(+), 14 deletions(-)
> >> >> >
> >> >> >
> ----------------------------------------------------------------------
> >> >>
> >> >>
> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-p
> >> >> rov>>
> >> >> > ider/pom.xml
> >> >> >
> ----------------------------------------------------------------------
> >> >>
> >> >> diff
> >> >>
> >> >> > --git a/maven-aether-provider/pom.xml
> b/maven-aether-provider/pom.xml
> >> >>
> >> >> index
> >> >>
> >> >> > 910fab6..9235f1c 100644
> >> >> > --- a/maven-aether-provider/pom.xml
> >> >> > +++ b/maven-aether-provider/pom.xml
> >> >> > @@ -63,20 +63,6 @@ under the License.
> >> >> >
> >> >> > <artifactId>aether-impl</artifactId>
> >> >> >
> >> >> > </dependency>
> >> >> > <dependency>
> >> >> >
> >> >> > - <groupId>org.eclipse.aether</groupId>
> >> >> > - <artifactId>aether-connector-wagon</artifactId>
> >> >> > - <scope>test</scope>
> >> >> > - </dependency>
> >> >> > - <dependency>
> >> >> > - <groupId>org.apache.maven.wagon</groupId>
> >> >> > - <artifactId>wagon-file</artifactId>
> >> >> > - <scope>test</scope>
> >> >> > - </dependency>
> >> >> > - <dependency>
> >> >> > - <groupId>org.eclipse.sisu</groupId>
> >> >> > - <artifactId>org.eclipse.sisu.plexus</artifactId>
> >> >> > - </dependency>
> >> >> > - <dependency>
> >> >> >
> >> >> > <groupId>org.codehaus.plexus</groupId>
> >> >> > <artifactId>plexus-component-annotations</artifactId>
> >> >> >
> >> >> > </dependency>
> >> >> >
> >> >> > @@ -96,6 +82,22 @@ under the License.
> >> >> >
> >> >> > </exclusion>
> >> >> >
> >> >> > </exclusions>
> >> >> >
> >> >> > </dependency>
> >> >> >
> >> >> > + <!-- Testing -->
> >> >> > + <dependency>
> >> >> > + <groupId>org.eclipse.aether</groupId>
> >> >> > + <artifactId>aether-connector-wagon</artifactId>
> >> >> > + <scope>test</scope>
> >> >> > + </dependency>
> >> >> > + <dependency>
> >> >> > + <groupId>org.apache.maven.wagon</groupId>
> >> >> > + <artifactId>wagon-file</artifactId>
> >> >> > + <scope>test</scope>
> >> >> > + </dependency>
> >> >> > + <dependency>
> >> >> > + <groupId>org.eclipse.sisu</groupId>
> >> >> > + <artifactId>org.eclipse.sisu.plexus</artifactId>
> >> >> > + <scope>test</scope>
> >> >> > + </dependency>
> >> >> >
> >> >> > </dependencies>
> >> >> >
> >> >> > <build>
> >> >>
> >> >> ---------------------------------------------------------------------
> >> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> >> >> For additional commands, e-mail: dev-help@maven.apache.org
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Fred Cooke <fr...@gmail.com>.
No, you do NOT want to do a git pull, almost ever. You want to do a git
fetch, ensure you're not going to destroy other's good work, then if you're
just replacing same with same, force push. This is a risky operation for an
upstream to do as I mentioned above in my amendment. I would recommend
ignoring this slip up and leaving it alone unless it's on a non-master
branch that no one has publicly forked from.
Pull is a shortcut for fetch and merge and merging amended commits in is a
brain-dead thing to do which results in two copies of the same commit being
present in history, one fixed, one original. IE, just an ugly mess, not an
improvement. Either force over the old stuff (after you're sure it's safe
to do so) or leave it alone.
I've heard people on this list write that people should all be sharing the
same repo. This is generally not a good idea due to the above mistakes that
can easily occur by novice Gitters. Much better to have a set of
gate-keepers and individual repos and issue pull requests, emails here, IRC
messages, etc to get your stuff included. The gate-keepers should have an
absolutely solid grasp of Git.
Fred.
On Sat, Jul 27, 2013 at 3:17 PM, Jeff Jensen <
jeffjensen@upstairstechnology.com> wrote:
> That message indicates you need to git pull first. Even though you
> may already have done so and no one else has pushed since, this usually
> happens when modifying a commit that has been pushed/shared.
>
> On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <he...@free.fr>
> wrote:
> > the last 2 commits are to be amended: lst one for MNG-5499, previous one
> for
> > MNG-5495
> >
> > I tried git commit --amend -m "[MNG-5499]..." for the last one, but when
> I git
> > push, I get
> >
> > To https://git-wip-us.apache.org/repos/asf/maven.git
> > ! [rejected] master -> master (non-fast-forward)
> > error: failed to push some refs to '
> https://git-wip-us.apache.org/repos/asf/maven.git'
> > hint: Updates were rejected because the tip of your current branch is
> behind
> > hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
> > hint: before pushing again.
> > hint: See the 'Note about fast-forwards' in 'git push --help' for
> details.
> >
> >
> > Did I do something wrong? Or git repo at ASF is configured to avoid such
> > things?
> >
> > Regards,
> >
> > Hervé
> >
> > Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
> >> Of course, if anyone is working down stream of this, they will hate you,
> >> and it should be left as is.
> >>
> >> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com>
> wrote:
> >> > Yes, easily, if it's the HEAD just do a --amend on it and update it
> >> > yourself, Jason's name will be retained. If it's not HEAD then do
> rebase
> >> > -i
> >> > <previous hash to the one of interest> then mark the one of interest
> for
> >> > comment edit and proceed.
> >> >
> >> > On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
> > <he...@free.fr>wrote:
> >> >> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
> >> >>
> >> >> I'm not a git blackbelt: can the comment be updated to add the
> classical
> >> >> [MNG-5499]?
> >> >> (and next time not be forgotten from initial comment :) )
> >> >>
> >> >> I'm adding a reference to the commit in the Jira issue
> >> >>
> >> >> Regards,
> >> >>
> >> >> Hervé
> >> >>
> >> >> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
> >> >> > o change the scope of org.eclipse.sisu to test in the
> >> >>
> >> >> maven-aether-provider
> >> >>
> >> >> > to prevent it from leaking out to clients.
> >> >> >
> >> >> >
> >> >> > Project: http://git-wip-us.apache.org/repos/asf/maven/repo
> >> >> > Commit:
> http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
> >> >> > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
> >> >> > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
> >> >> >
> >> >> > Branch: refs/heads/master
> >> >> > Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
> >> >> > Parents: 0609504
> >> >> > Author: Jason van Zyl <ja...@tesla.io>
> >> >> > Authored: Fri Jul 26 21:09:50 2013 -0400
> >> >> > Committer: Jason van Zyl <ja...@tesla.io>
> >> >> > Committed: Fri Jul 26 21:09:50 2013 -0400
> >> >> >
> >> >> >
> ----------------------------------------------------------------------
> >> >> >
> >> >> > maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
> >> >> > 1 file changed, 16 insertions(+), 14 deletions(-)
> >> >> >
> >> >> >
> ----------------------------------------------------------------------
> >> >>
> >> >>
> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-p
> >> >> rov>>
> >> >> > ider/pom.xml
> >> >> >
> ----------------------------------------------------------------------
> >> >>
> >> >> diff
> >> >>
> >> >> > --git a/maven-aether-provider/pom.xml
> b/maven-aether-provider/pom.xml
> >> >>
> >> >> index
> >> >>
> >> >> > 910fab6..9235f1c 100644
> >> >> > --- a/maven-aether-provider/pom.xml
> >> >> > +++ b/maven-aether-provider/pom.xml
> >> >> > @@ -63,20 +63,6 @@ under the License.
> >> >> >
> >> >> > <artifactId>aether-impl</artifactId>
> >> >> >
> >> >> > </dependency>
> >> >> > <dependency>
> >> >> >
> >> >> > - <groupId>org.eclipse.aether</groupId>
> >> >> > - <artifactId>aether-connector-wagon</artifactId>
> >> >> > - <scope>test</scope>
> >> >> > - </dependency>
> >> >> > - <dependency>
> >> >> > - <groupId>org.apache.maven.wagon</groupId>
> >> >> > - <artifactId>wagon-file</artifactId>
> >> >> > - <scope>test</scope>
> >> >> > - </dependency>
> >> >> > - <dependency>
> >> >> > - <groupId>org.eclipse.sisu</groupId>
> >> >> > - <artifactId>org.eclipse.sisu.plexus</artifactId>
> >> >> > - </dependency>
> >> >> > - <dependency>
> >> >> >
> >> >> > <groupId>org.codehaus.plexus</groupId>
> >> >> > <artifactId>plexus-component-annotations</artifactId>
> >> >> >
> >> >> > </dependency>
> >> >> >
> >> >> > @@ -96,6 +82,22 @@ under the License.
> >> >> >
> >> >> > </exclusion>
> >> >> >
> >> >> > </exclusions>
> >> >> >
> >> >> > </dependency>
> >> >> >
> >> >> > + <!-- Testing -->
> >> >> > + <dependency>
> >> >> > + <groupId>org.eclipse.aether</groupId>
> >> >> > + <artifactId>aether-connector-wagon</artifactId>
> >> >> > + <scope>test</scope>
> >> >> > + </dependency>
> >> >> > + <dependency>
> >> >> > + <groupId>org.apache.maven.wagon</groupId>
> >> >> > + <artifactId>wagon-file</artifactId>
> >> >> > + <scope>test</scope>
> >> >> > + </dependency>
> >> >> > + <dependency>
> >> >> > + <groupId>org.eclipse.sisu</groupId>
> >> >> > + <artifactId>org.eclipse.sisu.plexus</artifactId>
> >> >> > + <scope>test</scope>
> >> >> > + </dependency>
> >> >> >
> >> >> > </dependencies>
> >> >> >
> >> >> > <build>
> >> >>
> >> >> ---------------------------------------------------------------------
> >> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> >> >> For additional commands, e-mail: dev-help@maven.apache.org
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Robert Scholte <rf...@apache.org>.
SVN's 1 level commit vs. GIT's 2+1 level commit: I'd say it's a tie.
Let me be a bit pessimistic, but I don't think that'll work here with the
Apache Maven project due to the number of active committers. It would slow
things down even more.
Robert
Op Sat, 27 Jul 2013 17:04:18 +0200 schreef Fred Cooke
<fr...@gmail.com>:
> :-) Tui, yeah right. [1][2]
>
> Or work on branches, pushed publicly with meaningful names like
> attempt-fix-of-site-behaviour or whatever and seek peer review before
> rebasing and applying to master. IMO this should apply to Maven "gods" as
> much to any other committer. No one is incapable of making mistakes.
>
> Those private branches of mine, I self review the entire diff and comment
> of every commit multiple times before I publish if publishing directly to
> my main branches. I amend and adjust and tweak them until they're as
> close
> to perfectly formed as possible. If I'm pushing to temp branches, I let
> others help with the review first ;-)
>
> Fred.
>
> [1] http://www.tui.co.nz/Competitions/Yeah-Right
> [2]
> http://2.bp.blogspot.com/-lA11480KeR0/Tnsy7llzTXI/AAAAAAAAA5Y/hHfTeCes9eg/s1600/Tui-Yeah-Right-Calendar-Girls-Billboard.jpg
>
> On Sat, Jul 27, 2013 at 4:45 PM, Hervé BOUTEMY
> <he...@free.fr>wrote:
>
>> so, this time:
>> svn +1
>> git -1
>>
>> :)
>>
>> more seriously: if we cannot fix comments later, we'll need to be more
>> careful
>> when committing
>>
>> Regards,
>>
>> Hervé
>>
>> Le samedi 27 juillet 2013 16:27:50 Fred Cooke a écrit :
>> > How did I know you'd say that? You think I didn't know you could do
>> that?
>> > LOL :-p
>> >
>> > Can't do it without bad config and/or administrator privileges. There,
>> > fixed.
>> >
>> > Fred.
>> >
>> > On Sat, Jul 27, 2013 at 4:22 PM, Robert Scholte <rfscholte@apache.org
>> >wrote:
>> > > "With SVN changing a bad comment wasn't even possible"
>> > >
>> > > Yes it is, I've done it very often:
>> > > http://subversion.apache.org/**faq.html#change-log-msg<
>> http://subversion.a
>> > > pache.org/faq.html#change-log-msg> (although I use the GUI for it)
>> > >
>> > > Robert
>> > >
>> > > Op Sat, 27 Jul 2013 16:07:09 +0200 schreef Fred Cooke <
>> > >
>> > > fred.cooke@gmail.com>:
>> > > Good practice is to work on a branch anyway, then you're free to do
>> > >
>> > >> whatever you wish. I have ~30 branches in my private copy of my
>> project
>> > >> right now. When one matures I rebase it onto the latest public,
>> then
>> > >> publish it. Then I rebase the others periodically up onto the
>> latest
>> > >> public
>> > >> too. Wash rinse repeat.
>> > >>
>> > >> With SVN changing a bad comment wasn't even possible, so stating
>> "no
>> > >> amending master" isn't really a restriction at all. It's just good
>> > >> practice.
>> > >>
>> > >> Fred.
>> > >>
>> > >> On Sat, Jul 27, 2013 at 4:00 PM, Robert Scholte
>> <rfscholte@apache.org
>> > >>
>> > >> >wrote:
>> > >> I'm actually kind of surprised. I'm learning my co-workers that
>> comments
>> > >>
>> > >>> are very important. With a buildserver it has become very easy to
>> have
>> > >>> an
>> > >>> overview of the latest commits and understand what broke the
>> build.
>> > >>> Writing good comments should help everybody to understand why a
>> commit
>> > >>> is
>> > >>> done (yes: why. Not 'what', that's already easy to figure out). So
>> I'm
>> > >>> really in favor to being able change comments, because bad
>> comments
>> are
>> > >>> sometimes even worse than no comments.
>> > >>>
>> > >>> Just like Hervé, I'd really prefer to see if a commit is done for
>> a
>> > >>> specific issue or not. In this case I would have liked to see a
>> fix
>> on
>> > >>> the
>> > >>> comment if possible, because the current comment is incomplete.
>> > >>>
>> > >>> Anyhow, now I know about this.
>> > >>>
>> > >>> Robert
>> > >>>
>> > >>>
>> > >>> Op Sat, 27 Jul 2013 15:40:05 +0200 schreef Jeff Jensen
>> <jeffjensen@
>> **
>> > >>> upstairstechnology.com
>> > >>> <jeffjensen@**upstairstechnology.com<
>> jeffjensen@upstairstechnology.com>>>>
>> > >>> On Sat, Jul 27, 2013 at 8:38 AM, Fred Cooke
>> <fr...@gmail.com>
>> > >>>
>> > >>> wrote:
>> > >>>> On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier <
>> aheritier@gmail.com
>> > >>>>
>> > >>>>> >wrote:
>> > >>>>> At Apache it is forbidden to rewrite the history of the master
>> > >>>>> branch.
>> > >>>>>
>> > >>>>>> Which isn't so bad.
>> > >>>>>>
>> > >>>>>> Ahh, this is a very sound policy! Someone is switched on! :-)
>> > >>>>
>> > >>>> Yes, very good!
>> > >>>>
>> > >>>> ---------
>> > >>>>
>> > >>>>> Arnaud
>> > >>>>>
>> > >>>>>> Le 27 juil. 2013 à 15:19, Jeff Jensen
>> > >>>>>> <jeffjensen@**upstairstechnolo**gy.com<
>> http://upstairstechnology.com>
>> > >>>>>> <jeffjensen@**upstairstechnology.com<
>> jeffjensen@upstairstechnology.co
>> > >>>>>> m>
>> > >>>>>>
>> > >>>>>> a écrit :
>> > >>>>>> > That message indicates you need to git pull first. Even
>> though
>> you
>> > >>>>>> > may already have done so and no one else has pushed since,
>> this
>> > >>>>>>
>> > >>>>>> usually
>> > >>>>>>
>> > >>>>>> > happens when modifying a commit that has been pushed/shared.
>> > >>>>>> >
>> > >>>>>> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <
>> > >>>>>>
>> > >>>>>> herve.boutemy@free.fr
>> > >>>>>>
>> > >>>>>> wrote:
>> > >>>>>> >> the last 2 commits are to be amended: lst one for MNG-5499,
>> > >>>>>>
>> > >>>>>> previous
>> > >>>>>> one for
>> > >>>>>>
>> > >>>>>> >> MNG-5495
>> > >>>>>> >>
>> > >>>>>> >> I tried git commit --amend -m "[MNG-5499]..." for the last
>> one,
>> > >>>>>> >> but
>> > >>>>>>
>> > >>>>>> when I git
>> > >>>>>>
>> > >>>>>> >> push, I get
>> > >>>>>> >>
>> > >>>>>> >> To
>> > >>>>>> >> https://git-wip-us.apache.org/****repos/asf/maven.git<
>> https://git
>> > >>>>>> >> -wip-us.apache.org/**repos/asf/maven.git>>>>>>>
>> > >>>>>> <https://**git-wip-us.apache.org/repos/**asf/maven.git<
>> https://git-wi
>> > >>>>>> p-us.apache.org/repos/asf/maven.git>>>>>>>
>> > >>>>>> >> ! [rejected] master -> master (non-fast-forward)
>> > >>>>>> >> error: failed to push some refs to '
>> > >>>>>>
>> > >>>>>> https://git-wip-us.apache.org/****repos/asf/maven.git<
>> https://git-wip
>> > >>>>>> -us.apache.org/**repos/asf/maven.git>
>> > >>>>>> <https://**git-wip-us.apache.org/repos/**asf/maven.git<
>> https://git-w
>> > >>>>>> ip-us.apache.org/repos/asf/maven.git>
>> > >>>>>>
>> > >>>>>>
>> > >>>>>> '
>> > >>>>>>
>> > >>>>>> >> hint: Updates were rejected because the tip of your current
>> branch
>> > >>>>>>
>> > >>>>>> is
>> > >>>>>> behind
>> > >>>>>>
>> > >>>>>> >> hint: its remote counterpart. Merge the remote changes (e.g.
>> 'git
>> > >>>>>>
>> > >>>>>> pull')
>> > >>>>>>
>> > >>>>>> >> hint: before pushing again.
>> > >>>>>> >> hint: See the 'Note about fast-forwards' in 'git push
>> --help'
>> for
>> > >>>>>>
>> > >>>>>> details.
>> > >>>>>>
>> > >>>>>> >> Did I do something wrong? Or git repo at ASF is configured
>> to
>> > >>>>>> >> avoid
>> > >>>>>>
>> > >>>>>> such
>> > >>>>>>
>> > >>>>>> >> things?
>> > >>>>>> >>
>> > >>>>>> >> Regards,
>> > >>>>>> >>
>> > >>>>>> >> Hervé
>> > >>>>>> >>
>> > >>>>>> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
>> > >>>>>> >>> Of course, if anyone is working down stream of this, they
>> will
>> > >>>>>>
>> > >>>>>> hate
>> > >>>>>> you,
>> > >>>>>>
>> > >>>>>> >>> and it should be left as is.
>> > >>>>>> >>>
>> > >>>>>> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <
>> fred.cooke@gmail.com
>> > >>>>>>
>> > >>>>>> wrote:
>> > >>>>>> >>>> Yes, easily, if it's the HEAD just do a --amend on it and
>> update
>> > >>>>>>
>> > >>>>>> it
>> > >>>>>>
>> > >>>>>> >>>> yourself, Jason's name will be retained. If it's not HEAD
>> then
>> > >>>>>> >>>> do
>> > >>>>>>
>> > >>>>>> rebase
>> > >>>>>>
>> > >>>>>> >>>> -i
>> > >>>>>> >>>> <previous hash to the one of interest> then mark the one
>> of
>> > >>>>>>
>> > >>>>>> interest
>> > >>>>>> for
>> > >>>>>>
>> > >>>>>> >>>> comment edit and proceed.
>> > >>>>>> >>>>
>> > >>>>>> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
>> > >>>>>> >>
>> > >>>>>> >> <he...@free.fr>wrote:
>> > >>>>>> >>>>> IIUC, this is a fix to https://jira.codehaus.org/**
>> > >>>>>>
>> > >>>>>> browse/MNG-5499
>> > >>>>>> <https://jira.codehaus.org/**browse/MNG-5499<
>> https://jira.codehaus.o
>> > >>>>>> rg/browse/MNG-5499>>>>>>>
>> > >>>>>> >>>>> I'm not a git blackbelt: can the comment be updated to
>> add
>> the
>> > >>>>>>
>> > >>>>>> classical
>> > >>>>>>
>> > >>>>>> >>>>> [MNG-5499]?
>> > >>>>>> >>>>> (and next time not be forgotten from initial comment :) )
>> > >>>>>> >>>>>
>> > >>>>>> >>>>> I'm adding a reference to the commit in the Jira issue
>> > >>>>>> >>>>>
>> > >>>>>> >>>>> Regards,
>> > >>>>>> >>>>>
>> > >>>>>> >>>>> Hervé
>> > >>>>>> >>>>>
>> > >>>>>> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a
>> écrit :
>> > >>>>>> >>>>>> o change the scope of org.eclipse.sisu to test in the
>> > >>>>>> >>>>>
>> > >>>>>> >>>>> maven-aether-provider
>> > >>>>>> >>>>>
>> > >>>>>> >>>>>> to prevent it from leaking out to clients.
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> Project:
>> > >>>>>> >>>>>> http://git-wip-us.apache.org/****repos/asf/maven/repo
>> <http://
>> > >>>>>> >>>>>> git-wip-us.apache.org/**repos/asf/maven/repo>>>>>>>
>> > >>>>>> <http://**git-wip-us.apache.org/repos/**asf/maven/repo<
>> http://git-wip
>> > >>>>>> -us.apache.org/repos/asf/maven/repo>>>>>>>
>> > >>>>>> >>>>>> Commit:
>> > >>>>>>
>> http://git-wip-us.apache.org/****repos/asf/maven/commit/****e084ff3b<
>> > >>>>>>
>> http://git-wip-us.apache.org/**repos/asf/maven/commit/**e084ff3b>
>> > >>>>>>
>> <http://git-wip-us.**apache.org/repos/asf/maven/**commit/e084ff3b
>> <ht
>> > >>>>>>
>> tp://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b>>>>>>>
>> > >>>>>> >>>>>> Tree:
>> > >>>>>> >>>>>> http://git-wip-us.apache.org/****<
>> http://git-wip-us.apache.or
>> > >>>>>> >>>>>> g/**>
>> > >>>>>>
>> > >>>>>> repos/asf/maven/tree/e084ff3b<**http://git-wip-us.apache.org/**
>> > >>>>>> repos/asf/maven/tree/e084ff3b<
>> http://git-wip-us.apache.org/repos/asf/
>> > >>>>>> maven/tree/e084ff3b>>>>>>>
>> > >>>>>> >>>>>> Diff:
>> > >>>>>> >>>>>> http://git-wip-us.apache.org/****<
>> http://git-wip-us.apache.or
>> > >>>>>> >>>>>> g/**>
>> > >>>>>>
>> > >>>>>> repos/asf/maven/diff/e084ff3b<**http://git-wip-us.apache.org/**
>> > >>>>>> repos/asf/maven/diff/e084ff3b<
>> http://git-wip-us.apache.org/repos/asf/
>> > >>>>>> maven/diff/e084ff3b>>>>>>>
>> > >>>>>> >>>>>> Branch: refs/heads/master
>> > >>>>>> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8e****c87762d4dc
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> Parents: 0609504
>> > >>>>>> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
>> > >>>>>> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
>> > >>>>>> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
>> > >>>>>> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
>> > >>>>>>
>> > >>>>>>
>> ------------------------------****----------------------------**--**
>> > >>>>>>
>> > >>>>>> ----------
>> > >>>>>>
>> > >>>>>> >>>>>> maven-aether-provider/pom.xml | 30
>> > >>>>>>
>> > >>>>>> ++++++++++++++++--------------
>> > >>>>>>
>> > >>>>>> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
>> > >>>>>>
>> > >>>>>>
>> ------------------------------****----------------------------**--**
>> > >>>>>> ----------
>> > >>>>>>
>> > >>>>>>
>> > >>>>>>
>> http://git-wip-us.apache.org/****repos/asf/maven/blob/**e084ff3b/**<h
>> > >>>>>> ttp://git-wip-us.apache.org/**repos/asf/maven/blob/e084ff3b/**>
>> > >>>>>>
>> maven-aether-p<http://git-wip-**us.apache.org/repos/asf/maven/**
>> > >>>>>> blob/e084ff3b/maven-aether-p<
>> http://git-wip-us.apache.org/repos/asf/m
>> > >>>>>> aven/blob/e084ff3b/maven-aether-p>>>>>>>
>> > >>>>>> >>>>> rov>>
>> > >>>>>> >>>>>
>> > >>>>>> >>>>>> ider/pom.xml
>> > >>>>>>
>> > >>>>>>
>> ------------------------------****----------------------------**--**
>> > >>>>>> ----------
>> > >>>>>>
>> > >>>>>> >>>>> diff
>> > >>>>>> >>>>>
>> > >>>>>> >>>>>> --git a/maven-aether-provider/pom.****xml
>> > >>>>>>
>> > >>>>>> b/maven-aether-provider/pom.****xml
>> > >>>>>>
>> > >>>>>> >>>>> index
>> > >>>>>> >>>>>
>> > >>>>>> >>>>>> 910fab6..9235f1c 100644
>> > >>>>>> >>>>>> --- a/maven-aether-provider/pom.****xml
>> > >>>>>> >>>>>> +++ b/maven-aether-provider/pom.****xml
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> @@ -63,20 +63,6 @@ under the License.
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> <artifactId>aether-impl</****artifactId>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> </dependency>
>> > >>>>>> >>>>>> <dependency>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> - <groupId>org.eclipse.aether</****groupId>
>> > >>>>>> >>>>>> -
>> <artifactId>aether-connector-****wagon</artifactId>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> - <scope>test</scope>
>> > >>>>>> >>>>>> - </dependency>
>> > >>>>>> >>>>>> - <dependency>
>> > >>>>>> >>>>>> - <groupId>org.apache.maven.****wagon</groupId>
>> > >>>>>> >>>>>> - <artifactId>wagon-file</****artifactId>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> - <scope>test</scope>
>> > >>>>>> >>>>>> - </dependency>
>> > >>>>>> >>>>>> - <dependency>
>> > >>>>>> >>>>>> - <groupId>org.eclipse.sisu</****groupId>
>> > >>>>>> >>>>>> -
>> <artifactId>org.eclipse.sisu.****plexus</artifactId>
>> > >>>>>> >>>>>> - </dependency>
>> > >>>>>> >>>>>> - <dependency>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> <groupId>org.codehaus.plexus</****groupId>
>> > >>>>>> >>>>>> <artifactId>plexus-component-***
>> > >>>>>>
>> > >>>>>> *annotations</artifactId>
>> > >>>>>>
>> > >>>>>> >>>>>> </dependency>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> @@ -96,6 +82,22 @@ under the License.
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> </exclusion>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> </exclusions>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> </dependency>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> + <!-- Testing -->
>> > >>>>>> >>>>>> + <dependency>
>> > >>>>>> >>>>>> + <groupId>org.eclipse.aether</****groupId>
>> > >>>>>> >>>>>> +
>> <artifactId>aether-connector-****wagon</artifactId>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> + <scope>test</scope>
>> > >>>>>> >>>>>> + </dependency>
>> > >>>>>> >>>>>> + <dependency>
>> > >>>>>> >>>>>> + <groupId>org.apache.maven.****wagon</groupId>
>> > >>>>>> >>>>>> + <artifactId>wagon-file</****artifactId>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> + <scope>test</scope>
>> > >>>>>> >>>>>> + </dependency>
>> > >>>>>> >>>>>> + <dependency>
>> > >>>>>> >>>>>> + <groupId>org.eclipse.sisu</****groupId>
>> > >>>>>> >>>>>> +
>> <artifactId>org.eclipse.sisu.****plexus</artifactId>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> + <scope>test</scope>
>> > >>>>>> >>>>>> + </dependency>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> </dependencies>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> <build>
>> > >>>>>> >>>>>
>> > >>>>>> >>>>>
>> ------------------------------****----------------------------*
>> > >>>>>>
>> > >>>>>> *--**
>> > >>>>>> ---------
>> > >>>>>>
>> > >>>>>> >>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.
>> ****org<
>> > >>>>>>
>> > >>>>>> dev-unsubscribe@maven.**apache.org <
>> dev-unsubscribe@maven.apache.org>
>> > >>>>>>
>> > >>>>>> >>>>> For additional commands, e-mail:
>> dev-help@maven.apache.org
>> > >>>>>> >>
>> > >>>>>> >>
>> ------------------------------****----------------------------**
>> > >>>>>>
>> > >>>>>> --**
>> > >>>>>> ---------
>> > >>>>>>
>> > >>>>>> >> To unsubscribe, e-mail:
>> dev-unsubscribe@maven.apache.****org<
>> > >>>>>>
>> > >>>>>> dev-unsubscribe@maven.**apache.org <
>> dev-unsubscribe@maven.apache.org>
>> > >>>>>>
>> > >>>>>> >> For additional commands, e-mail: dev-help@maven.apache.org
>> > >>>>>> >
>> > >>>>>> >
>> ------------------------------****----------------------------**
>> > >>>>>>
>> > >>>>>> --**
>> > >>>>>> ---------
>> > >>>>>>
>> > >>>>>> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>> > >>>>>>
>> > >>>>>> dev-unsubscribe@maven.**apache.org <
>> dev-unsubscribe@maven.apache.org>
>> > >>>>>>
>> > >>>>>> > For additional commands, e-mail: dev-help@maven.apache.org
>> > >>>>>>
>> > >>>>>>
>> ------------------------------****----------------------------**--**
>> > >>>>>> ---------
>> > >>>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>> > >>>>>> dev-unsubscribe@maven.**apache.org <
>> dev-unsubscribe@maven.apache.org>
>> > >>>>>>
>> > >>>>>>
>> > >>>>>> For additional commands, e-mail: dev-help@maven.apache.org
>> > >>>>>>
>> > >>>>>>
>> ------------------------------****----------------------------**
>> > >>>>
>> > >>>> --**---------
>> > >>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>> > >>>> dev-unsubscribe@maven.**apache.org <
>> dev-unsubscribe@maven.apache.org>>
>> > >>>>
>> > >>>> For additional commands, e-mail: dev-help@maven.apache.org
>> > >>>
>> > >>> ------------------------------****----------------------------**
>> > >>> --**---------
>> > >>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>> > >>> dev-unsubscribe@maven.**apache.org
>> <dev-unsubscribe@maven.apache.org
>> >>
>> > >>>
>> > >>> For additional commands, e-mail: dev-help@maven.apache.org
>> > >
>> > >
>> ------------------------------**------------------------------**---------
>> > > To unsubscribe, e-mail:
>> > > dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>> For
>> > > additional commands, e-mail: dev-help@maven.apache.org
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Kristian Rosenvold <kr...@gmail.com>.
Is there a problem you're trying to fix or have you just been taking too
many vitamin pills ?
Kristian
2013/7/27 Fred Cooke <fr...@gmail.com>:
> :-) Tui, yeah right. [1][2]
>
> Or work on branches, pushed publicly with meaningful names like
> attempt-fix-of-site-behaviour or whatever and seek peer review before
> rebasing and applying to master. IMO this should apply to Maven "gods" as
> much to any other committer. No one is incapable of making mistakes.
>
> Those private branches of mine, I self review the entire diff and comment
> of every commit multiple times before I publish if publishing directly to
> my main branches. I amend and adjust and tweak them until they're as close
> to perfectly formed as possible. If I'm pushing to temp branches, I let
> others help with the review first ;-)
>
> Fred.
>
> [1] http://www.tui.co.nz/Competitions/Yeah-Right
> [2]
> http://2.bp.blogspot.com/-lA11480KeR0/Tnsy7llzTXI/AAAAAAAAA5Y/hHfTeCes9eg/s1600/Tui-Yeah-Right-Calendar-Girls-Billboard.jpg
>
> On Sat, Jul 27, 2013 at 4:45 PM, Hervé BOUTEMY <he...@free.fr>wrote:
>
>> so, this time:
>> svn +1
>> git -1
>>
>> :)
>>
>> more seriously: if we cannot fix comments later, we'll need to be more
>> careful
>> when committing
>>
>> Regards,
>>
>> Hervé
>>
>> Le samedi 27 juillet 2013 16:27:50 Fred Cooke a écrit :
>> > How did I know you'd say that? You think I didn't know you could do that?
>> > LOL :-p
>> >
>> > Can't do it without bad config and/or administrator privileges. There,
>> > fixed.
>> >
>> > Fred.
>> >
>> > On Sat, Jul 27, 2013 at 4:22 PM, Robert Scholte <rfscholte@apache.org
>> >wrote:
>> > > "With SVN changing a bad comment wasn't even possible"
>> > >
>> > > Yes it is, I've done it very often:
>> > > http://subversion.apache.org/**faq.html#change-log-msg<
>> http://subversion.a
>> > > pache.org/faq.html#change-log-msg> (although I use the GUI for it)
>> > >
>> > > Robert
>> > >
>> > > Op Sat, 27 Jul 2013 16:07:09 +0200 schreef Fred Cooke <
>> > >
>> > > fred.cooke@gmail.com>:
>> > > Good practice is to work on a branch anyway, then you're free to do
>> > >
>> > >> whatever you wish. I have ~30 branches in my private copy of my
>> project
>> > >> right now. When one matures I rebase it onto the latest public, then
>> > >> publish it. Then I rebase the others periodically up onto the latest
>> > >> public
>> > >> too. Wash rinse repeat.
>> > >>
>> > >> With SVN changing a bad comment wasn't even possible, so stating "no
>> > >> amending master" isn't really a restriction at all. It's just good
>> > >> practice.
>> > >>
>> > >> Fred.
>> > >>
>> > >> On Sat, Jul 27, 2013 at 4:00 PM, Robert Scholte <rfscholte@apache.org
>> > >>
>> > >> >wrote:
>> > >> I'm actually kind of surprised. I'm learning my co-workers that
>> comments
>> > >>
>> > >>> are very important. With a buildserver it has become very easy to
>> have
>> > >>> an
>> > >>> overview of the latest commits and understand what broke the build.
>> > >>> Writing good comments should help everybody to understand why a
>> commit
>> > >>> is
>> > >>> done (yes: why. Not 'what', that's already easy to figure out). So
>> I'm
>> > >>> really in favor to being able change comments, because bad comments
>> are
>> > >>> sometimes even worse than no comments.
>> > >>>
>> > >>> Just like Hervé, I'd really prefer to see if a commit is done for a
>> > >>> specific issue or not. In this case I would have liked to see a fix
>> on
>> > >>> the
>> > >>> comment if possible, because the current comment is incomplete.
>> > >>>
>> > >>> Anyhow, now I know about this.
>> > >>>
>> > >>> Robert
>> > >>>
>> > >>>
>> > >>> Op Sat, 27 Jul 2013 15:40:05 +0200 schreef Jeff Jensen <jeffjensen@
>> **
>> > >>> upstairstechnology.com
>> > >>> <jeffjensen@**upstairstechnology.com<
>> jeffjensen@upstairstechnology.com>>>>
>> > >>> On Sat, Jul 27, 2013 at 8:38 AM, Fred Cooke <fr...@gmail.com>
>> > >>>
>> > >>> wrote:
>> > >>>> On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier <
>> aheritier@gmail.com
>> > >>>>
>> > >>>>> >wrote:
>> > >>>>> At Apache it is forbidden to rewrite the history of the master
>> > >>>>> branch.
>> > >>>>>
>> > >>>>>> Which isn't so bad.
>> > >>>>>>
>> > >>>>>> Ahh, this is a very sound policy! Someone is switched on! :-)
>> > >>>>
>> > >>>> Yes, very good!
>> > >>>>
>> > >>>> ---------
>> > >>>>
>> > >>>>> Arnaud
>> > >>>>>
>> > >>>>>> Le 27 juil. 2013 à 15:19, Jeff Jensen
>> > >>>>>> <jeffjensen@**upstairstechnolo**gy.com<
>> http://upstairstechnology.com>
>> > >>>>>> <jeffjensen@**upstairstechnology.com<
>> jeffjensen@upstairstechnology.co
>> > >>>>>> m>
>> > >>>>>>
>> > >>>>>> a écrit :
>> > >>>>>> > That message indicates you need to git pull first. Even though
>> you
>> > >>>>>> > may already have done so and no one else has pushed since, this
>> > >>>>>>
>> > >>>>>> usually
>> > >>>>>>
>> > >>>>>> > happens when modifying a commit that has been pushed/shared.
>> > >>>>>> >
>> > >>>>>> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <
>> > >>>>>>
>> > >>>>>> herve.boutemy@free.fr
>> > >>>>>>
>> > >>>>>> wrote:
>> > >>>>>> >> the last 2 commits are to be amended: lst one for MNG-5499,
>> > >>>>>>
>> > >>>>>> previous
>> > >>>>>> one for
>> > >>>>>>
>> > >>>>>> >> MNG-5495
>> > >>>>>> >>
>> > >>>>>> >> I tried git commit --amend -m "[MNG-5499]..." for the last one,
>> > >>>>>> >> but
>> > >>>>>>
>> > >>>>>> when I git
>> > >>>>>>
>> > >>>>>> >> push, I get
>> > >>>>>> >>
>> > >>>>>> >> To
>> > >>>>>> >> https://git-wip-us.apache.org/****repos/asf/maven.git<
>> https://git
>> > >>>>>> >> -wip-us.apache.org/**repos/asf/maven.git>>>>>>>
>> > >>>>>> <https://**git-wip-us.apache.org/repos/**asf/maven.git<
>> https://git-wi
>> > >>>>>> p-us.apache.org/repos/asf/maven.git>>>>>>>
>> > >>>>>> >> ! [rejected] master -> master (non-fast-forward)
>> > >>>>>> >> error: failed to push some refs to '
>> > >>>>>>
>> > >>>>>> https://git-wip-us.apache.org/****repos/asf/maven.git<
>> https://git-wip
>> > >>>>>> -us.apache.org/**repos/asf/maven.git>
>> > >>>>>> <https://**git-wip-us.apache.org/repos/**asf/maven.git<
>> https://git-w
>> > >>>>>> ip-us.apache.org/repos/asf/maven.git>
>> > >>>>>>
>> > >>>>>>
>> > >>>>>> '
>> > >>>>>>
>> > >>>>>> >> hint: Updates were rejected because the tip of your current
>> branch
>> > >>>>>>
>> > >>>>>> is
>> > >>>>>> behind
>> > >>>>>>
>> > >>>>>> >> hint: its remote counterpart. Merge the remote changes (e.g.
>> 'git
>> > >>>>>>
>> > >>>>>> pull')
>> > >>>>>>
>> > >>>>>> >> hint: before pushing again.
>> > >>>>>> >> hint: See the 'Note about fast-forwards' in 'git push --help'
>> for
>> > >>>>>>
>> > >>>>>> details.
>> > >>>>>>
>> > >>>>>> >> Did I do something wrong? Or git repo at ASF is configured to
>> > >>>>>> >> avoid
>> > >>>>>>
>> > >>>>>> such
>> > >>>>>>
>> > >>>>>> >> things?
>> > >>>>>> >>
>> > >>>>>> >> Regards,
>> > >>>>>> >>
>> > >>>>>> >> Hervé
>> > >>>>>> >>
>> > >>>>>> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
>> > >>>>>> >>> Of course, if anyone is working down stream of this, they will
>> > >>>>>>
>> > >>>>>> hate
>> > >>>>>> you,
>> > >>>>>>
>> > >>>>>> >>> and it should be left as is.
>> > >>>>>> >>>
>> > >>>>>> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <
>> fred.cooke@gmail.com
>> > >>>>>>
>> > >>>>>> wrote:
>> > >>>>>> >>>> Yes, easily, if it's the HEAD just do a --amend on it and
>> update
>> > >>>>>>
>> > >>>>>> it
>> > >>>>>>
>> > >>>>>> >>>> yourself, Jason's name will be retained. If it's not HEAD
>> then
>> > >>>>>> >>>> do
>> > >>>>>>
>> > >>>>>> rebase
>> > >>>>>>
>> > >>>>>> >>>> -i
>> > >>>>>> >>>> <previous hash to the one of interest> then mark the one of
>> > >>>>>>
>> > >>>>>> interest
>> > >>>>>> for
>> > >>>>>>
>> > >>>>>> >>>> comment edit and proceed.
>> > >>>>>> >>>>
>> > >>>>>> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
>> > >>>>>> >>
>> > >>>>>> >> <he...@free.fr>wrote:
>> > >>>>>> >>>>> IIUC, this is a fix to https://jira.codehaus.org/**
>> > >>>>>>
>> > >>>>>> browse/MNG-5499
>> > >>>>>> <https://jira.codehaus.org/**browse/MNG-5499<
>> https://jira.codehaus.o
>> > >>>>>> rg/browse/MNG-5499>>>>>>>
>> > >>>>>> >>>>> I'm not a git blackbelt: can the comment be updated to add
>> the
>> > >>>>>>
>> > >>>>>> classical
>> > >>>>>>
>> > >>>>>> >>>>> [MNG-5499]?
>> > >>>>>> >>>>> (and next time not be forgotten from initial comment :) )
>> > >>>>>> >>>>>
>> > >>>>>> >>>>> I'm adding a reference to the commit in the Jira issue
>> > >>>>>> >>>>>
>> > >>>>>> >>>>> Regards,
>> > >>>>>> >>>>>
>> > >>>>>> >>>>> Hervé
>> > >>>>>> >>>>>
>> > >>>>>> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a
>> écrit :
>> > >>>>>> >>>>>> o change the scope of org.eclipse.sisu to test in the
>> > >>>>>> >>>>>
>> > >>>>>> >>>>> maven-aether-provider
>> > >>>>>> >>>>>
>> > >>>>>> >>>>>> to prevent it from leaking out to clients.
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> Project:
>> > >>>>>> >>>>>> http://git-wip-us.apache.org/****repos/asf/maven/repo
>> <http://
>> > >>>>>> >>>>>> git-wip-us.apache.org/**repos/asf/maven/repo>>>>>>>
>> > >>>>>> <http://**git-wip-us.apache.org/repos/**asf/maven/repo<
>> http://git-wip
>> > >>>>>> -us.apache.org/repos/asf/maven/repo>>>>>>>
>> > >>>>>> >>>>>> Commit:
>> > >>>>>>
>> http://git-wip-us.apache.org/****repos/asf/maven/commit/****e084ff3b<
>> > >>>>>> http://git-wip-us.apache.org/**repos/asf/maven/commit/**e084ff3b>
>> > >>>>>> <http://git-wip-us.**apache.org/repos/asf/maven/**commit/e084ff3b
>> <ht
>> > >>>>>> tp://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b>>>>>>>
>> > >>>>>> >>>>>> Tree:
>> > >>>>>> >>>>>> http://git-wip-us.apache.org/****<
>> http://git-wip-us.apache.or
>> > >>>>>> >>>>>> g/**>
>> > >>>>>>
>> > >>>>>> repos/asf/maven/tree/e084ff3b<**http://git-wip-us.apache.org/**
>> > >>>>>> repos/asf/maven/tree/e084ff3b<
>> http://git-wip-us.apache.org/repos/asf/
>> > >>>>>> maven/tree/e084ff3b>>>>>>>
>> > >>>>>> >>>>>> Diff:
>> > >>>>>> >>>>>> http://git-wip-us.apache.org/****<
>> http://git-wip-us.apache.or
>> > >>>>>> >>>>>> g/**>
>> > >>>>>>
>> > >>>>>> repos/asf/maven/diff/e084ff3b<**http://git-wip-us.apache.org/**
>> > >>>>>> repos/asf/maven/diff/e084ff3b<
>> http://git-wip-us.apache.org/repos/asf/
>> > >>>>>> maven/diff/e084ff3b>>>>>>>
>> > >>>>>> >>>>>> Branch: refs/heads/master
>> > >>>>>> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8e****c87762d4dc
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> Parents: 0609504
>> > >>>>>> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
>> > >>>>>> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
>> > >>>>>> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
>> > >>>>>> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
>> > >>>>>>
>> > >>>>>>
>> ------------------------------****----------------------------**--**
>> > >>>>>>
>> > >>>>>> ----------
>> > >>>>>>
>> > >>>>>> >>>>>> maven-aether-provider/pom.xml | 30
>> > >>>>>>
>> > >>>>>> ++++++++++++++++--------------
>> > >>>>>>
>> > >>>>>> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
>> > >>>>>>
>> > >>>>>>
>> ------------------------------****----------------------------**--**
>> > >>>>>> ----------
>> > >>>>>>
>> > >>>>>>
>> > >>>>>>
>> http://git-wip-us.apache.org/****repos/asf/maven/blob/**e084ff3b/**<h
>> > >>>>>> ttp://git-wip-us.apache.org/**repos/asf/maven/blob/e084ff3b/**>
>> > >>>>>> maven-aether-p<http://git-wip-**us.apache.org/repos/asf/maven/**
>> > >>>>>> blob/e084ff3b/maven-aether-p<
>> http://git-wip-us.apache.org/repos/asf/m
>> > >>>>>> aven/blob/e084ff3b/maven-aether-p>>>>>>>
>> > >>>>>> >>>>> rov>>
>> > >>>>>> >>>>>
>> > >>>>>> >>>>>> ider/pom.xml
>> > >>>>>>
>> > >>>>>>
>> ------------------------------****----------------------------**--**
>> > >>>>>> ----------
>> > >>>>>>
>> > >>>>>> >>>>> diff
>> > >>>>>> >>>>>
>> > >>>>>> >>>>>> --git a/maven-aether-provider/pom.****xml
>> > >>>>>>
>> > >>>>>> b/maven-aether-provider/pom.****xml
>> > >>>>>>
>> > >>>>>> >>>>> index
>> > >>>>>> >>>>>
>> > >>>>>> >>>>>> 910fab6..9235f1c 100644
>> > >>>>>> >>>>>> --- a/maven-aether-provider/pom.****xml
>> > >>>>>> >>>>>> +++ b/maven-aether-provider/pom.****xml
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> @@ -63,20 +63,6 @@ under the License.
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> <artifactId>aether-impl</****artifactId>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> </dependency>
>> > >>>>>> >>>>>> <dependency>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> - <groupId>org.eclipse.aether</****groupId>
>> > >>>>>> >>>>>> - <artifactId>aether-connector-****wagon</artifactId>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> - <scope>test</scope>
>> > >>>>>> >>>>>> - </dependency>
>> > >>>>>> >>>>>> - <dependency>
>> > >>>>>> >>>>>> - <groupId>org.apache.maven.****wagon</groupId>
>> > >>>>>> >>>>>> - <artifactId>wagon-file</****artifactId>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> - <scope>test</scope>
>> > >>>>>> >>>>>> - </dependency>
>> > >>>>>> >>>>>> - <dependency>
>> > >>>>>> >>>>>> - <groupId>org.eclipse.sisu</****groupId>
>> > >>>>>> >>>>>> - <artifactId>org.eclipse.sisu.****plexus</artifactId>
>> > >>>>>> >>>>>> - </dependency>
>> > >>>>>> >>>>>> - <dependency>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> <groupId>org.codehaus.plexus</****groupId>
>> > >>>>>> >>>>>> <artifactId>plexus-component-***
>> > >>>>>>
>> > >>>>>> *annotations</artifactId>
>> > >>>>>>
>> > >>>>>> >>>>>> </dependency>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> @@ -96,6 +82,22 @@ under the License.
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> </exclusion>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> </exclusions>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> </dependency>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> + <!-- Testing -->
>> > >>>>>> >>>>>> + <dependency>
>> > >>>>>> >>>>>> + <groupId>org.eclipse.aether</****groupId>
>> > >>>>>> >>>>>> + <artifactId>aether-connector-****wagon</artifactId>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> + <scope>test</scope>
>> > >>>>>> >>>>>> + </dependency>
>> > >>>>>> >>>>>> + <dependency>
>> > >>>>>> >>>>>> + <groupId>org.apache.maven.****wagon</groupId>
>> > >>>>>> >>>>>> + <artifactId>wagon-file</****artifactId>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> + <scope>test</scope>
>> > >>>>>> >>>>>> + </dependency>
>> > >>>>>> >>>>>> + <dependency>
>> > >>>>>> >>>>>> + <groupId>org.eclipse.sisu</****groupId>
>> > >>>>>> >>>>>> + <artifactId>org.eclipse.sisu.****plexus</artifactId>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> + <scope>test</scope>
>> > >>>>>> >>>>>> + </dependency>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> </dependencies>
>> > >>>>>> >>>>>>
>> > >>>>>> >>>>>> <build>
>> > >>>>>> >>>>>
>> > >>>>>> >>>>>
>> ------------------------------****----------------------------*
>> > >>>>>>
>> > >>>>>> *--**
>> > >>>>>> ---------
>> > >>>>>>
>> > >>>>>> >>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.
>> ****org<
>> > >>>>>>
>> > >>>>>> dev-unsubscribe@maven.**apache.org <
>> dev-unsubscribe@maven.apache.org>
>> > >>>>>>
>> > >>>>>> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
>> > >>>>>> >>
>> > >>>>>> >>
>> ------------------------------****----------------------------**
>> > >>>>>>
>> > >>>>>> --**
>> > >>>>>> ---------
>> > >>>>>>
>> > >>>>>> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>> > >>>>>>
>> > >>>>>> dev-unsubscribe@maven.**apache.org <
>> dev-unsubscribe@maven.apache.org>
>> > >>>>>>
>> > >>>>>> >> For additional commands, e-mail: dev-help@maven.apache.org
>> > >>>>>> >
>> > >>>>>> > ------------------------------****----------------------------**
>> > >>>>>>
>> > >>>>>> --**
>> > >>>>>> ---------
>> > >>>>>>
>> > >>>>>> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>> > >>>>>>
>> > >>>>>> dev-unsubscribe@maven.**apache.org <
>> dev-unsubscribe@maven.apache.org>
>> > >>>>>>
>> > >>>>>> > For additional commands, e-mail: dev-help@maven.apache.org
>> > >>>>>>
>> > >>>>>>
>> ------------------------------****----------------------------**--**
>> > >>>>>> ---------
>> > >>>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>> > >>>>>> dev-unsubscribe@maven.**apache.org <
>> dev-unsubscribe@maven.apache.org>
>> > >>>>>>
>> > >>>>>>
>> > >>>>>> For additional commands, e-mail: dev-help@maven.apache.org
>> > >>>>>>
>> > >>>>>> ------------------------------****----------------------------**
>> > >>>>
>> > >>>> --**---------
>> > >>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>> > >>>> dev-unsubscribe@maven.**apache.org <
>> dev-unsubscribe@maven.apache.org>>
>> > >>>>
>> > >>>> For additional commands, e-mail: dev-help@maven.apache.org
>> > >>>
>> > >>> ------------------------------****----------------------------**
>> > >>> --**---------
>> > >>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>> > >>> dev-unsubscribe@maven.**apache.org <dev-unsubscribe@maven.apache.org
>> >>
>> > >>>
>> > >>> For additional commands, e-mail: dev-help@maven.apache.org
>> > >
>> > >
>> ------------------------------**------------------------------**---------
>> > > To unsubscribe, e-mail:
>> > > dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>> For
>> > > additional commands, e-mail: dev-help@maven.apache.org
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Fred Cooke <fr...@gmail.com>.
:-) Tui, yeah right. [1][2]
Or work on branches, pushed publicly with meaningful names like
attempt-fix-of-site-behaviour or whatever and seek peer review before
rebasing and applying to master. IMO this should apply to Maven "gods" as
much to any other committer. No one is incapable of making mistakes.
Those private branches of mine, I self review the entire diff and comment
of every commit multiple times before I publish if publishing directly to
my main branches. I amend and adjust and tweak them until they're as close
to perfectly formed as possible. If I'm pushing to temp branches, I let
others help with the review first ;-)
Fred.
[1] http://www.tui.co.nz/Competitions/Yeah-Right
[2]
http://2.bp.blogspot.com/-lA11480KeR0/Tnsy7llzTXI/AAAAAAAAA5Y/hHfTeCes9eg/s1600/Tui-Yeah-Right-Calendar-Girls-Billboard.jpg
On Sat, Jul 27, 2013 at 4:45 PM, Hervé BOUTEMY <he...@free.fr>wrote:
> so, this time:
> svn +1
> git -1
>
> :)
>
> more seriously: if we cannot fix comments later, we'll need to be more
> careful
> when committing
>
> Regards,
>
> Hervé
>
> Le samedi 27 juillet 2013 16:27:50 Fred Cooke a écrit :
> > How did I know you'd say that? You think I didn't know you could do that?
> > LOL :-p
> >
> > Can't do it without bad config and/or administrator privileges. There,
> > fixed.
> >
> > Fred.
> >
> > On Sat, Jul 27, 2013 at 4:22 PM, Robert Scholte <rfscholte@apache.org
> >wrote:
> > > "With SVN changing a bad comment wasn't even possible"
> > >
> > > Yes it is, I've done it very often:
> > > http://subversion.apache.org/**faq.html#change-log-msg<
> http://subversion.a
> > > pache.org/faq.html#change-log-msg> (although I use the GUI for it)
> > >
> > > Robert
> > >
> > > Op Sat, 27 Jul 2013 16:07:09 +0200 schreef Fred Cooke <
> > >
> > > fred.cooke@gmail.com>:
> > > Good practice is to work on a branch anyway, then you're free to do
> > >
> > >> whatever you wish. I have ~30 branches in my private copy of my
> project
> > >> right now. When one matures I rebase it onto the latest public, then
> > >> publish it. Then I rebase the others periodically up onto the latest
> > >> public
> > >> too. Wash rinse repeat.
> > >>
> > >> With SVN changing a bad comment wasn't even possible, so stating "no
> > >> amending master" isn't really a restriction at all. It's just good
> > >> practice.
> > >>
> > >> Fred.
> > >>
> > >> On Sat, Jul 27, 2013 at 4:00 PM, Robert Scholte <rfscholte@apache.org
> > >>
> > >> >wrote:
> > >> I'm actually kind of surprised. I'm learning my co-workers that
> comments
> > >>
> > >>> are very important. With a buildserver it has become very easy to
> have
> > >>> an
> > >>> overview of the latest commits and understand what broke the build.
> > >>> Writing good comments should help everybody to understand why a
> commit
> > >>> is
> > >>> done (yes: why. Not 'what', that's already easy to figure out). So
> I'm
> > >>> really in favor to being able change comments, because bad comments
> are
> > >>> sometimes even worse than no comments.
> > >>>
> > >>> Just like Hervé, I'd really prefer to see if a commit is done for a
> > >>> specific issue or not. In this case I would have liked to see a fix
> on
> > >>> the
> > >>> comment if possible, because the current comment is incomplete.
> > >>>
> > >>> Anyhow, now I know about this.
> > >>>
> > >>> Robert
> > >>>
> > >>>
> > >>> Op Sat, 27 Jul 2013 15:40:05 +0200 schreef Jeff Jensen <jeffjensen@
> **
> > >>> upstairstechnology.com
> > >>> <jeffjensen@**upstairstechnology.com<
> jeffjensen@upstairstechnology.com>>>>
> > >>> On Sat, Jul 27, 2013 at 8:38 AM, Fred Cooke <fr...@gmail.com>
> > >>>
> > >>> wrote:
> > >>>> On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier <
> aheritier@gmail.com
> > >>>>
> > >>>>> >wrote:
> > >>>>> At Apache it is forbidden to rewrite the history of the master
> > >>>>> branch.
> > >>>>>
> > >>>>>> Which isn't so bad.
> > >>>>>>
> > >>>>>> Ahh, this is a very sound policy! Someone is switched on! :-)
> > >>>>
> > >>>> Yes, very good!
> > >>>>
> > >>>> ---------
> > >>>>
> > >>>>> Arnaud
> > >>>>>
> > >>>>>> Le 27 juil. 2013 à 15:19, Jeff Jensen
> > >>>>>> <jeffjensen@**upstairstechnolo**gy.com<
> http://upstairstechnology.com>
> > >>>>>> <jeffjensen@**upstairstechnology.com<
> jeffjensen@upstairstechnology.co
> > >>>>>> m>
> > >>>>>>
> > >>>>>> a écrit :
> > >>>>>> > That message indicates you need to git pull first. Even though
> you
> > >>>>>> > may already have done so and no one else has pushed since, this
> > >>>>>>
> > >>>>>> usually
> > >>>>>>
> > >>>>>> > happens when modifying a commit that has been pushed/shared.
> > >>>>>> >
> > >>>>>> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <
> > >>>>>>
> > >>>>>> herve.boutemy@free.fr
> > >>>>>>
> > >>>>>> wrote:
> > >>>>>> >> the last 2 commits are to be amended: lst one for MNG-5499,
> > >>>>>>
> > >>>>>> previous
> > >>>>>> one for
> > >>>>>>
> > >>>>>> >> MNG-5495
> > >>>>>> >>
> > >>>>>> >> I tried git commit --amend -m "[MNG-5499]..." for the last one,
> > >>>>>> >> but
> > >>>>>>
> > >>>>>> when I git
> > >>>>>>
> > >>>>>> >> push, I get
> > >>>>>> >>
> > >>>>>> >> To
> > >>>>>> >> https://git-wip-us.apache.org/****repos/asf/maven.git<
> https://git
> > >>>>>> >> -wip-us.apache.org/**repos/asf/maven.git>>>>>>>
> > >>>>>> <https://**git-wip-us.apache.org/repos/**asf/maven.git<
> https://git-wi
> > >>>>>> p-us.apache.org/repos/asf/maven.git>>>>>>>
> > >>>>>> >> ! [rejected] master -> master (non-fast-forward)
> > >>>>>> >> error: failed to push some refs to '
> > >>>>>>
> > >>>>>> https://git-wip-us.apache.org/****repos/asf/maven.git<
> https://git-wip
> > >>>>>> -us.apache.org/**repos/asf/maven.git>
> > >>>>>> <https://**git-wip-us.apache.org/repos/**asf/maven.git<
> https://git-w
> > >>>>>> ip-us.apache.org/repos/asf/maven.git>
> > >>>>>>
> > >>>>>>
> > >>>>>> '
> > >>>>>>
> > >>>>>> >> hint: Updates were rejected because the tip of your current
> branch
> > >>>>>>
> > >>>>>> is
> > >>>>>> behind
> > >>>>>>
> > >>>>>> >> hint: its remote counterpart. Merge the remote changes (e.g.
> 'git
> > >>>>>>
> > >>>>>> pull')
> > >>>>>>
> > >>>>>> >> hint: before pushing again.
> > >>>>>> >> hint: See the 'Note about fast-forwards' in 'git push --help'
> for
> > >>>>>>
> > >>>>>> details.
> > >>>>>>
> > >>>>>> >> Did I do something wrong? Or git repo at ASF is configured to
> > >>>>>> >> avoid
> > >>>>>>
> > >>>>>> such
> > >>>>>>
> > >>>>>> >> things?
> > >>>>>> >>
> > >>>>>> >> Regards,
> > >>>>>> >>
> > >>>>>> >> Hervé
> > >>>>>> >>
> > >>>>>> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
> > >>>>>> >>> Of course, if anyone is working down stream of this, they will
> > >>>>>>
> > >>>>>> hate
> > >>>>>> you,
> > >>>>>>
> > >>>>>> >>> and it should be left as is.
> > >>>>>> >>>
> > >>>>>> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <
> fred.cooke@gmail.com
> > >>>>>>
> > >>>>>> wrote:
> > >>>>>> >>>> Yes, easily, if it's the HEAD just do a --amend on it and
> update
> > >>>>>>
> > >>>>>> it
> > >>>>>>
> > >>>>>> >>>> yourself, Jason's name will be retained. If it's not HEAD
> then
> > >>>>>> >>>> do
> > >>>>>>
> > >>>>>> rebase
> > >>>>>>
> > >>>>>> >>>> -i
> > >>>>>> >>>> <previous hash to the one of interest> then mark the one of
> > >>>>>>
> > >>>>>> interest
> > >>>>>> for
> > >>>>>>
> > >>>>>> >>>> comment edit and proceed.
> > >>>>>> >>>>
> > >>>>>> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
> > >>>>>> >>
> > >>>>>> >> <he...@free.fr>wrote:
> > >>>>>> >>>>> IIUC, this is a fix to https://jira.codehaus.org/**
> > >>>>>>
> > >>>>>> browse/MNG-5499
> > >>>>>> <https://jira.codehaus.org/**browse/MNG-5499<
> https://jira.codehaus.o
> > >>>>>> rg/browse/MNG-5499>>>>>>>
> > >>>>>> >>>>> I'm not a git blackbelt: can the comment be updated to add
> the
> > >>>>>>
> > >>>>>> classical
> > >>>>>>
> > >>>>>> >>>>> [MNG-5499]?
> > >>>>>> >>>>> (and next time not be forgotten from initial comment :) )
> > >>>>>> >>>>>
> > >>>>>> >>>>> I'm adding a reference to the commit in the Jira issue
> > >>>>>> >>>>>
> > >>>>>> >>>>> Regards,
> > >>>>>> >>>>>
> > >>>>>> >>>>> Hervé
> > >>>>>> >>>>>
> > >>>>>> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a
> écrit :
> > >>>>>> >>>>>> o change the scope of org.eclipse.sisu to test in the
> > >>>>>> >>>>>
> > >>>>>> >>>>> maven-aether-provider
> > >>>>>> >>>>>
> > >>>>>> >>>>>> to prevent it from leaking out to clients.
> > >>>>>> >>>>>>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> Project:
> > >>>>>> >>>>>> http://git-wip-us.apache.org/****repos/asf/maven/repo
> <http://
> > >>>>>> >>>>>> git-wip-us.apache.org/**repos/asf/maven/repo>>>>>>>
> > >>>>>> <http://**git-wip-us.apache.org/repos/**asf/maven/repo<
> http://git-wip
> > >>>>>> -us.apache.org/repos/asf/maven/repo>>>>>>>
> > >>>>>> >>>>>> Commit:
> > >>>>>>
> http://git-wip-us.apache.org/****repos/asf/maven/commit/****e084ff3b<
> > >>>>>> http://git-wip-us.apache.org/**repos/asf/maven/commit/**e084ff3b>
> > >>>>>> <http://git-wip-us.**apache.org/repos/asf/maven/**commit/e084ff3b
> <ht
> > >>>>>> tp://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b>>>>>>>
> > >>>>>> >>>>>> Tree:
> > >>>>>> >>>>>> http://git-wip-us.apache.org/****<
> http://git-wip-us.apache.or
> > >>>>>> >>>>>> g/**>
> > >>>>>>
> > >>>>>> repos/asf/maven/tree/e084ff3b<**http://git-wip-us.apache.org/**
> > >>>>>> repos/asf/maven/tree/e084ff3b<
> http://git-wip-us.apache.org/repos/asf/
> > >>>>>> maven/tree/e084ff3b>>>>>>>
> > >>>>>> >>>>>> Diff:
> > >>>>>> >>>>>> http://git-wip-us.apache.org/****<
> http://git-wip-us.apache.or
> > >>>>>> >>>>>> g/**>
> > >>>>>>
> > >>>>>> repos/asf/maven/diff/e084ff3b<**http://git-wip-us.apache.org/**
> > >>>>>> repos/asf/maven/diff/e084ff3b<
> http://git-wip-us.apache.org/repos/asf/
> > >>>>>> maven/diff/e084ff3b>>>>>>>
> > >>>>>> >>>>>> Branch: refs/heads/master
> > >>>>>> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8e****c87762d4dc
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> Parents: 0609504
> > >>>>>> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
> > >>>>>> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
> > >>>>>> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
> > >>>>>> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
> > >>>>>>
> > >>>>>>
> ------------------------------****----------------------------**--**
> > >>>>>>
> > >>>>>> ----------
> > >>>>>>
> > >>>>>> >>>>>> maven-aether-provider/pom.xml | 30
> > >>>>>>
> > >>>>>> ++++++++++++++++--------------
> > >>>>>>
> > >>>>>> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
> > >>>>>>
> > >>>>>>
> ------------------------------****----------------------------**--**
> > >>>>>> ----------
> > >>>>>>
> > >>>>>>
> > >>>>>>
> http://git-wip-us.apache.org/****repos/asf/maven/blob/**e084ff3b/**<h
> > >>>>>> ttp://git-wip-us.apache.org/**repos/asf/maven/blob/e084ff3b/**>
> > >>>>>> maven-aether-p<http://git-wip-**us.apache.org/repos/asf/maven/**
> > >>>>>> blob/e084ff3b/maven-aether-p<
> http://git-wip-us.apache.org/repos/asf/m
> > >>>>>> aven/blob/e084ff3b/maven-aether-p>>>>>>>
> > >>>>>> >>>>> rov>>
> > >>>>>> >>>>>
> > >>>>>> >>>>>> ider/pom.xml
> > >>>>>>
> > >>>>>>
> ------------------------------****----------------------------**--**
> > >>>>>> ----------
> > >>>>>>
> > >>>>>> >>>>> diff
> > >>>>>> >>>>>
> > >>>>>> >>>>>> --git a/maven-aether-provider/pom.****xml
> > >>>>>>
> > >>>>>> b/maven-aether-provider/pom.****xml
> > >>>>>>
> > >>>>>> >>>>> index
> > >>>>>> >>>>>
> > >>>>>> >>>>>> 910fab6..9235f1c 100644
> > >>>>>> >>>>>> --- a/maven-aether-provider/pom.****xml
> > >>>>>> >>>>>> +++ b/maven-aether-provider/pom.****xml
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> @@ -63,20 +63,6 @@ under the License.
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> <artifactId>aether-impl</****artifactId>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> </dependency>
> > >>>>>> >>>>>> <dependency>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> - <groupId>org.eclipse.aether</****groupId>
> > >>>>>> >>>>>> - <artifactId>aether-connector-****wagon</artifactId>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> - <scope>test</scope>
> > >>>>>> >>>>>> - </dependency>
> > >>>>>> >>>>>> - <dependency>
> > >>>>>> >>>>>> - <groupId>org.apache.maven.****wagon</groupId>
> > >>>>>> >>>>>> - <artifactId>wagon-file</****artifactId>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> - <scope>test</scope>
> > >>>>>> >>>>>> - </dependency>
> > >>>>>> >>>>>> - <dependency>
> > >>>>>> >>>>>> - <groupId>org.eclipse.sisu</****groupId>
> > >>>>>> >>>>>> - <artifactId>org.eclipse.sisu.****plexus</artifactId>
> > >>>>>> >>>>>> - </dependency>
> > >>>>>> >>>>>> - <dependency>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> <groupId>org.codehaus.plexus</****groupId>
> > >>>>>> >>>>>> <artifactId>plexus-component-***
> > >>>>>>
> > >>>>>> *annotations</artifactId>
> > >>>>>>
> > >>>>>> >>>>>> </dependency>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> @@ -96,6 +82,22 @@ under the License.
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> </exclusion>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> </exclusions>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> </dependency>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> + <!-- Testing -->
> > >>>>>> >>>>>> + <dependency>
> > >>>>>> >>>>>> + <groupId>org.eclipse.aether</****groupId>
> > >>>>>> >>>>>> + <artifactId>aether-connector-****wagon</artifactId>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> + <scope>test</scope>
> > >>>>>> >>>>>> + </dependency>
> > >>>>>> >>>>>> + <dependency>
> > >>>>>> >>>>>> + <groupId>org.apache.maven.****wagon</groupId>
> > >>>>>> >>>>>> + <artifactId>wagon-file</****artifactId>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> + <scope>test</scope>
> > >>>>>> >>>>>> + </dependency>
> > >>>>>> >>>>>> + <dependency>
> > >>>>>> >>>>>> + <groupId>org.eclipse.sisu</****groupId>
> > >>>>>> >>>>>> + <artifactId>org.eclipse.sisu.****plexus</artifactId>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> + <scope>test</scope>
> > >>>>>> >>>>>> + </dependency>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> </dependencies>
> > >>>>>> >>>>>>
> > >>>>>> >>>>>> <build>
> > >>>>>> >>>>>
> > >>>>>> >>>>>
> ------------------------------****----------------------------*
> > >>>>>>
> > >>>>>> *--**
> > >>>>>> ---------
> > >>>>>>
> > >>>>>> >>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.
> ****org<
> > >>>>>>
> > >>>>>> dev-unsubscribe@maven.**apache.org <
> dev-unsubscribe@maven.apache.org>
> > >>>>>>
> > >>>>>> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
> > >>>>>> >>
> > >>>>>> >>
> ------------------------------****----------------------------**
> > >>>>>>
> > >>>>>> --**
> > >>>>>> ---------
> > >>>>>>
> > >>>>>> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
> > >>>>>>
> > >>>>>> dev-unsubscribe@maven.**apache.org <
> dev-unsubscribe@maven.apache.org>
> > >>>>>>
> > >>>>>> >> For additional commands, e-mail: dev-help@maven.apache.org
> > >>>>>> >
> > >>>>>> > ------------------------------****----------------------------**
> > >>>>>>
> > >>>>>> --**
> > >>>>>> ---------
> > >>>>>>
> > >>>>>> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
> > >>>>>>
> > >>>>>> dev-unsubscribe@maven.**apache.org <
> dev-unsubscribe@maven.apache.org>
> > >>>>>>
> > >>>>>> > For additional commands, e-mail: dev-help@maven.apache.org
> > >>>>>>
> > >>>>>>
> ------------------------------****----------------------------**--**
> > >>>>>> ---------
> > >>>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
> > >>>>>> dev-unsubscribe@maven.**apache.org <
> dev-unsubscribe@maven.apache.org>
> > >>>>>>
> > >>>>>>
> > >>>>>> For additional commands, e-mail: dev-help@maven.apache.org
> > >>>>>>
> > >>>>>> ------------------------------****----------------------------**
> > >>>>
> > >>>> --**---------
> > >>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
> > >>>> dev-unsubscribe@maven.**apache.org <
> dev-unsubscribe@maven.apache.org>>
> > >>>>
> > >>>> For additional commands, e-mail: dev-help@maven.apache.org
> > >>>
> > >>> ------------------------------****----------------------------**
> > >>> --**---------
> > >>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
> > >>> dev-unsubscribe@maven.**apache.org <dev-unsubscribe@maven.apache.org
> >>
> > >>>
> > >>> For additional commands, e-mail: dev-help@maven.apache.org
> > >
> > >
> ------------------------------**------------------------------**---------
> > > To unsubscribe, e-mail:
> > > dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
> For
> > > additional commands, e-mail: dev-help@maven.apache.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Hervé BOUTEMY <he...@free.fr>.
so, this time:
svn +1
git -1
:)
more seriously: if we cannot fix comments later, we'll need to be more careful
when committing
Regards,
Hervé
Le samedi 27 juillet 2013 16:27:50 Fred Cooke a écrit :
> How did I know you'd say that? You think I didn't know you could do that?
> LOL :-p
>
> Can't do it without bad config and/or administrator privileges. There,
> fixed.
>
> Fred.
>
> On Sat, Jul 27, 2013 at 4:22 PM, Robert Scholte <rf...@apache.org>wrote:
> > "With SVN changing a bad comment wasn't even possible"
> >
> > Yes it is, I've done it very often:
> > http://subversion.apache.org/**faq.html#change-log-msg<http://subversion.a
> > pache.org/faq.html#change-log-msg> (although I use the GUI for it)
> >
> > Robert
> >
> > Op Sat, 27 Jul 2013 16:07:09 +0200 schreef Fred Cooke <
> >
> > fred.cooke@gmail.com>:
> > Good practice is to work on a branch anyway, then you're free to do
> >
> >> whatever you wish. I have ~30 branches in my private copy of my project
> >> right now. When one matures I rebase it onto the latest public, then
> >> publish it. Then I rebase the others periodically up onto the latest
> >> public
> >> too. Wash rinse repeat.
> >>
> >> With SVN changing a bad comment wasn't even possible, so stating "no
> >> amending master" isn't really a restriction at all. It's just good
> >> practice.
> >>
> >> Fred.
> >>
> >> On Sat, Jul 27, 2013 at 4:00 PM, Robert Scholte <rfscholte@apache.org
> >>
> >> >wrote:
> >> I'm actually kind of surprised. I'm learning my co-workers that comments
> >>
> >>> are very important. With a buildserver it has become very easy to have
> >>> an
> >>> overview of the latest commits and understand what broke the build.
> >>> Writing good comments should help everybody to understand why a commit
> >>> is
> >>> done (yes: why. Not 'what', that's already easy to figure out). So I'm
> >>> really in favor to being able change comments, because bad comments are
> >>> sometimes even worse than no comments.
> >>>
> >>> Just like Hervé, I'd really prefer to see if a commit is done for a
> >>> specific issue or not. In this case I would have liked to see a fix on
> >>> the
> >>> comment if possible, because the current comment is incomplete.
> >>>
> >>> Anyhow, now I know about this.
> >>>
> >>> Robert
> >>>
> >>>
> >>> Op Sat, 27 Jul 2013 15:40:05 +0200 schreef Jeff Jensen <jeffjensen@**
> >>> upstairstechnology.com
> >>> <je...@upstairstechnology.com>>>>
> >>> On Sat, Jul 27, 2013 at 8:38 AM, Fred Cooke <fr...@gmail.com>
> >>>
> >>> wrote:
> >>>> On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier <aheritier@gmail.com
> >>>>
> >>>>> >wrote:
> >>>>> At Apache it is forbidden to rewrite the history of the master
> >>>>> branch.
> >>>>>
> >>>>>> Which isn't so bad.
> >>>>>>
> >>>>>> Ahh, this is a very sound policy! Someone is switched on! :-)
> >>>>
> >>>> Yes, very good!
> >>>>
> >>>> ---------
> >>>>
> >>>>> Arnaud
> >>>>>
> >>>>>> Le 27 juil. 2013 à 15:19, Jeff Jensen
> >>>>>> <jeffjensen@**upstairstechnolo**gy.com<http://upstairstechnology.com>
> >>>>>> <jeffjensen@**upstairstechnology.com<jeffjensen@upstairstechnology.co
> >>>>>> m>
> >>>>>>
> >>>>>> a écrit :
> >>>>>> > That message indicates you need to git pull first. Even though you
> >>>>>> > may already have done so and no one else has pushed since, this
> >>>>>>
> >>>>>> usually
> >>>>>>
> >>>>>> > happens when modifying a commit that has been pushed/shared.
> >>>>>> >
> >>>>>> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <
> >>>>>>
> >>>>>> herve.boutemy@free.fr
> >>>>>>
> >>>>>> wrote:
> >>>>>> >> the last 2 commits are to be amended: lst one for MNG-5499,
> >>>>>>
> >>>>>> previous
> >>>>>> one for
> >>>>>>
> >>>>>> >> MNG-5495
> >>>>>> >>
> >>>>>> >> I tried git commit --amend -m "[MNG-5499]..." for the last one,
> >>>>>> >> but
> >>>>>>
> >>>>>> when I git
> >>>>>>
> >>>>>> >> push, I get
> >>>>>> >>
> >>>>>> >> To
> >>>>>> >> https://git-wip-us.apache.org/****repos/asf/maven.git<https://git
> >>>>>> >> -wip-us.apache.org/**repos/asf/maven.git>>>>>>>
> >>>>>> <https://**git-wip-us.apache.org/repos/**asf/maven.git<https://git-wi
> >>>>>> p-us.apache.org/repos/asf/maven.git>>>>>>>
> >>>>>> >> ! [rejected] master -> master (non-fast-forward)
> >>>>>> >> error: failed to push some refs to '
> >>>>>>
> >>>>>> https://git-wip-us.apache.org/****repos/asf/maven.git<https://git-wip
> >>>>>> -us.apache.org/**repos/asf/maven.git>
> >>>>>> <https://**git-wip-us.apache.org/repos/**asf/maven.git<https://git-w
> >>>>>> ip-us.apache.org/repos/asf/maven.git>
> >>>>>>
> >>>>>>
> >>>>>> '
> >>>>>>
> >>>>>> >> hint: Updates were rejected because the tip of your current branch
> >>>>>>
> >>>>>> is
> >>>>>> behind
> >>>>>>
> >>>>>> >> hint: its remote counterpart. Merge the remote changes (e.g. 'git
> >>>>>>
> >>>>>> pull')
> >>>>>>
> >>>>>> >> hint: before pushing again.
> >>>>>> >> hint: See the 'Note about fast-forwards' in 'git push --help' for
> >>>>>>
> >>>>>> details.
> >>>>>>
> >>>>>> >> Did I do something wrong? Or git repo at ASF is configured to
> >>>>>> >> avoid
> >>>>>>
> >>>>>> such
> >>>>>>
> >>>>>> >> things?
> >>>>>> >>
> >>>>>> >> Regards,
> >>>>>> >>
> >>>>>> >> Hervé
> >>>>>> >>
> >>>>>> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
> >>>>>> >>> Of course, if anyone is working down stream of this, they will
> >>>>>>
> >>>>>> hate
> >>>>>> you,
> >>>>>>
> >>>>>> >>> and it should be left as is.
> >>>>>> >>>
> >>>>>> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fred.cooke@gmail.com
> >>>>>>
> >>>>>> wrote:
> >>>>>> >>>> Yes, easily, if it's the HEAD just do a --amend on it and update
> >>>>>>
> >>>>>> it
> >>>>>>
> >>>>>> >>>> yourself, Jason's name will be retained. If it's not HEAD then
> >>>>>> >>>> do
> >>>>>>
> >>>>>> rebase
> >>>>>>
> >>>>>> >>>> -i
> >>>>>> >>>> <previous hash to the one of interest> then mark the one of
> >>>>>>
> >>>>>> interest
> >>>>>> for
> >>>>>>
> >>>>>> >>>> comment edit and proceed.
> >>>>>> >>>>
> >>>>>> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
> >>>>>> >>
> >>>>>> >> <he...@free.fr>wrote:
> >>>>>> >>>>> IIUC, this is a fix to https://jira.codehaus.org/**
> >>>>>>
> >>>>>> browse/MNG-5499
> >>>>>> <https://jira.codehaus.org/**browse/MNG-5499<https://jira.codehaus.o
> >>>>>> rg/browse/MNG-5499>>>>>>>
> >>>>>> >>>>> I'm not a git blackbelt: can the comment be updated to add the
> >>>>>>
> >>>>>> classical
> >>>>>>
> >>>>>> >>>>> [MNG-5499]?
> >>>>>> >>>>> (and next time not be forgotten from initial comment :) )
> >>>>>> >>>>>
> >>>>>> >>>>> I'm adding a reference to the commit in the Jira issue
> >>>>>> >>>>>
> >>>>>> >>>>> Regards,
> >>>>>> >>>>>
> >>>>>> >>>>> Hervé
> >>>>>> >>>>>
> >>>>>> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
> >>>>>> >>>>>> o change the scope of org.eclipse.sisu to test in the
> >>>>>> >>>>>
> >>>>>> >>>>> maven-aether-provider
> >>>>>> >>>>>
> >>>>>> >>>>>> to prevent it from leaking out to clients.
> >>>>>> >>>>>>
> >>>>>> >>>>>>
> >>>>>> >>>>>> Project:
> >>>>>> >>>>>> http://git-wip-us.apache.org/****repos/asf/maven/repo<http://
> >>>>>> >>>>>> git-wip-us.apache.org/**repos/asf/maven/repo>>>>>>>
> >>>>>> <http://**git-wip-us.apache.org/repos/**asf/maven/repo<http://git-wip
> >>>>>> -us.apache.org/repos/asf/maven/repo>>>>>>>
> >>>>>> >>>>>> Commit:
> >>>>>> http://git-wip-us.apache.org/****repos/asf/maven/commit/****e084ff3b<
> >>>>>> http://git-wip-us.apache.org/**repos/asf/maven/commit/**e084ff3b>
> >>>>>> <http://git-wip-us.**apache.org/repos/asf/maven/**commit/e084ff3b<ht
> >>>>>> tp://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b>>>>>>>
> >>>>>> >>>>>> Tree:
> >>>>>> >>>>>> http://git-wip-us.apache.org/****<http://git-wip-us.apache.or
> >>>>>> >>>>>> g/**>
> >>>>>>
> >>>>>> repos/asf/maven/tree/e084ff3b<**http://git-wip-us.apache.org/**
> >>>>>> repos/asf/maven/tree/e084ff3b<http://git-wip-us.apache.org/repos/asf/
> >>>>>> maven/tree/e084ff3b>>>>>>>
> >>>>>> >>>>>> Diff:
> >>>>>> >>>>>> http://git-wip-us.apache.org/****<http://git-wip-us.apache.or
> >>>>>> >>>>>> g/**>
> >>>>>>
> >>>>>> repos/asf/maven/diff/e084ff3b<**http://git-wip-us.apache.org/**
> >>>>>> repos/asf/maven/diff/e084ff3b<http://git-wip-us.apache.org/repos/asf/
> >>>>>> maven/diff/e084ff3b>>>>>>>
> >>>>>> >>>>>> Branch: refs/heads/master
> >>>>>> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8e****c87762d4dc
> >>>>>> >>>>>>
> >>>>>> >>>>>> Parents: 0609504
> >>>>>> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
> >>>>>> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
> >>>>>> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
> >>>>>> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
> >>>>>>
> >>>>>> ------------------------------****----------------------------**--**
> >>>>>>
> >>>>>> ----------
> >>>>>>
> >>>>>> >>>>>> maven-aether-provider/pom.xml | 30
> >>>>>>
> >>>>>> ++++++++++++++++--------------
> >>>>>>
> >>>>>> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
> >>>>>>
> >>>>>> ------------------------------****----------------------------**--**
> >>>>>> ----------
> >>>>>>
> >>>>>>
> >>>>>> http://git-wip-us.apache.org/****repos/asf/maven/blob/**e084ff3b/**<h
> >>>>>> ttp://git-wip-us.apache.org/**repos/asf/maven/blob/e084ff3b/**>
> >>>>>> maven-aether-p<http://git-wip-**us.apache.org/repos/asf/maven/**
> >>>>>> blob/e084ff3b/maven-aether-p<http://git-wip-us.apache.org/repos/asf/m
> >>>>>> aven/blob/e084ff3b/maven-aether-p>>>>>>>
> >>>>>> >>>>> rov>>
> >>>>>> >>>>>
> >>>>>> >>>>>> ider/pom.xml
> >>>>>>
> >>>>>> ------------------------------****----------------------------**--**
> >>>>>> ----------
> >>>>>>
> >>>>>> >>>>> diff
> >>>>>> >>>>>
> >>>>>> >>>>>> --git a/maven-aether-provider/pom.****xml
> >>>>>>
> >>>>>> b/maven-aether-provider/pom.****xml
> >>>>>>
> >>>>>> >>>>> index
> >>>>>> >>>>>
> >>>>>> >>>>>> 910fab6..9235f1c 100644
> >>>>>> >>>>>> --- a/maven-aether-provider/pom.****xml
> >>>>>> >>>>>> +++ b/maven-aether-provider/pom.****xml
> >>>>>> >>>>>>
> >>>>>> >>>>>> @@ -63,20 +63,6 @@ under the License.
> >>>>>> >>>>>>
> >>>>>> >>>>>> <artifactId>aether-impl</****artifactId>
> >>>>>> >>>>>>
> >>>>>> >>>>>> </dependency>
> >>>>>> >>>>>> <dependency>
> >>>>>> >>>>>>
> >>>>>> >>>>>> - <groupId>org.eclipse.aether</****groupId>
> >>>>>> >>>>>> - <artifactId>aether-connector-****wagon</artifactId>
> >>>>>> >>>>>>
> >>>>>> >>>>>> - <scope>test</scope>
> >>>>>> >>>>>> - </dependency>
> >>>>>> >>>>>> - <dependency>
> >>>>>> >>>>>> - <groupId>org.apache.maven.****wagon</groupId>
> >>>>>> >>>>>> - <artifactId>wagon-file</****artifactId>
> >>>>>> >>>>>>
> >>>>>> >>>>>> - <scope>test</scope>
> >>>>>> >>>>>> - </dependency>
> >>>>>> >>>>>> - <dependency>
> >>>>>> >>>>>> - <groupId>org.eclipse.sisu</****groupId>
> >>>>>> >>>>>> - <artifactId>org.eclipse.sisu.****plexus</artifactId>
> >>>>>> >>>>>> - </dependency>
> >>>>>> >>>>>> - <dependency>
> >>>>>> >>>>>>
> >>>>>> >>>>>> <groupId>org.codehaus.plexus</****groupId>
> >>>>>> >>>>>> <artifactId>plexus-component-***
> >>>>>>
> >>>>>> *annotations</artifactId>
> >>>>>>
> >>>>>> >>>>>> </dependency>
> >>>>>> >>>>>>
> >>>>>> >>>>>> @@ -96,6 +82,22 @@ under the License.
> >>>>>> >>>>>>
> >>>>>> >>>>>> </exclusion>
> >>>>>> >>>>>>
> >>>>>> >>>>>> </exclusions>
> >>>>>> >>>>>>
> >>>>>> >>>>>> </dependency>
> >>>>>> >>>>>>
> >>>>>> >>>>>> + <!-- Testing -->
> >>>>>> >>>>>> + <dependency>
> >>>>>> >>>>>> + <groupId>org.eclipse.aether</****groupId>
> >>>>>> >>>>>> + <artifactId>aether-connector-****wagon</artifactId>
> >>>>>> >>>>>>
> >>>>>> >>>>>> + <scope>test</scope>
> >>>>>> >>>>>> + </dependency>
> >>>>>> >>>>>> + <dependency>
> >>>>>> >>>>>> + <groupId>org.apache.maven.****wagon</groupId>
> >>>>>> >>>>>> + <artifactId>wagon-file</****artifactId>
> >>>>>> >>>>>>
> >>>>>> >>>>>> + <scope>test</scope>
> >>>>>> >>>>>> + </dependency>
> >>>>>> >>>>>> + <dependency>
> >>>>>> >>>>>> + <groupId>org.eclipse.sisu</****groupId>
> >>>>>> >>>>>> + <artifactId>org.eclipse.sisu.****plexus</artifactId>
> >>>>>> >>>>>>
> >>>>>> >>>>>> + <scope>test</scope>
> >>>>>> >>>>>> + </dependency>
> >>>>>> >>>>>>
> >>>>>> >>>>>> </dependencies>
> >>>>>> >>>>>>
> >>>>>> >>>>>> <build>
> >>>>>> >>>>>
> >>>>>> >>>>> ------------------------------****----------------------------*
> >>>>>>
> >>>>>> *--**
> >>>>>> ---------
> >>>>>>
> >>>>>> >>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
> >>>>>>
> >>>>>> dev-unsubscribe@maven.**apache.org <de...@maven.apache.org>
> >>>>>>
> >>>>>> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
> >>>>>> >>
> >>>>>> >> ------------------------------****----------------------------**
> >>>>>>
> >>>>>> --**
> >>>>>> ---------
> >>>>>>
> >>>>>> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
> >>>>>>
> >>>>>> dev-unsubscribe@maven.**apache.org <de...@maven.apache.org>
> >>>>>>
> >>>>>> >> For additional commands, e-mail: dev-help@maven.apache.org
> >>>>>> >
> >>>>>> > ------------------------------****----------------------------**
> >>>>>>
> >>>>>> --**
> >>>>>> ---------
> >>>>>>
> >>>>>> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
> >>>>>>
> >>>>>> dev-unsubscribe@maven.**apache.org <de...@maven.apache.org>
> >>>>>>
> >>>>>> > For additional commands, e-mail: dev-help@maven.apache.org
> >>>>>>
> >>>>>> ------------------------------****----------------------------**--**
> >>>>>> ---------
> >>>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
> >>>>>> dev-unsubscribe@maven.**apache.org <de...@maven.apache.org>
> >>>>>>
> >>>>>>
> >>>>>> For additional commands, e-mail: dev-help@maven.apache.org
> >>>>>>
> >>>>>> ------------------------------****----------------------------**
> >>>>
> >>>> --**---------
> >>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
> >>>> dev-unsubscribe@maven.**apache.org <de...@maven.apache.org>>
> >>>>
> >>>> For additional commands, e-mail: dev-help@maven.apache.org
> >>>
> >>> ------------------------------****----------------------------**
> >>> --**---------
> >>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
> >>> dev-unsubscribe@maven.**apache.org <de...@maven.apache.org>>
> >>>
> >>> For additional commands, e-mail: dev-help@maven.apache.org
> >
> > ------------------------------**------------------------------**---------
> > To unsubscribe, e-mail:
> > dev-unsubscribe@maven.apache.**org<de...@maven.apache.org> For
> > additional commands, e-mail: dev-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Fred Cooke <fr...@gmail.com>.
How did I know you'd say that? You think I didn't know you could do that?
LOL :-p
Can't do it without bad config and/or administrator privileges. There,
fixed.
Fred.
On Sat, Jul 27, 2013 at 4:22 PM, Robert Scholte <rf...@apache.org>wrote:
> "With SVN changing a bad comment wasn't even possible"
>
> Yes it is, I've done it very often:
> http://subversion.apache.org/**faq.html#change-log-msg<http://subversion.apache.org/faq.html#change-log-msg>
> (although I use the GUI for it)
>
> Robert
>
> Op Sat, 27 Jul 2013 16:07:09 +0200 schreef Fred Cooke <
> fred.cooke@gmail.com>:
>
> Good practice is to work on a branch anyway, then you're free to do
>> whatever you wish. I have ~30 branches in my private copy of my project
>> right now. When one matures I rebase it onto the latest public, then
>> publish it. Then I rebase the others periodically up onto the latest
>> public
>> too. Wash rinse repeat.
>>
>> With SVN changing a bad comment wasn't even possible, so stating "no
>> amending master" isn't really a restriction at all. It's just good
>> practice.
>>
>> Fred.
>>
>> On Sat, Jul 27, 2013 at 4:00 PM, Robert Scholte <rfscholte@apache.org
>> >wrote:
>>
>> I'm actually kind of surprised. I'm learning my co-workers that comments
>>> are very important. With a buildserver it has become very easy to have an
>>> overview of the latest commits and understand what broke the build.
>>> Writing good comments should help everybody to understand why a commit is
>>> done (yes: why. Not 'what', that's already easy to figure out). So I'm
>>> really in favor to being able change comments, because bad comments are
>>> sometimes even worse than no comments.
>>>
>>> Just like Hervé, I'd really prefer to see if a commit is done for a
>>> specific issue or not. In this case I would have liked to see a fix on
>>> the
>>> comment if possible, because the current comment is incomplete.
>>>
>>> Anyhow, now I know about this.
>>>
>>> Robert
>>>
>>>
>>> Op Sat, 27 Jul 2013 15:40:05 +0200 schreef Jeff Jensen <jeffjensen@**
>>> upstairstechnology.com <je...@upstairstechnology.com>
>>> >>:
>>>
>>>
>>>
>>> On Sat, Jul 27, 2013 at 8:38 AM, Fred Cooke <fr...@gmail.com>
>>> wrote:
>>>
>>>>
>>>> On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier <aheritier@gmail.com
>>>>> >wrote:
>>>>>
>>>>> At Apache it is forbidden to rewrite the history of the master branch.
>>>>>
>>>>>> Which isn't so bad.
>>>>>>
>>>>>>
>>>>>> Ahh, this is a very sound policy! Someone is switched on! :-)
>>>>>
>>>>>
>>>> Yes, very good!
>>>>
>>>>
>>>> ---------
>>>>
>>>>> Arnaud
>>>>>>
>>>>>> Le 27 juil. 2013 à 15:19, Jeff Jensen
>>>>>> <jeffjensen@**upstairstechnolo**gy.com<http://upstairstechnology.com>
>>>>>> <je...@upstairstechnology.com>
>>>>>> >>
>>>>>>
>>>>>> a écrit :
>>>>>>
>>>>>> > That message indicates you need to git pull first. Even though you
>>>>>> > may already have done so and no one else has pushed since, this
>>>>>> usually
>>>>>> > happens when modifying a commit that has been pushed/shared.
>>>>>> >
>>>>>> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <
>>>>>> herve.boutemy@free.fr
>>>>>> >
>>>>>> wrote:
>>>>>> >> the last 2 commits are to be amended: lst one for MNG-5499,
>>>>>> previous
>>>>>> one for
>>>>>> >> MNG-5495
>>>>>> >>
>>>>>> >> I tried git commit --amend -m "[MNG-5499]..." for the last one, but
>>>>>> when I git
>>>>>> >> push, I get
>>>>>> >>
>>>>>> >> To https://git-wip-us.apache.org/****repos/asf/maven.git<https://git-wip-us.apache.org/**repos/asf/maven.git>
>>>>>> <https://**git-wip-us.apache.org/repos/**asf/maven.git<https://git-wip-us.apache.org/repos/asf/maven.git>
>>>>>> >
>>>>>>
>>>>>> >> ! [rejected] master -> master (non-fast-forward)
>>>>>> >> error: failed to push some refs to '
>>>>>> https://git-wip-us.apache.org/****repos/asf/maven.git<https://git-wip-us.apache.org/**repos/asf/maven.git>
>>>>>> <https://**git-wip-us.apache.org/repos/**asf/maven.git<https://git-wip-us.apache.org/repos/asf/maven.git>
>>>>>> >
>>>>>>
>>>>>> '
>>>>>> >> hint: Updates were rejected because the tip of your current branch
>>>>>> is
>>>>>> behind
>>>>>> >> hint: its remote counterpart. Merge the remote changes (e.g. 'git
>>>>>> pull')
>>>>>> >> hint: before pushing again.
>>>>>> >> hint: See the 'Note about fast-forwards' in 'git push --help' for
>>>>>> details.
>>>>>> >>
>>>>>> >>
>>>>>> >> Did I do something wrong? Or git repo at ASF is configured to avoid
>>>>>> such
>>>>>> >> things?
>>>>>> >>
>>>>>> >> Regards,
>>>>>> >>
>>>>>> >> Hervé
>>>>>> >>
>>>>>> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
>>>>>> >>> Of course, if anyone is working down stream of this, they will
>>>>>> hate
>>>>>> you,
>>>>>> >>> and it should be left as is.
>>>>>> >>>
>>>>>> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fred.cooke@gmail.com
>>>>>> >
>>>>>> wrote:
>>>>>> >>>> Yes, easily, if it's the HEAD just do a --amend on it and update
>>>>>> it
>>>>>> >>>> yourself, Jason's name will be retained. If it's not HEAD then do
>>>>>> rebase
>>>>>> >>>> -i
>>>>>> >>>> <previous hash to the one of interest> then mark the one of
>>>>>> interest
>>>>>> for
>>>>>> >>>> comment edit and proceed.
>>>>>> >>>>
>>>>>> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
>>>>>> >> <he...@free.fr>wrote:
>>>>>> >>>>> IIUC, this is a fix to https://jira.codehaus.org/**
>>>>>> browse/MNG-5499 <https://jira.codehaus.org/**browse/MNG-5499<https://jira.codehaus.org/browse/MNG-5499>
>>>>>> >
>>>>>>
>>>>>> >>>>>
>>>>>> >>>>> I'm not a git blackbelt: can the comment be updated to add the
>>>>>> classical
>>>>>> >>>>> [MNG-5499]?
>>>>>> >>>>> (and next time not be forgotten from initial comment :) )
>>>>>> >>>>>
>>>>>> >>>>> I'm adding a reference to the commit in the Jira issue
>>>>>> >>>>>
>>>>>> >>>>> Regards,
>>>>>> >>>>>
>>>>>> >>>>> Hervé
>>>>>> >>>>>
>>>>>> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
>>>>>> >>>>>> o change the scope of org.eclipse.sisu to test in the
>>>>>> >>>>>
>>>>>> >>>>> maven-aether-provider
>>>>>> >>>>>
>>>>>> >>>>>> to prevent it from leaking out to clients.
>>>>>> >>>>>>
>>>>>> >>>>>>
>>>>>> >>>>>> Project: http://git-wip-us.apache.org/****repos/asf/maven/repo<http://git-wip-us.apache.org/**repos/asf/maven/repo>
>>>>>> <http://**git-wip-us.apache.org/repos/**asf/maven/repo<http://git-wip-us.apache.org/repos/asf/maven/repo>
>>>>>> >
>>>>>> >>>>>> Commit:
>>>>>> http://git-wip-us.apache.org/****repos/asf/maven/commit/****e084ff3b<http://git-wip-us.apache.org/**repos/asf/maven/commit/**e084ff3b>
>>>>>> <http://git-wip-us.**apache.org/repos/asf/maven/**commit/e084ff3b<http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b>
>>>>>> >
>>>>>> >>>>>> Tree: http://git-wip-us.apache.org/****<http://git-wip-us.apache.org/**>
>>>>>> repos/asf/maven/tree/e084ff3b<**http://git-wip-us.apache.org/**
>>>>>> repos/asf/maven/tree/e084ff3b<http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b>
>>>>>> >
>>>>>> >>>>>> Diff: http://git-wip-us.apache.org/****<http://git-wip-us.apache.org/**>
>>>>>> repos/asf/maven/diff/e084ff3b<**http://git-wip-us.apache.org/**
>>>>>> repos/asf/maven/diff/e084ff3b<http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b>
>>>>>> >
>>>>>> >>>>>>
>>>>>> >>>>>> Branch: refs/heads/master
>>>>>> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8e****c87762d4dc
>>>>>>
>>>>>> >>>>>> Parents: 0609504
>>>>>> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
>>>>>> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
>>>>>> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
>>>>>> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
>>>>>> >>>>>>
>>>>>> >>>>>>
>>>>>> ------------------------------****----------------------------**--**
>>>>>>
>>>>>> ----------
>>>>>> >>>>>>
>>>>>> >>>>>> maven-aether-provider/pom.xml | 30
>>>>>> ++++++++++++++++--------------
>>>>>> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
>>>>>> >>>>>>
>>>>>> >>>>>>
>>>>>> ------------------------------****----------------------------**--**
>>>>>> ----------
>>>>>> >>>>>
>>>>>> >>>>>
>>>>>> http://git-wip-us.apache.org/****repos/asf/maven/blob/**e084ff3b/**<http://git-wip-us.apache.org/**repos/asf/maven/blob/e084ff3b/**>
>>>>>> maven-aether-p<http://git-wip-**us.apache.org/repos/asf/maven/**
>>>>>> blob/e084ff3b/maven-aether-p<http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-p>
>>>>>> >
>>>>>> >>>>> rov>>
>>>>>> >>>>>> ider/pom.xml
>>>>>> >>>>>>
>>>>>> ------------------------------****----------------------------**--**
>>>>>> ----------
>>>>>> >>>>>
>>>>>> >>>>> diff
>>>>>> >>>>>
>>>>>> >>>>>> --git a/maven-aether-provider/pom.****xml
>>>>>> b/maven-aether-provider/pom.****xml
>>>>>> >>>>>
>>>>>> >>>>> index
>>>>>> >>>>>
>>>>>> >>>>>> 910fab6..9235f1c 100644
>>>>>> >>>>>> --- a/maven-aether-provider/pom.****xml
>>>>>> >>>>>> +++ b/maven-aether-provider/pom.****xml
>>>>>>
>>>>>> >>>>>> @@ -63,20 +63,6 @@ under the License.
>>>>>> >>>>>>
>>>>>> >>>>>> <artifactId>aether-impl</****artifactId>
>>>>>> >>>>>>
>>>>>> >>>>>> </dependency>
>>>>>> >>>>>> <dependency>
>>>>>> >>>>>>
>>>>>> >>>>>> - <groupId>org.eclipse.aether</****groupId>
>>>>>> >>>>>> - <artifactId>aether-connector-****wagon</artifactId>
>>>>>>
>>>>>> >>>>>> - <scope>test</scope>
>>>>>> >>>>>> - </dependency>
>>>>>> >>>>>> - <dependency>
>>>>>> >>>>>> - <groupId>org.apache.maven.****wagon</groupId>
>>>>>> >>>>>> - <artifactId>wagon-file</****artifactId>
>>>>>>
>>>>>> >>>>>> - <scope>test</scope>
>>>>>> >>>>>> - </dependency>
>>>>>> >>>>>> - <dependency>
>>>>>> >>>>>> - <groupId>org.eclipse.sisu</****groupId>
>>>>>> >>>>>> - <artifactId>org.eclipse.sisu.****plexus</artifactId>
>>>>>> >>>>>> - </dependency>
>>>>>> >>>>>> - <dependency>
>>>>>> >>>>>>
>>>>>> >>>>>> <groupId>org.codehaus.plexus</****groupId>
>>>>>> >>>>>> <artifactId>plexus-component-***
>>>>>> *annotations</artifactId>
>>>>>>
>>>>>> >>>>>>
>>>>>> >>>>>> </dependency>
>>>>>> >>>>>>
>>>>>> >>>>>> @@ -96,6 +82,22 @@ under the License.
>>>>>> >>>>>>
>>>>>> >>>>>> </exclusion>
>>>>>> >>>>>>
>>>>>> >>>>>> </exclusions>
>>>>>> >>>>>>
>>>>>> >>>>>> </dependency>
>>>>>> >>>>>>
>>>>>> >>>>>> + <!-- Testing -->
>>>>>> >>>>>> + <dependency>
>>>>>> >>>>>> + <groupId>org.eclipse.aether</****groupId>
>>>>>> >>>>>> + <artifactId>aether-connector-****wagon</artifactId>
>>>>>>
>>>>>> >>>>>> + <scope>test</scope>
>>>>>> >>>>>> + </dependency>
>>>>>> >>>>>> + <dependency>
>>>>>> >>>>>> + <groupId>org.apache.maven.****wagon</groupId>
>>>>>> >>>>>> + <artifactId>wagon-file</****artifactId>
>>>>>>
>>>>>> >>>>>> + <scope>test</scope>
>>>>>> >>>>>> + </dependency>
>>>>>> >>>>>> + <dependency>
>>>>>> >>>>>> + <groupId>org.eclipse.sisu</****groupId>
>>>>>> >>>>>> + <artifactId>org.eclipse.sisu.****plexus</artifactId>
>>>>>>
>>>>>> >>>>>> + <scope>test</scope>
>>>>>> >>>>>> + </dependency>
>>>>>> >>>>>>
>>>>>> >>>>>> </dependencies>
>>>>>> >>>>>>
>>>>>> >>>>>> <build>
>>>>>> >>>>>
>>>>>> >>>>> ------------------------------****----------------------------*
>>>>>> *--**
>>>>>> ---------
>>>>>> >>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>>>>>> dev-unsubscribe@maven.**apache.org <de...@maven.apache.org>
>>>>>> >
>>>>>>
>>>>>> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
>>>>>> >>
>>>>>> >> ------------------------------****----------------------------**
>>>>>> --**
>>>>>> ---------
>>>>>> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>>>>>> dev-unsubscribe@maven.**apache.org <de...@maven.apache.org>
>>>>>> >
>>>>>>
>>>>>> >> For additional commands, e-mail: dev-help@maven.apache.org
>>>>>> >
>>>>>> > ------------------------------****----------------------------**
>>>>>> --**
>>>>>> ---------
>>>>>> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>>>>>> dev-unsubscribe@maven.**apache.org <de...@maven.apache.org>
>>>>>> >
>>>>>>
>>>>>> > For additional commands, e-mail: dev-help@maven.apache.org
>>>>>> >
>>>>>>
>>>>>> ------------------------------****----------------------------**--**
>>>>>> ---------
>>>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>>>>>> dev-unsubscribe@maven.**apache.org <de...@maven.apache.org>
>>>>>> >
>>>>>>
>>>>>> For additional commands, e-mail: dev-help@maven.apache.org
>>>>>>
>>>>>>
>>>>>>
>>>>>> ------------------------------****----------------------------**
>>>> --**---------
>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>>>> dev-unsubscribe@maven.**apache.org <de...@maven.apache.org>>
>>>>
>>>> For additional commands, e-mail: dev-help@maven.apache.org
>>>>
>>>>
>>> ------------------------------****----------------------------**
>>> --**---------
>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.****org<
>>> dev-unsubscribe@maven.**apache.org <de...@maven.apache.org>>
>>>
>>> For additional commands, e-mail: dev-help@maven.apache.org
>>>
>>>
> ------------------------------**------------------------------**---------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Robert Scholte <rf...@apache.org>.
"With SVN changing a bad comment wasn't even possible"
Yes it is, I've done it very often:
http://subversion.apache.org/faq.html#change-log-msg
(although I use the GUI for it)
Robert
Op Sat, 27 Jul 2013 16:07:09 +0200 schreef Fred Cooke
<fr...@gmail.com>:
> Good practice is to work on a branch anyway, then you're free to do
> whatever you wish. I have ~30 branches in my private copy of my project
> right now. When one matures I rebase it onto the latest public, then
> publish it. Then I rebase the others periodically up onto the latest
> public
> too. Wash rinse repeat.
>
> With SVN changing a bad comment wasn't even possible, so stating "no
> amending master" isn't really a restriction at all. It's just good
> practice.
>
> Fred.
>
> On Sat, Jul 27, 2013 at 4:00 PM, Robert Scholte
> <rf...@apache.org>wrote:
>
>> I'm actually kind of surprised. I'm learning my co-workers that comments
>> are very important. With a buildserver it has become very easy to have
>> an
>> overview of the latest commits and understand what broke the build.
>> Writing good comments should help everybody to understand why a commit
>> is
>> done (yes: why. Not 'what', that's already easy to figure out). So I'm
>> really in favor to being able change comments, because bad comments are
>> sometimes even worse than no comments.
>>
>> Just like Hervé, I'd really prefer to see if a commit is done for a
>> specific issue or not. In this case I would have liked to see a fix on
>> the
>> comment if possible, because the current comment is incomplete.
>>
>> Anyhow, now I know about this.
>>
>> Robert
>>
>>
>> Op Sat, 27 Jul 2013 15:40:05 +0200 schreef Jeff Jensen <jeffjensen@**
>> upstairstechnology.com <je...@upstairstechnology.com>>:
>>
>>
>> On Sat, Jul 27, 2013 at 8:38 AM, Fred Cooke <fr...@gmail.com>
>> wrote:
>>>
>>>> On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier <aheritier@gmail.com
>>>> >wrote:
>>>>
>>>> At Apache it is forbidden to rewrite the history of the master
>>>> branch.
>>>>> Which isn't so bad.
>>>>>
>>>>>
>>>> Ahh, this is a very sound policy! Someone is switched on! :-)
>>>>
>>>
>>> Yes, very good!
>>>
>>>
>>> ---------
>>>>> Arnaud
>>>>>
>>>>> Le 27 juil. 2013 à 15:19, Jeff Jensen
>>>>> <je...@upstairstechnology.com>>
>>>>> a écrit :
>>>>>
>>>>> > That message indicates you need to git pull first. Even though you
>>>>> > may already have done so and no one else has pushed since, this
>>>>> usually
>>>>> > happens when modifying a commit that has been pushed/shared.
>>>>> >
>>>>> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY
>>>>> <herve.boutemy@free.fr
>>>>> >
>>>>> wrote:
>>>>> >> the last 2 commits are to be amended: lst one for MNG-5499,
>>>>> previous
>>>>> one for
>>>>> >> MNG-5495
>>>>> >>
>>>>> >> I tried git commit --amend -m "[MNG-5499]..." for the last one,
>>>>> but
>>>>> when I git
>>>>> >> push, I get
>>>>> >>
>>>>> >> To
>>>>> https://git-wip-us.apache.org/**repos/asf/maven.git<https://git-wip-us.apache.org/repos/asf/maven.git>
>>>>> >> ! [rejected] master -> master (non-fast-forward)
>>>>> >> error: failed to push some refs to '
>>>>> https://git-wip-us.apache.org/**repos/asf/maven.git<https://git-wip-us.apache.org/repos/asf/maven.git>
>>>>> '
>>>>> >> hint: Updates were rejected because the tip of your current
>>>>> branch is
>>>>> behind
>>>>> >> hint: its remote counterpart. Merge the remote changes (e.g. 'git
>>>>> pull')
>>>>> >> hint: before pushing again.
>>>>> >> hint: See the 'Note about fast-forwards' in 'git push --help' for
>>>>> details.
>>>>> >>
>>>>> >>
>>>>> >> Did I do something wrong? Or git repo at ASF is configured to
>>>>> avoid
>>>>> such
>>>>> >> things?
>>>>> >>
>>>>> >> Regards,
>>>>> >>
>>>>> >> Hervé
>>>>> >>
>>>>> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
>>>>> >>> Of course, if anyone is working down stream of this, they will
>>>>> hate
>>>>> you,
>>>>> >>> and it should be left as is.
>>>>> >>>
>>>>> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke
>>>>> <fr...@gmail.com>
>>>>> wrote:
>>>>> >>>> Yes, easily, if it's the HEAD just do a --amend on it and
>>>>> update it
>>>>> >>>> yourself, Jason's name will be retained. If it's not HEAD then
>>>>> do
>>>>> rebase
>>>>> >>>> -i
>>>>> >>>> <previous hash to the one of interest> then mark the one of
>>>>> interest
>>>>> for
>>>>> >>>> comment edit and proceed.
>>>>> >>>>
>>>>> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
>>>>> >> <he...@free.fr>wrote:
>>>>> >>>>> IIUC, this is a fix to https://jira.codehaus.org/**
>>>>> browse/MNG-5499 <https://jira.codehaus.org/browse/MNG-5499>
>>>>> >>>>>
>>>>> >>>>> I'm not a git blackbelt: can the comment be updated to add the
>>>>> classical
>>>>> >>>>> [MNG-5499]?
>>>>> >>>>> (and next time not be forgotten from initial comment :) )
>>>>> >>>>>
>>>>> >>>>> I'm adding a reference to the commit in the Jira issue
>>>>> >>>>>
>>>>> >>>>> Regards,
>>>>> >>>>>
>>>>> >>>>> Hervé
>>>>> >>>>>
>>>>> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
>>>>> >>>>>> o change the scope of org.eclipse.sisu to test in the
>>>>> >>>>>
>>>>> >>>>> maven-aether-provider
>>>>> >>>>>
>>>>> >>>>>> to prevent it from leaking out to clients.
>>>>> >>>>>>
>>>>> >>>>>>
>>>>> >>>>>> Project:
>>>>> http://git-wip-us.apache.org/**repos/asf/maven/repo<http://git-wip-us.apache.org/repos/asf/maven/repo>
>>>>> >>>>>> Commit:
>>>>> http://git-wip-us.apache.org/**repos/asf/maven/commit/**e084ff3b<http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b>
>>>>> >>>>>> Tree: http://git-wip-us.apache.org/**
>>>>> repos/asf/maven/tree/e084ff3b<http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b>
>>>>> >>>>>> Diff: http://git-wip-us.apache.org/**
>>>>> repos/asf/maven/diff/e084ff3b<http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b>
>>>>> >>>>>>
>>>>> >>>>>> Branch: refs/heads/master
>>>>> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8e**c87762d4dc
>>>>> >>>>>> Parents: 0609504
>>>>> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
>>>>> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
>>>>> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
>>>>> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
>>>>> >>>>>>
>>>>> >>>>>>
>>>>> ------------------------------**------------------------------**
>>>>> ----------
>>>>> >>>>>>
>>>>> >>>>>> maven-aether-provider/pom.xml | 30
>>>>> ++++++++++++++++--------------
>>>>> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
>>>>> >>>>>>
>>>>> >>>>>>
>>>>> ------------------------------**------------------------------**
>>>>> ----------
>>>>> >>>>>
>>>>> >>>>>
>>>>> http://git-wip-us.apache.org/**repos/asf/maven/blob/e084ff3b/**
>>>>> maven-aether-p<http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-p>
>>>>> >>>>> rov>>
>>>>> >>>>>> ider/pom.xml
>>>>> >>>>>>
>>>>> ------------------------------**------------------------------**
>>>>> ----------
>>>>> >>>>>
>>>>> >>>>> diff
>>>>> >>>>>
>>>>> >>>>>> --git a/maven-aether-provider/pom.**xml
>>>>> b/maven-aether-provider/pom.**xml
>>>>> >>>>>
>>>>> >>>>> index
>>>>> >>>>>
>>>>> >>>>>> 910fab6..9235f1c 100644
>>>>> >>>>>> --- a/maven-aether-provider/pom.**xml
>>>>> >>>>>> +++ b/maven-aether-provider/pom.**xml
>>>>> >>>>>> @@ -63,20 +63,6 @@ under the License.
>>>>> >>>>>>
>>>>> >>>>>> <artifactId>aether-impl</**artifactId>
>>>>> >>>>>>
>>>>> >>>>>> </dependency>
>>>>> >>>>>> <dependency>
>>>>> >>>>>>
>>>>> >>>>>> - <groupId>org.eclipse.aether</**groupId>
>>>>> >>>>>> - <artifactId>aether-connector-**wagon</artifactId>
>>>>> >>>>>> - <scope>test</scope>
>>>>> >>>>>> - </dependency>
>>>>> >>>>>> - <dependency>
>>>>> >>>>>> - <groupId>org.apache.maven.**wagon</groupId>
>>>>> >>>>>> - <artifactId>wagon-file</**artifactId>
>>>>> >>>>>> - <scope>test</scope>
>>>>> >>>>>> - </dependency>
>>>>> >>>>>> - <dependency>
>>>>> >>>>>> - <groupId>org.eclipse.sisu</**groupId>
>>>>> >>>>>> - <artifactId>org.eclipse.sisu.**plexus</artifactId>
>>>>> >>>>>> - </dependency>
>>>>> >>>>>> - <dependency>
>>>>> >>>>>>
>>>>> >>>>>> <groupId>org.codehaus.plexus</**groupId>
>>>>> >>>>>> <artifactId>plexus-component-**annotations</artifactId>
>>>>> >>>>>>
>>>>> >>>>>> </dependency>
>>>>> >>>>>>
>>>>> >>>>>> @@ -96,6 +82,22 @@ under the License.
>>>>> >>>>>>
>>>>> >>>>>> </exclusion>
>>>>> >>>>>>
>>>>> >>>>>> </exclusions>
>>>>> >>>>>>
>>>>> >>>>>> </dependency>
>>>>> >>>>>>
>>>>> >>>>>> + <!-- Testing -->
>>>>> >>>>>> + <dependency>
>>>>> >>>>>> + <groupId>org.eclipse.aether</**groupId>
>>>>> >>>>>> + <artifactId>aether-connector-**wagon</artifactId>
>>>>> >>>>>> + <scope>test</scope>
>>>>> >>>>>> + </dependency>
>>>>> >>>>>> + <dependency>
>>>>> >>>>>> + <groupId>org.apache.maven.**wagon</groupId>
>>>>> >>>>>> + <artifactId>wagon-file</**artifactId>
>>>>> >>>>>> + <scope>test</scope>
>>>>> >>>>>> + </dependency>
>>>>> >>>>>> + <dependency>
>>>>> >>>>>> + <groupId>org.eclipse.sisu</**groupId>
>>>>> >>>>>> + <artifactId>org.eclipse.sisu.**plexus</artifactId>
>>>>> >>>>>> + <scope>test</scope>
>>>>> >>>>>> + </dependency>
>>>>> >>>>>>
>>>>> >>>>>> </dependencies>
>>>>> >>>>>>
>>>>> >>>>>> <build>
>>>>> >>>>>
>>>>> >>>>>
>>>>> ------------------------------**------------------------------**
>>>>> ---------
>>>>> >>>>> To unsubscribe, e-mail:
>>>>> dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>>>>> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
>>>>> >>
>>>>> >> ------------------------------**------------------------------**
>>>>> ---------
>>>>> >> To unsubscribe, e-mail:
>>>>> dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>>>>> >> For additional commands, e-mail: dev-help@maven.apache.org
>>>>> >
>>>>> > ------------------------------**------------------------------**
>>>>> ---------
>>>>> > To unsubscribe, e-mail:
>>>>> dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>>>>> > For additional commands, e-mail: dev-help@maven.apache.org
>>>>> >
>>>>>
>>>>> ------------------------------**------------------------------**
>>>>> ---------
>>>>> To unsubscribe, e-mail:
>>>>> dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>>>>> For additional commands, e-mail: dev-help@maven.apache.org
>>>>>
>>>>>
>>>>>
>>> ------------------------------**------------------------------**---------
>>> To unsubscribe, e-mail:
>>> dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>>> For additional commands, e-mail: dev-help@maven.apache.org
>>>
>>
>> ------------------------------**------------------------------**---------
>> To unsubscribe, e-mail:
>> dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Fred Cooke <fr...@gmail.com>.
Good practice is to work on a branch anyway, then you're free to do
whatever you wish. I have ~30 branches in my private copy of my project
right now. When one matures I rebase it onto the latest public, then
publish it. Then I rebase the others periodically up onto the latest public
too. Wash rinse repeat.
With SVN changing a bad comment wasn't even possible, so stating "no
amending master" isn't really a restriction at all. It's just good practice.
Fred.
On Sat, Jul 27, 2013 at 4:00 PM, Robert Scholte <rf...@apache.org>wrote:
> I'm actually kind of surprised. I'm learning my co-workers that comments
> are very important. With a buildserver it has become very easy to have an
> overview of the latest commits and understand what broke the build.
> Writing good comments should help everybody to understand why a commit is
> done (yes: why. Not 'what', that's already easy to figure out). So I'm
> really in favor to being able change comments, because bad comments are
> sometimes even worse than no comments.
>
> Just like Hervé, I'd really prefer to see if a commit is done for a
> specific issue or not. In this case I would have liked to see a fix on the
> comment if possible, because the current comment is incomplete.
>
> Anyhow, now I know about this.
>
> Robert
>
>
> Op Sat, 27 Jul 2013 15:40:05 +0200 schreef Jeff Jensen <jeffjensen@**
> upstairstechnology.com <je...@upstairstechnology.com>>:
>
>
> On Sat, Jul 27, 2013 at 8:38 AM, Fred Cooke <fr...@gmail.com> wrote:
>>
>>> On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier <aheritier@gmail.com
>>> >wrote:
>>>
>>> At Apache it is forbidden to rewrite the history of the master branch.
>>>> Which isn't so bad.
>>>>
>>>>
>>> Ahh, this is a very sound policy! Someone is switched on! :-)
>>>
>>
>> Yes, very good!
>>
>>
>> ---------
>>>> Arnaud
>>>>
>>>> Le 27 juil. 2013 à 15:19, Jeff Jensen
>>>> <je...@upstairstechnology.com>>
>>>> a écrit :
>>>>
>>>> > That message indicates you need to git pull first. Even though you
>>>> > may already have done so and no one else has pushed since, this
>>>> usually
>>>> > happens when modifying a commit that has been pushed/shared.
>>>> >
>>>> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <herve.boutemy@free.fr
>>>> >
>>>> wrote:
>>>> >> the last 2 commits are to be amended: lst one for MNG-5499, previous
>>>> one for
>>>> >> MNG-5495
>>>> >>
>>>> >> I tried git commit --amend -m "[MNG-5499]..." for the last one, but
>>>> when I git
>>>> >> push, I get
>>>> >>
>>>> >> To https://git-wip-us.apache.org/**repos/asf/maven.git<https://git-wip-us.apache.org/repos/asf/maven.git>
>>>> >> ! [rejected] master -> master (non-fast-forward)
>>>> >> error: failed to push some refs to '
>>>> https://git-wip-us.apache.org/**repos/asf/maven.git<https://git-wip-us.apache.org/repos/asf/maven.git>
>>>> '
>>>> >> hint: Updates were rejected because the tip of your current branch is
>>>> behind
>>>> >> hint: its remote counterpart. Merge the remote changes (e.g. 'git
>>>> pull')
>>>> >> hint: before pushing again.
>>>> >> hint: See the 'Note about fast-forwards' in 'git push --help' for
>>>> details.
>>>> >>
>>>> >>
>>>> >> Did I do something wrong? Or git repo at ASF is configured to avoid
>>>> such
>>>> >> things?
>>>> >>
>>>> >> Regards,
>>>> >>
>>>> >> Hervé
>>>> >>
>>>> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
>>>> >>> Of course, if anyone is working down stream of this, they will hate
>>>> you,
>>>> >>> and it should be left as is.
>>>> >>>
>>>> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com>
>>>> wrote:
>>>> >>>> Yes, easily, if it's the HEAD just do a --amend on it and update it
>>>> >>>> yourself, Jason's name will be retained. If it's not HEAD then do
>>>> rebase
>>>> >>>> -i
>>>> >>>> <previous hash to the one of interest> then mark the one of
>>>> interest
>>>> for
>>>> >>>> comment edit and proceed.
>>>> >>>>
>>>> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
>>>> >> <he...@free.fr>wrote:
>>>> >>>>> IIUC, this is a fix to https://jira.codehaus.org/**
>>>> browse/MNG-5499 <https://jira.codehaus.org/browse/MNG-5499>
>>>> >>>>>
>>>> >>>>> I'm not a git blackbelt: can the comment be updated to add the
>>>> classical
>>>> >>>>> [MNG-5499]?
>>>> >>>>> (and next time not be forgotten from initial comment :) )
>>>> >>>>>
>>>> >>>>> I'm adding a reference to the commit in the Jira issue
>>>> >>>>>
>>>> >>>>> Regards,
>>>> >>>>>
>>>> >>>>> Hervé
>>>> >>>>>
>>>> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
>>>> >>>>>> o change the scope of org.eclipse.sisu to test in the
>>>> >>>>>
>>>> >>>>> maven-aether-provider
>>>> >>>>>
>>>> >>>>>> to prevent it from leaking out to clients.
>>>> >>>>>>
>>>> >>>>>>
>>>> >>>>>> Project: http://git-wip-us.apache.org/**repos/asf/maven/repo<http://git-wip-us.apache.org/repos/asf/maven/repo>
>>>> >>>>>> Commit:
>>>> http://git-wip-us.apache.org/**repos/asf/maven/commit/**e084ff3b<http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b>
>>>> >>>>>> Tree: http://git-wip-us.apache.org/**
>>>> repos/asf/maven/tree/e084ff3b<http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b>
>>>> >>>>>> Diff: http://git-wip-us.apache.org/**
>>>> repos/asf/maven/diff/e084ff3b<http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b>
>>>> >>>>>>
>>>> >>>>>> Branch: refs/heads/master
>>>> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8e**c87762d4dc
>>>> >>>>>> Parents: 0609504
>>>> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
>>>> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
>>>> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
>>>> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
>>>> >>>>>>
>>>> >>>>>>
>>>> ------------------------------**------------------------------**
>>>> ----------
>>>> >>>>>>
>>>> >>>>>> maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
>>>> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
>>>> >>>>>>
>>>> >>>>>>
>>>> ------------------------------**------------------------------**
>>>> ----------
>>>> >>>>>
>>>> >>>>>
>>>> http://git-wip-us.apache.org/**repos/asf/maven/blob/e084ff3b/**
>>>> maven-aether-p<http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-p>
>>>> >>>>> rov>>
>>>> >>>>>> ider/pom.xml
>>>> >>>>>>
>>>> ------------------------------**------------------------------**
>>>> ----------
>>>> >>>>>
>>>> >>>>> diff
>>>> >>>>>
>>>> >>>>>> --git a/maven-aether-provider/pom.**xml
>>>> b/maven-aether-provider/pom.**xml
>>>> >>>>>
>>>> >>>>> index
>>>> >>>>>
>>>> >>>>>> 910fab6..9235f1c 100644
>>>> >>>>>> --- a/maven-aether-provider/pom.**xml
>>>> >>>>>> +++ b/maven-aether-provider/pom.**xml
>>>> >>>>>> @@ -63,20 +63,6 @@ under the License.
>>>> >>>>>>
>>>> >>>>>> <artifactId>aether-impl</**artifactId>
>>>> >>>>>>
>>>> >>>>>> </dependency>
>>>> >>>>>> <dependency>
>>>> >>>>>>
>>>> >>>>>> - <groupId>org.eclipse.aether</**groupId>
>>>> >>>>>> - <artifactId>aether-connector-**wagon</artifactId>
>>>> >>>>>> - <scope>test</scope>
>>>> >>>>>> - </dependency>
>>>> >>>>>> - <dependency>
>>>> >>>>>> - <groupId>org.apache.maven.**wagon</groupId>
>>>> >>>>>> - <artifactId>wagon-file</**artifactId>
>>>> >>>>>> - <scope>test</scope>
>>>> >>>>>> - </dependency>
>>>> >>>>>> - <dependency>
>>>> >>>>>> - <groupId>org.eclipse.sisu</**groupId>
>>>> >>>>>> - <artifactId>org.eclipse.sisu.**plexus</artifactId>
>>>> >>>>>> - </dependency>
>>>> >>>>>> - <dependency>
>>>> >>>>>>
>>>> >>>>>> <groupId>org.codehaus.plexus</**groupId>
>>>> >>>>>> <artifactId>plexus-component-**annotations</artifactId>
>>>> >>>>>>
>>>> >>>>>> </dependency>
>>>> >>>>>>
>>>> >>>>>> @@ -96,6 +82,22 @@ under the License.
>>>> >>>>>>
>>>> >>>>>> </exclusion>
>>>> >>>>>>
>>>> >>>>>> </exclusions>
>>>> >>>>>>
>>>> >>>>>> </dependency>
>>>> >>>>>>
>>>> >>>>>> + <!-- Testing -->
>>>> >>>>>> + <dependency>
>>>> >>>>>> + <groupId>org.eclipse.aether</**groupId>
>>>> >>>>>> + <artifactId>aether-connector-**wagon</artifactId>
>>>> >>>>>> + <scope>test</scope>
>>>> >>>>>> + </dependency>
>>>> >>>>>> + <dependency>
>>>> >>>>>> + <groupId>org.apache.maven.**wagon</groupId>
>>>> >>>>>> + <artifactId>wagon-file</**artifactId>
>>>> >>>>>> + <scope>test</scope>
>>>> >>>>>> + </dependency>
>>>> >>>>>> + <dependency>
>>>> >>>>>> + <groupId>org.eclipse.sisu</**groupId>
>>>> >>>>>> + <artifactId>org.eclipse.sisu.**plexus</artifactId>
>>>> >>>>>> + <scope>test</scope>
>>>> >>>>>> + </dependency>
>>>> >>>>>>
>>>> >>>>>> </dependencies>
>>>> >>>>>>
>>>> >>>>>> <build>
>>>> >>>>>
>>>> >>>>> ------------------------------**------------------------------**
>>>> ---------
>>>> >>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>>>> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
>>>> >>
>>>> >> ------------------------------**------------------------------**
>>>> ---------
>>>> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>>>> >> For additional commands, e-mail: dev-help@maven.apache.org
>>>> >
>>>> > ------------------------------**------------------------------**
>>>> ---------
>>>> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>>>> > For additional commands, e-mail: dev-help@maven.apache.org
>>>> >
>>>>
>>>> ------------------------------**------------------------------**
>>>> ---------
>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>>>> For additional commands, e-mail: dev-help@maven.apache.org
>>>>
>>>>
>>>>
>> ------------------------------**------------------------------**---------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>
> ------------------------------**------------------------------**---------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.**org<de...@maven.apache.org>
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Robert Scholte <rf...@apache.org>.
I'm actually kind of surprised. I'm learning my co-workers that comments
are very important. With a buildserver it has become very easy to have an
overview of the latest commits and understand what broke the build.
Writing good comments should help everybody to understand why a commit is
done (yes: why. Not 'what', that's already easy to figure out). So I'm
really in favor to being able change comments, because bad comments are
sometimes even worse than no comments.
Just like Hervé, I'd really prefer to see if a commit is done for a
specific issue or not. In this case I would have liked to see a fix on the
comment if possible, because the current comment is incomplete.
Anyhow, now I know about this.
Robert
Op Sat, 27 Jul 2013 15:40:05 +0200 schreef Jeff Jensen
<je...@upstairstechnology.com>:
> On Sat, Jul 27, 2013 at 8:38 AM, Fred Cooke <fr...@gmail.com> wrote:
>> On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier
>> <ah...@gmail.com>wrote:
>>
>>> At Apache it is forbidden to rewrite the history of the master branch.
>>> Which isn't so bad.
>>>
>>
>> Ahh, this is a very sound policy! Someone is switched on! :-)
>
> Yes, very good!
>
>
>>> ---------
>>> Arnaud
>>>
>>> Le 27 juil. 2013 à 15:19, Jeff Jensen
>>> <je...@upstairstechnology.com> a écrit :
>>>
>>> > That message indicates you need to git pull first. Even though you
>>> > may already have done so and no one else has pushed since, this
>>> usually
>>> > happens when modifying a commit that has been pushed/shared.
>>> >
>>> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY
>>> <he...@free.fr>
>>> wrote:
>>> >> the last 2 commits are to be amended: lst one for MNG-5499, previous
>>> one for
>>> >> MNG-5495
>>> >>
>>> >> I tried git commit --amend -m "[MNG-5499]..." for the last one, but
>>> when I git
>>> >> push, I get
>>> >>
>>> >> To https://git-wip-us.apache.org/repos/asf/maven.git
>>> >> ! [rejected] master -> master (non-fast-forward)
>>> >> error: failed to push some refs to '
>>> https://git-wip-us.apache.org/repos/asf/maven.git'
>>> >> hint: Updates were rejected because the tip of your current branch
>>> is
>>> behind
>>> >> hint: its remote counterpart. Merge the remote changes (e.g. 'git
>>> pull')
>>> >> hint: before pushing again.
>>> >> hint: See the 'Note about fast-forwards' in 'git push --help' for
>>> details.
>>> >>
>>> >>
>>> >> Did I do something wrong? Or git repo at ASF is configured to avoid
>>> such
>>> >> things?
>>> >>
>>> >> Regards,
>>> >>
>>> >> Hervé
>>> >>
>>> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
>>> >>> Of course, if anyone is working down stream of this, they will hate
>>> you,
>>> >>> and it should be left as is.
>>> >>>
>>> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com>
>>> wrote:
>>> >>>> Yes, easily, if it's the HEAD just do a --amend on it and update
>>> it
>>> >>>> yourself, Jason's name will be retained. If it's not HEAD then do
>>> rebase
>>> >>>> -i
>>> >>>> <previous hash to the one of interest> then mark the one of
>>> interest
>>> for
>>> >>>> comment edit and proceed.
>>> >>>>
>>> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
>>> >> <he...@free.fr>wrote:
>>> >>>>> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
>>> >>>>>
>>> >>>>> I'm not a git blackbelt: can the comment be updated to add the
>>> classical
>>> >>>>> [MNG-5499]?
>>> >>>>> (and next time not be forgotten from initial comment :) )
>>> >>>>>
>>> >>>>> I'm adding a reference to the commit in the Jira issue
>>> >>>>>
>>> >>>>> Regards,
>>> >>>>>
>>> >>>>> Hervé
>>> >>>>>
>>> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
>>> >>>>>> o change the scope of org.eclipse.sisu to test in the
>>> >>>>>
>>> >>>>> maven-aether-provider
>>> >>>>>
>>> >>>>>> to prevent it from leaking out to clients.
>>> >>>>>>
>>> >>>>>>
>>> >>>>>> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
>>> >>>>>> Commit:
>>> http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
>>> >>>>>> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
>>> >>>>>> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
>>> >>>>>>
>>> >>>>>> Branch: refs/heads/master
>>> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
>>> >>>>>> Parents: 0609504
>>> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
>>> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
>>> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
>>> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
>>> >>>>>>
>>> >>>>>>
>>> ----------------------------------------------------------------------
>>> >>>>>>
>>> >>>>>> maven-aether-provider/pom.xml | 30
>>> ++++++++++++++++--------------
>>> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
>>> >>>>>>
>>> >>>>>>
>>> ----------------------------------------------------------------------
>>> >>>>>
>>> >>>>>
>>> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-p
>>> >>>>> rov>>
>>> >>>>>> ider/pom.xml
>>> >>>>>>
>>> ----------------------------------------------------------------------
>>> >>>>>
>>> >>>>> diff
>>> >>>>>
>>> >>>>>> --git a/maven-aether-provider/pom.xml
>>> b/maven-aether-provider/pom.xml
>>> >>>>>
>>> >>>>> index
>>> >>>>>
>>> >>>>>> 910fab6..9235f1c 100644
>>> >>>>>> --- a/maven-aether-provider/pom.xml
>>> >>>>>> +++ b/maven-aether-provider/pom.xml
>>> >>>>>> @@ -63,20 +63,6 @@ under the License.
>>> >>>>>>
>>> >>>>>> <artifactId>aether-impl</artifactId>
>>> >>>>>>
>>> >>>>>> </dependency>
>>> >>>>>> <dependency>
>>> >>>>>>
>>> >>>>>> - <groupId>org.eclipse.aether</groupId>
>>> >>>>>> - <artifactId>aether-connector-wagon</artifactId>
>>> >>>>>> - <scope>test</scope>
>>> >>>>>> - </dependency>
>>> >>>>>> - <dependency>
>>> >>>>>> - <groupId>org.apache.maven.wagon</groupId>
>>> >>>>>> - <artifactId>wagon-file</artifactId>
>>> >>>>>> - <scope>test</scope>
>>> >>>>>> - </dependency>
>>> >>>>>> - <dependency>
>>> >>>>>> - <groupId>org.eclipse.sisu</groupId>
>>> >>>>>> - <artifactId>org.eclipse.sisu.plexus</artifactId>
>>> >>>>>> - </dependency>
>>> >>>>>> - <dependency>
>>> >>>>>>
>>> >>>>>> <groupId>org.codehaus.plexus</groupId>
>>> >>>>>> <artifactId>plexus-component-annotations</artifactId>
>>> >>>>>>
>>> >>>>>> </dependency>
>>> >>>>>>
>>> >>>>>> @@ -96,6 +82,22 @@ under the License.
>>> >>>>>>
>>> >>>>>> </exclusion>
>>> >>>>>>
>>> >>>>>> </exclusions>
>>> >>>>>>
>>> >>>>>> </dependency>
>>> >>>>>>
>>> >>>>>> + <!-- Testing -->
>>> >>>>>> + <dependency>
>>> >>>>>> + <groupId>org.eclipse.aether</groupId>
>>> >>>>>> + <artifactId>aether-connector-wagon</artifactId>
>>> >>>>>> + <scope>test</scope>
>>> >>>>>> + </dependency>
>>> >>>>>> + <dependency>
>>> >>>>>> + <groupId>org.apache.maven.wagon</groupId>
>>> >>>>>> + <artifactId>wagon-file</artifactId>
>>> >>>>>> + <scope>test</scope>
>>> >>>>>> + </dependency>
>>> >>>>>> + <dependency>
>>> >>>>>> + <groupId>org.eclipse.sisu</groupId>
>>> >>>>>> + <artifactId>org.eclipse.sisu.plexus</artifactId>
>>> >>>>>> + <scope>test</scope>
>>> >>>>>> + </dependency>
>>> >>>>>>
>>> >>>>>> </dependencies>
>>> >>>>>>
>>> >>>>>> <build>
>>> >>>>>
>>> >>>>>
>>> ---------------------------------------------------------------------
>>> >>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>>> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
>>> >>
>>> >>
>>> ---------------------------------------------------------------------
>>> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>>> >> For additional commands, e-mail: dev-help@maven.apache.org
>>> >
>>> > ---------------------------------------------------------------------
>>> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>>> > For additional commands, e-mail: dev-help@maven.apache.org
>>> >
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>>> For additional commands, e-mail: dev-help@maven.apache.org
>>>
>>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Jeff Jensen <je...@upstairstechnology.com>.
On Sat, Jul 27, 2013 at 8:38 AM, Fred Cooke <fr...@gmail.com> wrote:
> On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier <ah...@gmail.com>wrote:
>
>> At Apache it is forbidden to rewrite the history of the master branch.
>> Which isn't so bad.
>>
>
> Ahh, this is a very sound policy! Someone is switched on! :-)
Yes, very good!
>> ---------
>> Arnaud
>>
>> Le 27 juil. 2013 à 15:19, Jeff Jensen
>> <je...@upstairstechnology.com> a écrit :
>>
>> > That message indicates you need to git pull first. Even though you
>> > may already have done so and no one else has pushed since, this usually
>> > happens when modifying a commit that has been pushed/shared.
>> >
>> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <he...@free.fr>
>> wrote:
>> >> the last 2 commits are to be amended: lst one for MNG-5499, previous
>> one for
>> >> MNG-5495
>> >>
>> >> I tried git commit --amend -m "[MNG-5499]..." for the last one, but
>> when I git
>> >> push, I get
>> >>
>> >> To https://git-wip-us.apache.org/repos/asf/maven.git
>> >> ! [rejected] master -> master (non-fast-forward)
>> >> error: failed to push some refs to '
>> https://git-wip-us.apache.org/repos/asf/maven.git'
>> >> hint: Updates were rejected because the tip of your current branch is
>> behind
>> >> hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
>> >> hint: before pushing again.
>> >> hint: See the 'Note about fast-forwards' in 'git push --help' for
>> details.
>> >>
>> >>
>> >> Did I do something wrong? Or git repo at ASF is configured to avoid such
>> >> things?
>> >>
>> >> Regards,
>> >>
>> >> Hervé
>> >>
>> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
>> >>> Of course, if anyone is working down stream of this, they will hate
>> you,
>> >>> and it should be left as is.
>> >>>
>> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com>
>> wrote:
>> >>>> Yes, easily, if it's the HEAD just do a --amend on it and update it
>> >>>> yourself, Jason's name will be retained. If it's not HEAD then do
>> rebase
>> >>>> -i
>> >>>> <previous hash to the one of interest> then mark the one of interest
>> for
>> >>>> comment edit and proceed.
>> >>>>
>> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
>> >> <he...@free.fr>wrote:
>> >>>>> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
>> >>>>>
>> >>>>> I'm not a git blackbelt: can the comment be updated to add the
>> classical
>> >>>>> [MNG-5499]?
>> >>>>> (and next time not be forgotten from initial comment :) )
>> >>>>>
>> >>>>> I'm adding a reference to the commit in the Jira issue
>> >>>>>
>> >>>>> Regards,
>> >>>>>
>> >>>>> Hervé
>> >>>>>
>> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
>> >>>>>> o change the scope of org.eclipse.sisu to test in the
>> >>>>>
>> >>>>> maven-aether-provider
>> >>>>>
>> >>>>>> to prevent it from leaking out to clients.
>> >>>>>>
>> >>>>>>
>> >>>>>> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
>> >>>>>> Commit:
>> http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
>> >>>>>> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
>> >>>>>> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
>> >>>>>>
>> >>>>>> Branch: refs/heads/master
>> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
>> >>>>>> Parents: 0609504
>> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
>> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
>> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
>> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
>> >>>>>>
>> >>>>>>
>> ----------------------------------------------------------------------
>> >>>>>>
>> >>>>>> maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
>> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
>> >>>>>>
>> >>>>>>
>> ----------------------------------------------------------------------
>> >>>>>
>> >>>>>
>> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-p
>> >>>>> rov>>
>> >>>>>> ider/pom.xml
>> >>>>>>
>> ----------------------------------------------------------------------
>> >>>>>
>> >>>>> diff
>> >>>>>
>> >>>>>> --git a/maven-aether-provider/pom.xml
>> b/maven-aether-provider/pom.xml
>> >>>>>
>> >>>>> index
>> >>>>>
>> >>>>>> 910fab6..9235f1c 100644
>> >>>>>> --- a/maven-aether-provider/pom.xml
>> >>>>>> +++ b/maven-aether-provider/pom.xml
>> >>>>>> @@ -63,20 +63,6 @@ under the License.
>> >>>>>>
>> >>>>>> <artifactId>aether-impl</artifactId>
>> >>>>>>
>> >>>>>> </dependency>
>> >>>>>> <dependency>
>> >>>>>>
>> >>>>>> - <groupId>org.eclipse.aether</groupId>
>> >>>>>> - <artifactId>aether-connector-wagon</artifactId>
>> >>>>>> - <scope>test</scope>
>> >>>>>> - </dependency>
>> >>>>>> - <dependency>
>> >>>>>> - <groupId>org.apache.maven.wagon</groupId>
>> >>>>>> - <artifactId>wagon-file</artifactId>
>> >>>>>> - <scope>test</scope>
>> >>>>>> - </dependency>
>> >>>>>> - <dependency>
>> >>>>>> - <groupId>org.eclipse.sisu</groupId>
>> >>>>>> - <artifactId>org.eclipse.sisu.plexus</artifactId>
>> >>>>>> - </dependency>
>> >>>>>> - <dependency>
>> >>>>>>
>> >>>>>> <groupId>org.codehaus.plexus</groupId>
>> >>>>>> <artifactId>plexus-component-annotations</artifactId>
>> >>>>>>
>> >>>>>> </dependency>
>> >>>>>>
>> >>>>>> @@ -96,6 +82,22 @@ under the License.
>> >>>>>>
>> >>>>>> </exclusion>
>> >>>>>>
>> >>>>>> </exclusions>
>> >>>>>>
>> >>>>>> </dependency>
>> >>>>>>
>> >>>>>> + <!-- Testing -->
>> >>>>>> + <dependency>
>> >>>>>> + <groupId>org.eclipse.aether</groupId>
>> >>>>>> + <artifactId>aether-connector-wagon</artifactId>
>> >>>>>> + <scope>test</scope>
>> >>>>>> + </dependency>
>> >>>>>> + <dependency>
>> >>>>>> + <groupId>org.apache.maven.wagon</groupId>
>> >>>>>> + <artifactId>wagon-file</artifactId>
>> >>>>>> + <scope>test</scope>
>> >>>>>> + </dependency>
>> >>>>>> + <dependency>
>> >>>>>> + <groupId>org.eclipse.sisu</groupId>
>> >>>>>> + <artifactId>org.eclipse.sisu.plexus</artifactId>
>> >>>>>> + <scope>test</scope>
>> >>>>>> + </dependency>
>> >>>>>>
>> >>>>>> </dependencies>
>> >>>>>>
>> >>>>>> <build>
>> >>>>>
>> >>>>> ---------------------------------------------------------------------
>> >>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
>> >>
>> >> ---------------------------------------------------------------------
>> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> >> For additional commands, e-mail: dev-help@maven.apache.org
>> >
>> > ---------------------------------------------------------------------
>> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> > For additional commands, e-mail: dev-help@maven.apache.org
>> >
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Fred Cooke <fr...@gmail.com>.
My most humble apologies to Herve for leading you astray! I was unaware of
the policy on this. I hope that I didn't inadvertently cause any harm.
On Sat, Jul 27, 2013 at 3:38 PM, Fred Cooke <fr...@gmail.com> wrote:
> On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier <ah...@gmail.com>wrote:
>
>> At Apache it is forbidden to rewrite the history of the master branch.
>> Which isn't so bad.
>>
>
> Ahh, this is a very sound policy! Someone is switched on! :-)
>
>
>>
>> ---------
>> Arnaud
>>
>> Le 27 juil. 2013 à 15:19, Jeff Jensen
>> <je...@upstairstechnology.com> a écrit :
>>
>> > That message indicates you need to git pull first. Even though you
>> > may already have done so and no one else has pushed since, this usually
>> > happens when modifying a commit that has been pushed/shared.
>> >
>> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <he...@free.fr>
>> wrote:
>> >> the last 2 commits are to be amended: lst one for MNG-5499, previous
>> one for
>> >> MNG-5495
>> >>
>> >> I tried git commit --amend -m "[MNG-5499]..." for the last one, but
>> when I git
>> >> push, I get
>> >>
>> >> To https://git-wip-us.apache.org/repos/asf/maven.git
>> >> ! [rejected] master -> master (non-fast-forward)
>> >> error: failed to push some refs to '
>> https://git-wip-us.apache.org/repos/asf/maven.git'
>> >> hint: Updates were rejected because the tip of your current branch is
>> behind
>> >> hint: its remote counterpart. Merge the remote changes (e.g. 'git
>> pull')
>> >> hint: before pushing again.
>> >> hint: See the 'Note about fast-forwards' in 'git push --help' for
>> details.
>> >>
>> >>
>> >> Did I do something wrong? Or git repo at ASF is configured to avoid
>> such
>> >> things?
>> >>
>> >> Regards,
>> >>
>> >> Hervé
>> >>
>> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
>> >>> Of course, if anyone is working down stream of this, they will hate
>> you,
>> >>> and it should be left as is.
>> >>>
>> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com>
>> wrote:
>> >>>> Yes, easily, if it's the HEAD just do a --amend on it and update it
>> >>>> yourself, Jason's name will be retained. If it's not HEAD then do
>> rebase
>> >>>> -i
>> >>>> <previous hash to the one of interest> then mark the one of interest
>> for
>> >>>> comment edit and proceed.
>> >>>>
>> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
>> >> <he...@free.fr>wrote:
>> >>>>> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
>> >>>>>
>> >>>>> I'm not a git blackbelt: can the comment be updated to add the
>> classical
>> >>>>> [MNG-5499]?
>> >>>>> (and next time not be forgotten from initial comment :) )
>> >>>>>
>> >>>>> I'm adding a reference to the commit in the Jira issue
>> >>>>>
>> >>>>> Regards,
>> >>>>>
>> >>>>> Hervé
>> >>>>>
>> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
>> >>>>>> o change the scope of org.eclipse.sisu to test in the
>> >>>>>
>> >>>>> maven-aether-provider
>> >>>>>
>> >>>>>> to prevent it from leaking out to clients.
>> >>>>>>
>> >>>>>>
>> >>>>>> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
>> >>>>>> Commit:
>> http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
>> >>>>>> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
>> >>>>>> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
>> >>>>>>
>> >>>>>> Branch: refs/heads/master
>> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
>> >>>>>> Parents: 0609504
>> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
>> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
>> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
>> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
>> >>>>>>
>> >>>>>>
>> ----------------------------------------------------------------------
>> >>>>>>
>> >>>>>> maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
>> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
>> >>>>>>
>> >>>>>>
>> ----------------------------------------------------------------------
>> >>>>>
>> >>>>>
>> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-p
>> >>>>> rov>>
>> >>>>>> ider/pom.xml
>> >>>>>>
>> ----------------------------------------------------------------------
>> >>>>>
>> >>>>> diff
>> >>>>>
>> >>>>>> --git a/maven-aether-provider/pom.xml
>> b/maven-aether-provider/pom.xml
>> >>>>>
>> >>>>> index
>> >>>>>
>> >>>>>> 910fab6..9235f1c 100644
>> >>>>>> --- a/maven-aether-provider/pom.xml
>> >>>>>> +++ b/maven-aether-provider/pom.xml
>> >>>>>> @@ -63,20 +63,6 @@ under the License.
>> >>>>>>
>> >>>>>> <artifactId>aether-impl</artifactId>
>> >>>>>>
>> >>>>>> </dependency>
>> >>>>>> <dependency>
>> >>>>>>
>> >>>>>> - <groupId>org.eclipse.aether</groupId>
>> >>>>>> - <artifactId>aether-connector-wagon</artifactId>
>> >>>>>> - <scope>test</scope>
>> >>>>>> - </dependency>
>> >>>>>> - <dependency>
>> >>>>>> - <groupId>org.apache.maven.wagon</groupId>
>> >>>>>> - <artifactId>wagon-file</artifactId>
>> >>>>>> - <scope>test</scope>
>> >>>>>> - </dependency>
>> >>>>>> - <dependency>
>> >>>>>> - <groupId>org.eclipse.sisu</groupId>
>> >>>>>> - <artifactId>org.eclipse.sisu.plexus</artifactId>
>> >>>>>> - </dependency>
>> >>>>>> - <dependency>
>> >>>>>>
>> >>>>>> <groupId>org.codehaus.plexus</groupId>
>> >>>>>> <artifactId>plexus-component-annotations</artifactId>
>> >>>>>>
>> >>>>>> </dependency>
>> >>>>>>
>> >>>>>> @@ -96,6 +82,22 @@ under the License.
>> >>>>>>
>> >>>>>> </exclusion>
>> >>>>>>
>> >>>>>> </exclusions>
>> >>>>>>
>> >>>>>> </dependency>
>> >>>>>>
>> >>>>>> + <!-- Testing -->
>> >>>>>> + <dependency>
>> >>>>>> + <groupId>org.eclipse.aether</groupId>
>> >>>>>> + <artifactId>aether-connector-wagon</artifactId>
>> >>>>>> + <scope>test</scope>
>> >>>>>> + </dependency>
>> >>>>>> + <dependency>
>> >>>>>> + <groupId>org.apache.maven.wagon</groupId>
>> >>>>>> + <artifactId>wagon-file</artifactId>
>> >>>>>> + <scope>test</scope>
>> >>>>>> + </dependency>
>> >>>>>> + <dependency>
>> >>>>>> + <groupId>org.eclipse.sisu</groupId>
>> >>>>>> + <artifactId>org.eclipse.sisu.plexus</artifactId>
>> >>>>>> + <scope>test</scope>
>> >>>>>> + </dependency>
>> >>>>>>
>> >>>>>> </dependencies>
>> >>>>>>
>> >>>>>> <build>
>> >>>>>
>> >>>>>
>> ---------------------------------------------------------------------
>> >>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
>> >>
>> >> ---------------------------------------------------------------------
>> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> >> For additional commands, e-mail: dev-help@maven.apache.org
>> >
>> > ---------------------------------------------------------------------
>> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> > For additional commands, e-mail: dev-help@maven.apache.org
>> >
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>>
>
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Fred Cooke <fr...@gmail.com>.
On Sat, Jul 27, 2013 at 3:36 PM, Arnaud Héritier <ah...@gmail.com>wrote:
> At Apache it is forbidden to rewrite the history of the master branch.
> Which isn't so bad.
>
Ahh, this is a very sound policy! Someone is switched on! :-)
>
> ---------
> Arnaud
>
> Le 27 juil. 2013 à 15:19, Jeff Jensen
> <je...@upstairstechnology.com> a écrit :
>
> > That message indicates you need to git pull first. Even though you
> > may already have done so and no one else has pushed since, this usually
> > happens when modifying a commit that has been pushed/shared.
> >
> > On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <he...@free.fr>
> wrote:
> >> the last 2 commits are to be amended: lst one for MNG-5499, previous
> one for
> >> MNG-5495
> >>
> >> I tried git commit --amend -m "[MNG-5499]..." for the last one, but
> when I git
> >> push, I get
> >>
> >> To https://git-wip-us.apache.org/repos/asf/maven.git
> >> ! [rejected] master -> master (non-fast-forward)
> >> error: failed to push some refs to '
> https://git-wip-us.apache.org/repos/asf/maven.git'
> >> hint: Updates were rejected because the tip of your current branch is
> behind
> >> hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
> >> hint: before pushing again.
> >> hint: See the 'Note about fast-forwards' in 'git push --help' for
> details.
> >>
> >>
> >> Did I do something wrong? Or git repo at ASF is configured to avoid such
> >> things?
> >>
> >> Regards,
> >>
> >> Hervé
> >>
> >> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
> >>> Of course, if anyone is working down stream of this, they will hate
> you,
> >>> and it should be left as is.
> >>>
> >>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com>
> wrote:
> >>>> Yes, easily, if it's the HEAD just do a --amend on it and update it
> >>>> yourself, Jason's name will be retained. If it's not HEAD then do
> rebase
> >>>> -i
> >>>> <previous hash to the one of interest> then mark the one of interest
> for
> >>>> comment edit and proceed.
> >>>>
> >>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
> >> <he...@free.fr>wrote:
> >>>>> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
> >>>>>
> >>>>> I'm not a git blackbelt: can the comment be updated to add the
> classical
> >>>>> [MNG-5499]?
> >>>>> (and next time not be forgotten from initial comment :) )
> >>>>>
> >>>>> I'm adding a reference to the commit in the Jira issue
> >>>>>
> >>>>> Regards,
> >>>>>
> >>>>> Hervé
> >>>>>
> >>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
> >>>>>> o change the scope of org.eclipse.sisu to test in the
> >>>>>
> >>>>> maven-aether-provider
> >>>>>
> >>>>>> to prevent it from leaking out to clients.
> >>>>>>
> >>>>>>
> >>>>>> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
> >>>>>> Commit:
> http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
> >>>>>> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
> >>>>>> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
> >>>>>>
> >>>>>> Branch: refs/heads/master
> >>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
> >>>>>> Parents: 0609504
> >>>>>> Author: Jason van Zyl <ja...@tesla.io>
> >>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
> >>>>>> Committer: Jason van Zyl <ja...@tesla.io>
> >>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
> >>>>>>
> >>>>>>
> ----------------------------------------------------------------------
> >>>>>>
> >>>>>> maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
> >>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
> >>>>>>
> >>>>>>
> ----------------------------------------------------------------------
> >>>>>
> >>>>>
> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-p
> >>>>> rov>>
> >>>>>> ider/pom.xml
> >>>>>>
> ----------------------------------------------------------------------
> >>>>>
> >>>>> diff
> >>>>>
> >>>>>> --git a/maven-aether-provider/pom.xml
> b/maven-aether-provider/pom.xml
> >>>>>
> >>>>> index
> >>>>>
> >>>>>> 910fab6..9235f1c 100644
> >>>>>> --- a/maven-aether-provider/pom.xml
> >>>>>> +++ b/maven-aether-provider/pom.xml
> >>>>>> @@ -63,20 +63,6 @@ under the License.
> >>>>>>
> >>>>>> <artifactId>aether-impl</artifactId>
> >>>>>>
> >>>>>> </dependency>
> >>>>>> <dependency>
> >>>>>>
> >>>>>> - <groupId>org.eclipse.aether</groupId>
> >>>>>> - <artifactId>aether-connector-wagon</artifactId>
> >>>>>> - <scope>test</scope>
> >>>>>> - </dependency>
> >>>>>> - <dependency>
> >>>>>> - <groupId>org.apache.maven.wagon</groupId>
> >>>>>> - <artifactId>wagon-file</artifactId>
> >>>>>> - <scope>test</scope>
> >>>>>> - </dependency>
> >>>>>> - <dependency>
> >>>>>> - <groupId>org.eclipse.sisu</groupId>
> >>>>>> - <artifactId>org.eclipse.sisu.plexus</artifactId>
> >>>>>> - </dependency>
> >>>>>> - <dependency>
> >>>>>>
> >>>>>> <groupId>org.codehaus.plexus</groupId>
> >>>>>> <artifactId>plexus-component-annotations</artifactId>
> >>>>>>
> >>>>>> </dependency>
> >>>>>>
> >>>>>> @@ -96,6 +82,22 @@ under the License.
> >>>>>>
> >>>>>> </exclusion>
> >>>>>>
> >>>>>> </exclusions>
> >>>>>>
> >>>>>> </dependency>
> >>>>>>
> >>>>>> + <!-- Testing -->
> >>>>>> + <dependency>
> >>>>>> + <groupId>org.eclipse.aether</groupId>
> >>>>>> + <artifactId>aether-connector-wagon</artifactId>
> >>>>>> + <scope>test</scope>
> >>>>>> + </dependency>
> >>>>>> + <dependency>
> >>>>>> + <groupId>org.apache.maven.wagon</groupId>
> >>>>>> + <artifactId>wagon-file</artifactId>
> >>>>>> + <scope>test</scope>
> >>>>>> + </dependency>
> >>>>>> + <dependency>
> >>>>>> + <groupId>org.eclipse.sisu</groupId>
> >>>>>> + <artifactId>org.eclipse.sisu.plexus</artifactId>
> >>>>>> + <scope>test</scope>
> >>>>>> + </dependency>
> >>>>>>
> >>>>>> </dependencies>
> >>>>>>
> >>>>>> <build>
> >>>>>
> >>>>> ---------------------------------------------------------------------
> >>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> >>>>> For additional commands, e-mail: dev-help@maven.apache.org
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> >> For additional commands, e-mail: dev-help@maven.apache.org
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Arnaud Héritier <ah...@gmail.com>.
At Apache it is forbidden to rewrite the history of the master branch.
Which isn't so bad.
---------
Arnaud
Le 27 juil. 2013 à 15:19, Jeff Jensen
<je...@upstairstechnology.com> a écrit :
> That message indicates you need to git pull first. Even though you
> may already have done so and no one else has pushed since, this usually
> happens when modifying a commit that has been pushed/shared.
>
> On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <he...@free.fr> wrote:
>> the last 2 commits are to be amended: lst one for MNG-5499, previous one for
>> MNG-5495
>>
>> I tried git commit --amend -m "[MNG-5499]..." for the last one, but when I git
>> push, I get
>>
>> To https://git-wip-us.apache.org/repos/asf/maven.git
>> ! [rejected] master -> master (non-fast-forward)
>> error: failed to push some refs to 'https://git-wip-us.apache.org/repos/asf/maven.git'
>> hint: Updates were rejected because the tip of your current branch is behind
>> hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
>> hint: before pushing again.
>> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
>>
>>
>> Did I do something wrong? Or git repo at ASF is configured to avoid such
>> things?
>>
>> Regards,
>>
>> Hervé
>>
>> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
>>> Of course, if anyone is working down stream of this, they will hate you,
>>> and it should be left as is.
>>>
>>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com> wrote:
>>>> Yes, easily, if it's the HEAD just do a --amend on it and update it
>>>> yourself, Jason's name will be retained. If it's not HEAD then do rebase
>>>> -i
>>>> <previous hash to the one of interest> then mark the one of interest for
>>>> comment edit and proceed.
>>>>
>>>> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
>> <he...@free.fr>wrote:
>>>>> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
>>>>>
>>>>> I'm not a git blackbelt: can the comment be updated to add the classical
>>>>> [MNG-5499]?
>>>>> (and next time not be forgotten from initial comment :) )
>>>>>
>>>>> I'm adding a reference to the commit in the Jira issue
>>>>>
>>>>> Regards,
>>>>>
>>>>> Hervé
>>>>>
>>>>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
>>>>>> o change the scope of org.eclipse.sisu to test in the
>>>>>
>>>>> maven-aether-provider
>>>>>
>>>>>> to prevent it from leaking out to clients.
>>>>>>
>>>>>>
>>>>>> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
>>>>>> Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
>>>>>> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
>>>>>> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
>>>>>>
>>>>>> Branch: refs/heads/master
>>>>>> Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
>>>>>> Parents: 0609504
>>>>>> Author: Jason van Zyl <ja...@tesla.io>
>>>>>> Authored: Fri Jul 26 21:09:50 2013 -0400
>>>>>> Committer: Jason van Zyl <ja...@tesla.io>
>>>>>> Committed: Fri Jul 26 21:09:50 2013 -0400
>>>>>>
>>>>>> ----------------------------------------------------------------------
>>>>>>
>>>>>> maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
>>>>>> 1 file changed, 16 insertions(+), 14 deletions(-)
>>>>>>
>>>>>> ----------------------------------------------------------------------
>>>>>
>>>>> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-p
>>>>> rov>>
>>>>>> ider/pom.xml
>>>>>> ----------------------------------------------------------------------
>>>>>
>>>>> diff
>>>>>
>>>>>> --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
>>>>>
>>>>> index
>>>>>
>>>>>> 910fab6..9235f1c 100644
>>>>>> --- a/maven-aether-provider/pom.xml
>>>>>> +++ b/maven-aether-provider/pom.xml
>>>>>> @@ -63,20 +63,6 @@ under the License.
>>>>>>
>>>>>> <artifactId>aether-impl</artifactId>
>>>>>>
>>>>>> </dependency>
>>>>>> <dependency>
>>>>>>
>>>>>> - <groupId>org.eclipse.aether</groupId>
>>>>>> - <artifactId>aether-connector-wagon</artifactId>
>>>>>> - <scope>test</scope>
>>>>>> - </dependency>
>>>>>> - <dependency>
>>>>>> - <groupId>org.apache.maven.wagon</groupId>
>>>>>> - <artifactId>wagon-file</artifactId>
>>>>>> - <scope>test</scope>
>>>>>> - </dependency>
>>>>>> - <dependency>
>>>>>> - <groupId>org.eclipse.sisu</groupId>
>>>>>> - <artifactId>org.eclipse.sisu.plexus</artifactId>
>>>>>> - </dependency>
>>>>>> - <dependency>
>>>>>>
>>>>>> <groupId>org.codehaus.plexus</groupId>
>>>>>> <artifactId>plexus-component-annotations</artifactId>
>>>>>>
>>>>>> </dependency>
>>>>>>
>>>>>> @@ -96,6 +82,22 @@ under the License.
>>>>>>
>>>>>> </exclusion>
>>>>>>
>>>>>> </exclusions>
>>>>>>
>>>>>> </dependency>
>>>>>>
>>>>>> + <!-- Testing -->
>>>>>> + <dependency>
>>>>>> + <groupId>org.eclipse.aether</groupId>
>>>>>> + <artifactId>aether-connector-wagon</artifactId>
>>>>>> + <scope>test</scope>
>>>>>> + </dependency>
>>>>>> + <dependency>
>>>>>> + <groupId>org.apache.maven.wagon</groupId>
>>>>>> + <artifactId>wagon-file</artifactId>
>>>>>> + <scope>test</scope>
>>>>>> + </dependency>
>>>>>> + <dependency>
>>>>>> + <groupId>org.eclipse.sisu</groupId>
>>>>>> + <artifactId>org.eclipse.sisu.plexus</artifactId>
>>>>>> + <scope>test</scope>
>>>>>> + </dependency>
>>>>>>
>>>>>> </dependencies>
>>>>>>
>>>>>> <build>
>>>>>
>>>>> ---------------------------------------------------------------------
>>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>>>>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Jeff Jensen <je...@upstairstechnology.com>.
That message indicates you need to git pull first. Even though you
may already have done so and no one else has pushed since, this usually
happens when modifying a commit that has been pushed/shared.
On Sat, Jul 27, 2013 at 8:08 AM, Hervé BOUTEMY <he...@free.fr> wrote:
> the last 2 commits are to be amended: lst one for MNG-5499, previous one for
> MNG-5495
>
> I tried git commit --amend -m "[MNG-5499]..." for the last one, but when I git
> push, I get
>
> To https://git-wip-us.apache.org/repos/asf/maven.git
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to 'https://git-wip-us.apache.org/repos/asf/maven.git'
> hint: Updates were rejected because the tip of your current branch is behind
> hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
> hint: before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
>
>
> Did I do something wrong? Or git repo at ASF is configured to avoid such
> things?
>
> Regards,
>
> Hervé
>
> Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
>> Of course, if anyone is working down stream of this, they will hate you,
>> and it should be left as is.
>>
>> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com> wrote:
>> > Yes, easily, if it's the HEAD just do a --amend on it and update it
>> > yourself, Jason's name will be retained. If it's not HEAD then do rebase
>> > -i
>> > <previous hash to the one of interest> then mark the one of interest for
>> > comment edit and proceed.
>> >
>> > On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
> <he...@free.fr>wrote:
>> >> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
>> >>
>> >> I'm not a git blackbelt: can the comment be updated to add the classical
>> >> [MNG-5499]?
>> >> (and next time not be forgotten from initial comment :) )
>> >>
>> >> I'm adding a reference to the commit in the Jira issue
>> >>
>> >> Regards,
>> >>
>> >> Hervé
>> >>
>> >> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
>> >> > o change the scope of org.eclipse.sisu to test in the
>> >>
>> >> maven-aether-provider
>> >>
>> >> > to prevent it from leaking out to clients.
>> >> >
>> >> >
>> >> > Project: http://git-wip-us.apache.org/repos/asf/maven/repo
>> >> > Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
>> >> > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
>> >> > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
>> >> >
>> >> > Branch: refs/heads/master
>> >> > Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
>> >> > Parents: 0609504
>> >> > Author: Jason van Zyl <ja...@tesla.io>
>> >> > Authored: Fri Jul 26 21:09:50 2013 -0400
>> >> > Committer: Jason van Zyl <ja...@tesla.io>
>> >> > Committed: Fri Jul 26 21:09:50 2013 -0400
>> >> >
>> >> > ----------------------------------------------------------------------
>> >> >
>> >> > maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
>> >> > 1 file changed, 16 insertions(+), 14 deletions(-)
>> >> >
>> >> > ----------------------------------------------------------------------
>> >>
>> >> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-p
>> >> rov>>
>> >> > ider/pom.xml
>> >> > ----------------------------------------------------------------------
>> >>
>> >> diff
>> >>
>> >> > --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
>> >>
>> >> index
>> >>
>> >> > 910fab6..9235f1c 100644
>> >> > --- a/maven-aether-provider/pom.xml
>> >> > +++ b/maven-aether-provider/pom.xml
>> >> > @@ -63,20 +63,6 @@ under the License.
>> >> >
>> >> > <artifactId>aether-impl</artifactId>
>> >> >
>> >> > </dependency>
>> >> > <dependency>
>> >> >
>> >> > - <groupId>org.eclipse.aether</groupId>
>> >> > - <artifactId>aether-connector-wagon</artifactId>
>> >> > - <scope>test</scope>
>> >> > - </dependency>
>> >> > - <dependency>
>> >> > - <groupId>org.apache.maven.wagon</groupId>
>> >> > - <artifactId>wagon-file</artifactId>
>> >> > - <scope>test</scope>
>> >> > - </dependency>
>> >> > - <dependency>
>> >> > - <groupId>org.eclipse.sisu</groupId>
>> >> > - <artifactId>org.eclipse.sisu.plexus</artifactId>
>> >> > - </dependency>
>> >> > - <dependency>
>> >> >
>> >> > <groupId>org.codehaus.plexus</groupId>
>> >> > <artifactId>plexus-component-annotations</artifactId>
>> >> >
>> >> > </dependency>
>> >> >
>> >> > @@ -96,6 +82,22 @@ under the License.
>> >> >
>> >> > </exclusion>
>> >> >
>> >> > </exclusions>
>> >> >
>> >> > </dependency>
>> >> >
>> >> > + <!-- Testing -->
>> >> > + <dependency>
>> >> > + <groupId>org.eclipse.aether</groupId>
>> >> > + <artifactId>aether-connector-wagon</artifactId>
>> >> > + <scope>test</scope>
>> >> > + </dependency>
>> >> > + <dependency>
>> >> > + <groupId>org.apache.maven.wagon</groupId>
>> >> > + <artifactId>wagon-file</artifactId>
>> >> > + <scope>test</scope>
>> >> > + </dependency>
>> >> > + <dependency>
>> >> > + <groupId>org.eclipse.sisu</groupId>
>> >> > + <artifactId>org.eclipse.sisu.plexus</artifactId>
>> >> > + <scope>test</scope>
>> >> > + </dependency>
>> >> >
>> >> > </dependencies>
>> >> >
>> >> > <build>
>> >>
>> >> ---------------------------------------------------------------------
>> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> >> For additional commands, e-mail: dev-help@maven.apache.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Hervé BOUTEMY <he...@free.fr>.
the last 2 commits are to be amended: lst one for MNG-5499, previous one for
MNG-5495
I tried git commit --amend -m "[MNG-5499]..." for the last one, but when I git
push, I get
To https://git-wip-us.apache.org/repos/asf/maven.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://git-wip-us.apache.org/repos/asf/maven.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Did I do something wrong? Or git repo at ASF is configured to avoid such
things?
Regards,
Hervé
Le samedi 27 juillet 2013 13:37:12 Fred Cooke a écrit :
> Of course, if anyone is working down stream of this, they will hate you,
> and it should be left as is.
>
> On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com> wrote:
> > Yes, easily, if it's the HEAD just do a --amend on it and update it
> > yourself, Jason's name will be retained. If it's not HEAD then do rebase
> > -i
> > <previous hash to the one of interest> then mark the one of interest for
> > comment edit and proceed.
> >
> > On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY
<he...@free.fr>wrote:
> >> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
> >>
> >> I'm not a git blackbelt: can the comment be updated to add the classical
> >> [MNG-5499]?
> >> (and next time not be forgotten from initial comment :) )
> >>
> >> I'm adding a reference to the commit in the Jira issue
> >>
> >> Regards,
> >>
> >> Hervé
> >>
> >> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
> >> > o change the scope of org.eclipse.sisu to test in the
> >>
> >> maven-aether-provider
> >>
> >> > to prevent it from leaking out to clients.
> >> >
> >> >
> >> > Project: http://git-wip-us.apache.org/repos/asf/maven/repo
> >> > Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
> >> > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
> >> > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
> >> >
> >> > Branch: refs/heads/master
> >> > Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
> >> > Parents: 0609504
> >> > Author: Jason van Zyl <ja...@tesla.io>
> >> > Authored: Fri Jul 26 21:09:50 2013 -0400
> >> > Committer: Jason van Zyl <ja...@tesla.io>
> >> > Committed: Fri Jul 26 21:09:50 2013 -0400
> >> >
> >> > ----------------------------------------------------------------------
> >> >
> >> > maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
> >> > 1 file changed, 16 insertions(+), 14 deletions(-)
> >> >
> >> > ----------------------------------------------------------------------
> >>
> >> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-p
> >> rov>>
> >> > ider/pom.xml
> >> > ----------------------------------------------------------------------
> >>
> >> diff
> >>
> >> > --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
> >>
> >> index
> >>
> >> > 910fab6..9235f1c 100644
> >> > --- a/maven-aether-provider/pom.xml
> >> > +++ b/maven-aether-provider/pom.xml
> >> > @@ -63,20 +63,6 @@ under the License.
> >> >
> >> > <artifactId>aether-impl</artifactId>
> >> >
> >> > </dependency>
> >> > <dependency>
> >> >
> >> > - <groupId>org.eclipse.aether</groupId>
> >> > - <artifactId>aether-connector-wagon</artifactId>
> >> > - <scope>test</scope>
> >> > - </dependency>
> >> > - <dependency>
> >> > - <groupId>org.apache.maven.wagon</groupId>
> >> > - <artifactId>wagon-file</artifactId>
> >> > - <scope>test</scope>
> >> > - </dependency>
> >> > - <dependency>
> >> > - <groupId>org.eclipse.sisu</groupId>
> >> > - <artifactId>org.eclipse.sisu.plexus</artifactId>
> >> > - </dependency>
> >> > - <dependency>
> >> >
> >> > <groupId>org.codehaus.plexus</groupId>
> >> > <artifactId>plexus-component-annotations</artifactId>
> >> >
> >> > </dependency>
> >> >
> >> > @@ -96,6 +82,22 @@ under the License.
> >> >
> >> > </exclusion>
> >> >
> >> > </exclusions>
> >> >
> >> > </dependency>
> >> >
> >> > + <!-- Testing -->
> >> > + <dependency>
> >> > + <groupId>org.eclipse.aether</groupId>
> >> > + <artifactId>aether-connector-wagon</artifactId>
> >> > + <scope>test</scope>
> >> > + </dependency>
> >> > + <dependency>
> >> > + <groupId>org.apache.maven.wagon</groupId>
> >> > + <artifactId>wagon-file</artifactId>
> >> > + <scope>test</scope>
> >> > + </dependency>
> >> > + <dependency>
> >> > + <groupId>org.eclipse.sisu</groupId>
> >> > + <artifactId>org.eclipse.sisu.plexus</artifactId>
> >> > + <scope>test</scope>
> >> > + </dependency>
> >> >
> >> > </dependencies>
> >> >
> >> > <build>
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> >> For additional commands, e-mail: dev-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Fred Cooke <fr...@gmail.com>.
Of course, if anyone is working down stream of this, they will hate you,
and it should be left as is.
On Sat, Jul 27, 2013 at 1:36 PM, Fred Cooke <fr...@gmail.com> wrote:
> Yes, easily, if it's the HEAD just do a --amend on it and update it
> yourself, Jason's name will be retained. If it's not HEAD then do rebase -i
> <previous hash to the one of interest> then mark the one of interest for
> comment edit and proceed.
>
>
> On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY <he...@free.fr>wrote:
>
>> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
>>
>> I'm not a git blackbelt: can the comment be updated to add the classical
>> [MNG-5499]?
>> (and next time not be forgotten from initial comment :) )
>>
>> I'm adding a reference to the commit in the Jira issue
>>
>> Regards,
>>
>> Hervé
>>
>> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
>> > o change the scope of org.eclipse.sisu to test in the
>> maven-aether-provider
>> > to prevent it from leaking out to clients.
>> >
>> >
>> > Project: http://git-wip-us.apache.org/repos/asf/maven/repo
>> > Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
>> > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
>> > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
>> >
>> > Branch: refs/heads/master
>> > Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
>> > Parents: 0609504
>> > Author: Jason van Zyl <ja...@tesla.io>
>> > Authored: Fri Jul 26 21:09:50 2013 -0400
>> > Committer: Jason van Zyl <ja...@tesla.io>
>> > Committed: Fri Jul 26 21:09:50 2013 -0400
>> >
>> > ----------------------------------------------------------------------
>> > maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
>> > 1 file changed, 16 insertions(+), 14 deletions(-)
>> > ----------------------------------------------------------------------
>> >
>> >
>> >
>> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-prov
>> > ider/pom.xml
>> > ----------------------------------------------------------------------
>> diff
>> > --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
>> index
>> > 910fab6..9235f1c 100644
>> > --- a/maven-aether-provider/pom.xml
>> > +++ b/maven-aether-provider/pom.xml
>> > @@ -63,20 +63,6 @@ under the License.
>> > <artifactId>aether-impl</artifactId>
>> > </dependency>
>> > <dependency>
>> > - <groupId>org.eclipse.aether</groupId>
>> > - <artifactId>aether-connector-wagon</artifactId>
>> > - <scope>test</scope>
>> > - </dependency>
>> > - <dependency>
>> > - <groupId>org.apache.maven.wagon</groupId>
>> > - <artifactId>wagon-file</artifactId>
>> > - <scope>test</scope>
>> > - </dependency>
>> > - <dependency>
>> > - <groupId>org.eclipse.sisu</groupId>
>> > - <artifactId>org.eclipse.sisu.plexus</artifactId>
>> > - </dependency>
>> > - <dependency>
>> > <groupId>org.codehaus.plexus</groupId>
>> > <artifactId>plexus-component-annotations</artifactId>
>> > </dependency>
>> > @@ -96,6 +82,22 @@ under the License.
>> > </exclusion>
>> > </exclusions>
>> > </dependency>
>> > + <!-- Testing -->
>> > + <dependency>
>> > + <groupId>org.eclipse.aether</groupId>
>> > + <artifactId>aether-connector-wagon</artifactId>
>> > + <scope>test</scope>
>> > + </dependency>
>> > + <dependency>
>> > + <groupId>org.apache.maven.wagon</groupId>
>> > + <artifactId>wagon-file</artifactId>
>> > + <scope>test</scope>
>> > + </dependency>
>> > + <dependency>
>> > + <groupId>org.eclipse.sisu</groupId>
>> > + <artifactId>org.eclipse.sisu.plexus</artifactId>
>> > + <scope>test</scope>
>> > + </dependency>
>> > </dependencies>
>> >
>> > <build>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>>
>
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Fred Cooke <fr...@gmail.com>.
Yes, easily, if it's the HEAD just do a --amend on it and update it
yourself, Jason's name will be retained. If it's not HEAD then do rebase -i
<previous hash to the one of interest> then mark the one of interest for
comment edit and proceed.
On Sat, Jul 27, 2013 at 1:28 PM, Hervé BOUTEMY <he...@free.fr>wrote:
> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
>
> I'm not a git blackbelt: can the comment be updated to add the classical
> [MNG-5499]?
> (and next time not be forgotten from initial comment :) )
>
> I'm adding a reference to the commit in the Jira issue
>
> Regards,
>
> Hervé
>
> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
> > o change the scope of org.eclipse.sisu to test in the
> maven-aether-provider
> > to prevent it from leaking out to clients.
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/maven/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
> > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
> > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
> >
> > Branch: refs/heads/master
> > Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
> > Parents: 0609504
> > Author: Jason van Zyl <ja...@tesla.io>
> > Authored: Fri Jul 26 21:09:50 2013 -0400
> > Committer: Jason van Zyl <ja...@tesla.io>
> > Committed: Fri Jul 26 21:09:50 2013 -0400
> >
> > ----------------------------------------------------------------------
> > maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
> > 1 file changed, 16 insertions(+), 14 deletions(-)
> > ----------------------------------------------------------------------
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-prov
> > ider/pom.xml
> > ----------------------------------------------------------------------
> diff
> > --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
> index
> > 910fab6..9235f1c 100644
> > --- a/maven-aether-provider/pom.xml
> > +++ b/maven-aether-provider/pom.xml
> > @@ -63,20 +63,6 @@ under the License.
> > <artifactId>aether-impl</artifactId>
> > </dependency>
> > <dependency>
> > - <groupId>org.eclipse.aether</groupId>
> > - <artifactId>aether-connector-wagon</artifactId>
> > - <scope>test</scope>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.maven.wagon</groupId>
> > - <artifactId>wagon-file</artifactId>
> > - <scope>test</scope>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.eclipse.sisu</groupId>
> > - <artifactId>org.eclipse.sisu.plexus</artifactId>
> > - </dependency>
> > - <dependency>
> > <groupId>org.codehaus.plexus</groupId>
> > <artifactId>plexus-component-annotations</artifactId>
> > </dependency>
> > @@ -96,6 +82,22 @@ under the License.
> > </exclusion>
> > </exclusions>
> > </dependency>
> > + <!-- Testing -->
> > + <dependency>
> > + <groupId>org.eclipse.aether</groupId>
> > + <artifactId>aether-connector-wagon</artifactId>
> > + <scope>test</scope>
> > + </dependency>
> > + <dependency>
> > + <groupId>org.apache.maven.wagon</groupId>
> > + <artifactId>wagon-file</artifactId>
> > + <scope>test</scope>
> > + </dependency>
> > + <dependency>
> > + <groupId>org.eclipse.sisu</groupId>
> > + <artifactId>org.eclipse.sisu.plexus</artifactId>
> > + <scope>test</scope>
> > + </dependency>
> > </dependencies>
> >
> > <build>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test
in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Arnaud Héritier <ah...@gmail.com>.
Not perfect but what you could do is to add a git note on this commit.
---------
Arnaud
Le 27 juil. 2013 à 13:29, "Hervé BOUTEMY" <he...@free.fr> a écrit :
> IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
>
> I'm not a git blackbelt: can the comment be updated to add the classical
> [MNG-5499]?
> (and next time not be forgotten from initial comment :) )
>
> I'm adding a reference to the commit in the Jira issue
>
> Regards,
>
> Hervé
>
> Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
>> o change the scope of org.eclipse.sisu to test in the maven-aether-provider
>> to prevent it from leaking out to clients.
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
>> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
>> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
>>
>> Branch: refs/heads/master
>> Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
>> Parents: 0609504
>> Author: Jason van Zyl <ja...@tesla.io>
>> Authored: Fri Jul 26 21:09:50 2013 -0400
>> Committer: Jason van Zyl <ja...@tesla.io>
>> Committed: Fri Jul 26 21:09:50 2013 -0400
>>
>> ----------------------------------------------------------------------
>> maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
>> 1 file changed, 16 insertions(+), 14 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-prov
>> ider/pom.xml
>> ---------------------------------------------------------------------- diff
>> --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index
>> 910fab6..9235f1c 100644
>> --- a/maven-aether-provider/pom.xml
>> +++ b/maven-aether-provider/pom.xml
>> @@ -63,20 +63,6 @@ under the License.
>> <artifactId>aether-impl</artifactId>
>> </dependency>
>> <dependency>
>> - <groupId>org.eclipse.aether</groupId>
>> - <artifactId>aether-connector-wagon</artifactId>
>> - <scope>test</scope>
>> - </dependency>
>> - <dependency>
>> - <groupId>org.apache.maven.wagon</groupId>
>> - <artifactId>wagon-file</artifactId>
>> - <scope>test</scope>
>> - </dependency>
>> - <dependency>
>> - <groupId>org.eclipse.sisu</groupId>
>> - <artifactId>org.eclipse.sisu.plexus</artifactId>
>> - </dependency>
>> - <dependency>
>> <groupId>org.codehaus.plexus</groupId>
>> <artifactId>plexus-component-annotations</artifactId>
>> </dependency>
>> @@ -96,6 +82,22 @@ under the License.
>> </exclusion>
>> </exclusions>
>> </dependency>
>> + <!-- Testing -->
>> + <dependency>
>> + <groupId>org.eclipse.aether</groupId>
>> + <artifactId>aether-connector-wagon</artifactId>
>> + <scope>test</scope>
>> + </dependency>
>> + <dependency>
>> + <groupId>org.apache.maven.wagon</groupId>
>> + <artifactId>wagon-file</artifactId>
>> + <scope>test</scope>
>> + </dependency>
>> + <dependency>
>> + <groupId>org.eclipse.sisu</groupId>
>> + <artifactId>org.eclipse.sisu.plexus</artifactId>
>> + <scope>test</scope>
>> + </dependency>
>> </dependencies>
>>
>> <build>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [2/2] git commit: o change the scope of org.eclipse.sisu to test in the maven-aether-provider to prevent it from leaking out to clients.
Posted by Hervé BOUTEMY <he...@free.fr>.
IIUC, this is a fix to https://jira.codehaus.org/browse/MNG-5499
I'm not a git blackbelt: can the comment be updated to add the classical
[MNG-5499]?
(and next time not be forgotten from initial comment :) )
I'm adding a reference to the commit in the Jira issue
Regards,
Hervé
Le samedi 27 juillet 2013 01:45:44 jvanzyl@apache.org a écrit :
> o change the scope of org.eclipse.sisu to test in the maven-aether-provider
> to prevent it from leaking out to clients.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/maven/repo
> Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
> Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
> Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
>
> Branch: refs/heads/master
> Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
> Parents: 0609504
> Author: Jason van Zyl <ja...@tesla.io>
> Authored: Fri Jul 26 21:09:50 2013 -0400
> Committer: Jason van Zyl <ja...@tesla.io>
> Committed: Fri Jul 26 21:09:50 2013 -0400
>
> ----------------------------------------------------------------------
> maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
> 1 file changed, 16 insertions(+), 14 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-prov
> ider/pom.xml
> ---------------------------------------------------------------------- diff
> --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index
> 910fab6..9235f1c 100644
> --- a/maven-aether-provider/pom.xml
> +++ b/maven-aether-provider/pom.xml
> @@ -63,20 +63,6 @@ under the License.
> <artifactId>aether-impl</artifactId>
> </dependency>
> <dependency>
> - <groupId>org.eclipse.aether</groupId>
> - <artifactId>aether-connector-wagon</artifactId>
> - <scope>test</scope>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.maven.wagon</groupId>
> - <artifactId>wagon-file</artifactId>
> - <scope>test</scope>
> - </dependency>
> - <dependency>
> - <groupId>org.eclipse.sisu</groupId>
> - <artifactId>org.eclipse.sisu.plexus</artifactId>
> - </dependency>
> - <dependency>
> <groupId>org.codehaus.plexus</groupId>
> <artifactId>plexus-component-annotations</artifactId>
> </dependency>
> @@ -96,6 +82,22 @@ under the License.
> </exclusion>
> </exclusions>
> </dependency>
> + <!-- Testing -->
> + <dependency>
> + <groupId>org.eclipse.aether</groupId>
> + <artifactId>aether-connector-wagon</artifactId>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.maven.wagon</groupId>
> + <artifactId>wagon-file</artifactId>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.eclipse.sisu</groupId>
> + <artifactId>org.eclipse.sisu.plexus</artifactId>
> + <scope>test</scope>
> + </dependency>
> </dependencies>
>
> <build>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
[2/2] git commit: o change the scope of org.eclipse.sisu to test in
the maven-aether-provider to prevent it from leaking out to clients.
Posted by jv...@apache.org.
o change the scope of org.eclipse.sisu to test in the maven-aether-provider to prevent it from leaking out to clients.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e084ff3b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e084ff3b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e084ff3b
Branch: refs/heads/master
Commit: e084ff3b8c04bdfdac62a28a1bef8ec87762d4dc
Parents: 0609504
Author: Jason van Zyl <ja...@tesla.io>
Authored: Fri Jul 26 21:09:50 2013 -0400
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Fri Jul 26 21:09:50 2013 -0400
----------------------------------------------------------------------
maven-aether-provider/pom.xml | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/e084ff3b/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 910fab6..9235f1c 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -63,20 +63,6 @@ under the License.
<artifactId>aether-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-wagon</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-file</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>org.eclipse.sisu.plexus</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
</dependency>
@@ -96,6 +82,22 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+ <!-- Testing -->
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-connector-wagon</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-file</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>