You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/01/21 20:31:48 UTC
svn commit: r736386 - in /maven/components/trunk:
maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Author: sisbell
Date: Wed Jan 21 11:31:48 2009
New Revision: 736386
URL: http://svn.apache.org/viewvc?rev=736386&view=rev
Log:
Fix: MNG-3965
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Modified: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java?rev=736386&r1=736385&r2=736386&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java Wed Jan 21 11:31:48 2009
@@ -483,6 +483,19 @@
tmp.add(tmp.indexOf(mc.getProperties().get(0)) + 1, new ModelProperty(ProjectUri.Dependencies.Dependency.scope, "compile"));
}
}
+
+ //Remove Default Executions IDS (mng-3965)
+ List<ModelProperty> replace = new ArrayList<ModelProperty>();
+ for(ModelProperty mp : tmp)
+ {
+ if(mp.getUri().equals(ProjectUri.Build.Plugins.Plugin.Executions.Execution.id)
+ && mp.getResolvedValue() != null && mp.getResolvedValue().equals("default-execution-id")) {
+ replace.add(mp);
+ }
+ }
+
+ tmp.removeAll(replace);
+
//Missing Version Rule
if ( getPropertyFor( ProjectUri.version, tmp ) == null )
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=736386&r1=736385&r2=736386&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Wed Jan 21 11:31:48 2009
@@ -114,11 +114,12 @@
assertEquals( 3, ( (List<?>) pom.getValue( "repositories" ) ).size() );
}
- /** MNG-3985
+ /** MNG-3965 */
public void testMultipleExecutionIds()
throws Exception
{
PomTestWrapper pom = buildPom( "dual-execution-ids/sub" );
+ // System.out.println(pom.getDomainModel().asString());
assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
}
//*/
Re: svn commit: r736386 - in /maven/components/trunk: maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Posted by Brett Porter <br...@apache.org>.
Hi Shane,
On 21/01/2009, at 11:31 AM, sisbell@apache.org wrote:
> Author: sisbell
> Date: Wed Jan 21 11:31:48 2009
> New Revision: 736386
>
> URL: http://svn.apache.org/viewvc?rev=736386&view=rev
> Log:
> Fix: MNG-3965
Would you mind including the description of what it fixes from the
JIRA issue in the log comment too? It is helpful in the future when
looking through svnsearch, etc. for example.
Thanks!
- 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