You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by Brett Porter <br...@apache.org> on 2007/12/05 01:09:54 UTC
Re: svn commit: r601095 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
Does this have a corresponding commit on trunk? Issue number?
Just kind of particular about the branch :D
- Brett
On 05/12/2007, at 8:43 AM, hboutemy@apache.org wrote:
> Author: hboutemy
> Date: Tue Dec 4 13:43:06 2007
> New Revision: 601095
>
> URL: http://svn.apache.org/viewvc?rev=601095&view=rev
> Log:
> keep dependencies order when injecting profile
>
> Modified:
> maven/components/branches/maven-2.0.x/maven-project/src/main/java/
> org/apache/maven/project/injection/DefaultProfileInjector.java
>
> Modified: maven/components/branches/maven-2.0.x/maven-project/src/
> main/java/org/apache/maven/project/injection/
> DefaultProfileInjector.java
> URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java?rev=601095&r1=601094&r2=601095&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- maven/components/branches/maven-2.0.x/maven-project/src/main/
> java/org/apache/maven/project/injection/DefaultProfileInjector.java
> (original)
> +++ maven/components/branches/maven-2.0.x/maven-project/src/main/
> java/org/apache/maven/project/injection/DefaultProfileInjector.java
> Tue Dec 4 13:43:06 2007
> @@ -291,7 +291,7 @@
> }
>
> }
> -
> +
> /**
> * Merge two DOMs. Copy the dominant DOM so the original one is
> left unchanged.
> * <p>
> @@ -592,7 +592,7 @@
>
> private void injectDependencies( Profile profile, Model model )
> {
> - Map depsMap = new HashMap();
> + Map depsMap = new LinkedHashMap();
>
> List deps = model.getDependencies();
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r601095 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
Posted by Vincent Siveton <vi...@gmail.com>.
Hi Hervé,
2007/12/6, Hervé BOUTEMY <he...@free.fr>:
> yes, it has a corresponding commit on trunk:
> URL: http://svn.apache.org/viewvc?rev=601096&view=rev
>
> It's not the first time someone doesn't find one of my corresponding commits.
> Do I do something wrong? or at least should I do something to have it more
> easy to follow?
Usually, a commit message on branch is something like:
merged from rXXX (message from trunk)
(and vice versa branch to trunk)
As Brett said, tracking informations, specifically on branches, could
be helpful. HTH.
Cheers,
Vincent
>
> There is no issue associated for the moment: while fighting with strange
> problems on Maven Ant Tasks resolution, I found this code. With such code, I
> don't understand how Maven can preserve dependencies order: it breaks Maven
> Ant Tasks, but doesn't seem to affect Maven Core.
> I chose to commit this change, without clear test case and complete fix in
> mind. But as I work deeper on this, I see I don't fully understand how the
> whole thing works: the reasoning is really simple, but is perhaps totally
> wrong.
> Let me know if you think I should rollback this commit: this time, it's clear
> it's not completely under control. :(
>
> Time for me to slow down a little bit and be more careful...
>
> Hervé
>
> Le mercredi 05 décembre 2007, Brett Porter a écrit :
> > Does this have a corresponding commit on trunk? Issue number?
> >
> > Just kind of particular about the branch :D
> >
> > - Brett
> >
> > On 05/12/2007, at 8:43 AM, hboutemy@apache.org wrote:
> > > Author: hboutemy
> > > Date: Tue Dec 4 13:43:06 2007
> > > New Revision: 601095
> > >
> > > URL: http://svn.apache.org/viewvc?rev=601095&view=rev
> > > Log:
> > > keep dependencies order when injecting profile
> > >
> > > Modified:
> > > maven/components/branches/maven-2.0.x/maven-project/src/main/java/
> > > org/apache/maven/project/injection/DefaultProfileInjector.java
> > >
> > > Modified: maven/components/branches/maven-2.0.x/maven-project/src/
> > > main/java/org/apache/maven/project/injection/
> > > DefaultProfileInjector.java
> > > URL:
> > > http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-
> > >project/src/main/java/org/apache/maven/project/injection/DefaultProfileInj
> > >ector.java?rev=601095&r1=601094&r2=601095&view=diff =
> > > =
> > > =
> > > =
> > > =
> > > =
> > > =
> > > =
> > > ======================================================================
> > > --- maven/components/branches/maven-2.0.x/maven-project/src/main/
> > > java/org/apache/maven/project/injection/DefaultProfileInjector.java
> > > (original)
> > > +++ maven/components/branches/maven-2.0.x/maven-project/src/main/
> > > java/org/apache/maven/project/injection/DefaultProfileInjector.java
> > > Tue Dec 4 13:43:06 2007
> > > @@ -291,7 +291,7 @@
> > > }
> > >
> > > }
> > > -
> > > +
> > > /**
> > > * Merge two DOMs. Copy the dominant DOM so the original one is
> > > left unchanged.
> > > * <p>
> > > @@ -592,7 +592,7 @@
> > >
> > > private void injectDependencies( Profile profile, Model model )
> > > {
> > > - Map depsMap = new HashMap();
> > > + Map depsMap = new LinkedHashMap();
> > >
> > > List deps = model.getDependencies();
> >
> > ---------------------------------------------------------------------
> > 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: svn commit: r601095 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
Posted by Hervé BOUTEMY <he...@free.fr>.
yes, it has a corresponding commit on trunk:
URL: http://svn.apache.org/viewvc?rev=601096&view=rev
It's not the first time someone doesn't find one of my corresponding commits.
Do I do something wrong? or at least should I do something to have it more
easy to follow?
There is no issue associated for the moment: while fighting with strange
problems on Maven Ant Tasks resolution, I found this code. With such code, I
don't understand how Maven can preserve dependencies order: it breaks Maven
Ant Tasks, but doesn't seem to affect Maven Core.
I chose to commit this change, without clear test case and complete fix in
mind. But as I work deeper on this, I see I don't fully understand how the
whole thing works: the reasoning is really simple, but is perhaps totally
wrong.
Let me know if you think I should rollback this commit: this time, it's clear
it's not completely under control. :(
Time for me to slow down a little bit and be more careful...
Hervé
Le mercredi 05 décembre 2007, Brett Porter a écrit :
> Does this have a corresponding commit on trunk? Issue number?
>
> Just kind of particular about the branch :D
>
> - Brett
>
> On 05/12/2007, at 8:43 AM, hboutemy@apache.org wrote:
> > Author: hboutemy
> > Date: Tue Dec 4 13:43:06 2007
> > New Revision: 601095
> >
> > URL: http://svn.apache.org/viewvc?rev=601095&view=rev
> > Log:
> > keep dependencies order when injecting profile
> >
> > Modified:
> > maven/components/branches/maven-2.0.x/maven-project/src/main/java/
> > org/apache/maven/project/injection/DefaultProfileInjector.java
> >
> > Modified: maven/components/branches/maven-2.0.x/maven-project/src/
> > main/java/org/apache/maven/project/injection/
> > DefaultProfileInjector.java
> > URL:
> > http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-
> >project/src/main/java/org/apache/maven/project/injection/DefaultProfileInj
> >ector.java?rev=601095&r1=601094&r2=601095&view=diff =
> > =
> > =
> > =
> > =
> > =
> > =
> > =
> > ======================================================================
> > --- maven/components/branches/maven-2.0.x/maven-project/src/main/
> > java/org/apache/maven/project/injection/DefaultProfileInjector.java
> > (original)
> > +++ maven/components/branches/maven-2.0.x/maven-project/src/main/
> > java/org/apache/maven/project/injection/DefaultProfileInjector.java
> > Tue Dec 4 13:43:06 2007
> > @@ -291,7 +291,7 @@
> > }
> >
> > }
> > -
> > +
> > /**
> > * Merge two DOMs. Copy the dominant DOM so the original one is
> > left unchanged.
> > * <p>
> > @@ -592,7 +592,7 @@
> >
> > private void injectDependencies( Profile profile, Model model )
> > {
> > - Map depsMap = new HashMap();
> > + Map depsMap = new LinkedHashMap();
> >
> > List deps = model.getDependencies();
>
> ---------------------------------------------------------------------
> 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