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 2006/04/13 09:22:21 UTC
svn commit: r393748 -
/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Author: brett
Date: Thu Apr 13 00:22:18 2006
New Revision: 393748
URL: http://svn.apache.org/viewcvs?rev=393748&view=rev
Log:
match correct reactor project by group and version, not just artifact ID (which also would cause infinite recursion if the parent had the same artifact id but different group ID, such as Apache Directory's MINA).
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=393748&r1=393747&r2=393748&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Thu Apr 13 00:22:18 2006
@@ -407,23 +407,18 @@
MavenProject origParent = project.getParent();
if ( origParent != null )
{
- if ( origParent.getArtifactId() != null )
- {
- String parentArtifactId = origParent.getArtifactId();
+ Iterator reactorItr = reactorProjects.iterator();
- Iterator reactorItr = reactorProjects.iterator();
+ while ( reactorItr.hasNext() )
+ {
+ MavenProject reactorProject = (MavenProject) reactorItr.next();
- while ( reactorItr.hasNext() )
+ if ( reactorProject.getGroupId().equals( origParent.getGroupId() ) &&
+ reactorProject.getArtifactId().equals( origParent.getArtifactId() ) &&
+ reactorProject.getVersion().equals( origParent.getVersion() ) )
{
- MavenProject reactorProject = (MavenProject) reactorItr.next();
-
- String reactorArtifactId = reactorProject.getArtifactId();
-
- if ( parentArtifactId.equals( reactorArtifactId ) )
- {
- parentProject = reactorProject;
- break;
- }
+ parentProject = reactorProject;
+ break;
}
}