You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2009/02/06 11:48:11 UTC
svn commit: r741522 - in /maven/components/branches/maven-2.0.x: ./
apache-maven/ apache-maven/src/test/ maven-integration-tests/
maven-model/src/test/
maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
Author: brett
Date: Fri Feb 6 10:48:10 2009
New Revision: 741522
URL: http://svn.apache.org/viewvc?rev=741522&view=rev
Log:
[MNG-3719] restore POM ordering of plugin executions declared in separate plugin elements
Submitted by: Torben S. Giesselmann
Merged from: r741518
Modified:
maven/components/branches/maven-2.0.x/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/src/test/ (props changed)
maven/components/branches/maven-2.0.x/maven-integration-tests/ (props changed)
maven/components/branches/maven-2.0.x/maven-model/src/test/ (props changed)
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 6 10:48:10 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC:708790-728809,728834
-/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,738723,738753,739385,741507
+/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,738723,738753,739385,741507,741518
/maven/components/trunk:720001,721902,726845,729292
Propchange: maven/components/branches/maven-2.0.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 6 10:48:10 2009
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven:708790-728809,728834
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055
-/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,738723,738753,741507
+/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,738723,738753,741507,741518
/maven/components/trunk/apache-maven:720001,721902,726845
/maven/components/trunk/maven-distribution:727688
Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 6 10:48:10 2009
@@ -1,2 +1,2 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:727009-728809,728834
-/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,738723,738753,741507
+/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,738723,738753,741507,741518
Propchange: maven/components/branches/maven-2.0.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 6 10:48:10 2009
@@ -1,2 +1,2 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:709246-728809,728834
-/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,738723,738753,741507
+/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,738723,738753,741507,741518
Propchange: maven/components/branches/maven-2.0.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 6 10:48:10 2009
@@ -1,2 +1,2 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:727009-728809,728834
-/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,738723,738753,741507
+/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,738723,738753,741507,741518
Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=741522&r1=741521&r2=741522&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java Fri Feb 6 10:48:10 2009
@@ -98,7 +98,10 @@
int idx = normalized.indexOf( currentPlugin );
Plugin firstPlugin = (Plugin) normalized.get( idx );
- mergePluginDefinitions( firstPlugin, currentPlugin, false );
+ // MNG-3719: merge currentPlugin with firstPlugin as parent,
+ // then use updated currentPlugin as new parent
+ mergePluginDefinitions( currentPlugin, firstPlugin, false );
+ normalized.set(idx, currentPlugin);
}
else
{
Re: svn commit: r741522 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ apache-maven/src/test/ maven-integration-tests/ maven-model/src/test/ maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
Posted by Brett Porter <br...@apache.org>.
On 07/02/2009, at 7:12 PM, Torben S. Giesselmann wrote:
> John Casey wrote:
>> Is there a reason we haven't banned multiple plugin entries in a
>> single POM? I thought we talked about this ages ago...frankly, I'm
>> a little shocked that we never got it in code...
Yes, I was surprised too - I applied Torben's patch since it seemed
consistent with your original intent without causing any disruption to
the behaviour.
>>
>
> I would recommend such a change for 2.1, not 2.0.x, since that would
> probably break a lot of existing POMs overnight.
Yep, I agree. We could roll a deprecation warning in to 2.1.0 perhaps,
but I don't think a hard failure is in order, esp. this late in the
dev cycle.
Thanks for the patch!
- Brett
--
Brett Porter
brett@apache.org
http://blogs.exist.com/bporter/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r741522 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ apache-maven/src/test/ maven-integration-tests/ maven-model/src/test/ maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
Posted by Christian Edward Gruber <ch...@gmail.com>.
It might be worth adding a warning if a second plugin entry is
detected, as that will begin to create an awareness of this non-
recommended practice.
Christian.
On 7-Feb-09, at 06:12 , Torben S. Giesselmann wrote:
> John Casey wrote:
>> Is there a reason we haven't banned multiple plugin entries in a
>> single POM? I thought we talked about this ages ago...frankly, I'm
>> a little shocked that we never got it in code...
>
> I would recommend such a change for 2.1, not 2.0.x, since that would
> probably break a lot of existing POMs overnight.
>
> Regards,
> - Torben
>
>
> --
> Torben S. Giesselmann
> tsg-swdev@foogoo.net
>
> A clear conscience is usually the sign of a bad memory.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
Christian Edward Gruber
christianedwardgruber@gmail.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r741522 - in /maven/components/branches/maven-2.0.x:
./ apache-maven/ apache-maven/src/test/ maven-integration-tests/ maven-model/src/test/
maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
Posted by "Torben S. Giesselmann" <ts...@foogoo.net>.
John Casey wrote:
> Is there a reason we haven't banned multiple plugin entries in a single
> POM? I thought we talked about this ages ago...frankly, I'm a little
> shocked that we never got it in code...
I would recommend such a change for 2.1, not 2.0.x, since that would
probably break a lot of existing POMs overnight.
Regards,
- Torben
--
Torben S. Giesselmann
tsg-swdev@foogoo.net
A clear conscience is usually the sign of a bad memory.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r741522 - in /maven/components/branches/maven-2.0.x:
./ apache-maven/ apache-maven/src/test/ maven-integration-tests/ maven-model/src/test/
maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
Posted by John Casey <jd...@commonjava.org>.
Is there a reason we haven't banned multiple plugin entries in a single
POM? I thought we talked about this ages ago...frankly, I'm a little
shocked that we never got it in code...
-john
brett@apache.org wrote:
> Author: brett
> Date: Fri Feb 6 10:48:10 2009
> New Revision: 741522
>
> URL: http://svn.apache.org/viewvc?rev=741522&view=rev
> Log:
> [MNG-3719] restore POM ordering of plugin executions declared in separate plugin elements
> Submitted by: Torben S. Giesselmann
> Merged from: r741518
>
> Modified:
> maven/components/branches/maven-2.0.x/ (props changed)
> maven/components/branches/maven-2.0.x/apache-maven/ (props changed)
> maven/components/branches/maven-2.0.x/apache-maven/src/test/ (props changed)
> maven/components/branches/maven-2.0.x/maven-integration-tests/ (props changed)
> maven/components/branches/maven-2.0.x/maven-model/src/test/ (props changed)
> maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
>
> Propchange: maven/components/branches/maven-2.0.x/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Fri Feb 6 10:48:10 2009
> @@ -1,3 +1,3 @@
> /maven/components/branches/maven-2.0.10-RC:708790-728809,728834
> -/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,738723,738753,739385,741507
> +/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,738723,738753,739385,741507,741518
> /maven/components/trunk:720001,721902,726845,729292
>
> Propchange: maven/components/branches/maven-2.0.x/apache-maven/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Fri Feb 6 10:48:10 2009
> @@ -1,5 +1,5 @@
> /maven/components/branches/maven-2.0.10-RC/apache-maven:708790-728809,728834
> /maven/components/branches/maven-2.0.x/apache-maven:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055
> -/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,738723,738753,741507
> +/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,738723,738753,741507,741518
> /maven/components/trunk/apache-maven:720001,721902,726845
> /maven/components/trunk/maven-distribution:727688
>
> Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/test/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Fri Feb 6 10:48:10 2009
> @@ -1,2 +1,2 @@
> /maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:727009-728809,728834
> -/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,738723,738753,741507
> +/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,738723,738753,741507,741518
>
> Propchange: maven/components/branches/maven-2.0.x/maven-integration-tests/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Fri Feb 6 10:48:10 2009
> @@ -1,2 +1,2 @@
> /maven/components/branches/maven-2.0.10-RC/maven-integration-tests:709246-728809,728834
> -/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,738723,738753,741507
> +/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,738723,738753,741507,741518
>
> Propchange: maven/components/branches/maven-2.0.x/maven-model/src/test/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Fri Feb 6 10:48:10 2009
> @@ -1,2 +1,2 @@
> /maven/components/branches/maven-2.0.10-RC/maven-model/src/test:727009-728809,728834
> -/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,738723,738753,741507
> +/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,738723,738753,741507,741518
>
> Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
> URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=741522&r1=741521&r2=741522&view=diff
> ==============================================================================
> --- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (original)
> +++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java Fri Feb 6 10:48:10 2009
> @@ -98,7 +98,10 @@
> int idx = normalized.indexOf( currentPlugin );
> Plugin firstPlugin = (Plugin) normalized.get( idx );
>
> - mergePluginDefinitions( firstPlugin, currentPlugin, false );
> + // MNG-3719: merge currentPlugin with firstPlugin as parent,
> + // then use updated currentPlugin as new parent
> + mergePluginDefinitions( currentPlugin, firstPlugin, false );
> + normalized.set(idx, currentPlugin);
> }
> else
> {
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org