Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Setting of report artifacts and plugin artifacts through mutator methods previously ignored. Fixed this. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@693722 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2008-09-10 07:48:16 +00:00
parent 65b674f15c
commit 832b7e5853
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
maven-project/src/main/java/org/apache/maven/project/MavenProject.java
View File

@ -282,11 +282,6 @@ public class MavenProject
parentFile = new File( project.getParentFile().getAbsolutePath() ); parentFile = new File( project.getParentFile().getAbsolutePath() );
} }
// if ( project.getPluginArtifacts() != null )
// {
// setPluginArtifacts( Collections.unmodifiableSet( project.getPluginArtifacts() ) );
// }
if ( project.getReportArtifacts() != null ) if ( project.getReportArtifacts() != null )
{ {
setReportArtifacts( Collections.unmodifiableSet( project.getReportArtifacts() ) ); setReportArtifacts( Collections.unmodifiableSet( project.getReportArtifacts() ) );
@ -1284,7 +1279,6 @@ public class MavenProject
{ {
artifactMap = ArtifactUtils.artifactMapByVersionlessId( getArtifacts() ); artifactMap = ArtifactUtils.artifactMapByVersionlessId( getArtifacts() );
} }
return artifactMap; return artifactMap;
} }
@ -1348,7 +1342,12 @@ public class MavenProject
public Set getReportArtifacts() public Set getReportArtifacts()
{ {
Set reportArtifacts = new HashSet(); if( reportArtifacts != null )
{
return reportArtifacts;
}
reportArtifacts = new HashSet();
List reports = getReportPlugins(); List reports = getReportPlugins();
if ( reports != null ) if ( reports != null )
{ {
@ -1406,7 +1405,11 @@ public class MavenProject
public Set getExtensionArtifacts() public Set getExtensionArtifacts()
{ {
Set extensionArtifacts = new HashSet(); if( extensionArtifacts != null )
{
return extensionArtifacts;
}
extensionArtifacts = new HashSet();
List extensions = getBuildExtensions(); List extensions = getBuildExtensions();
if ( extensions != null ) if ( extensions != null )
{ {
@ -1484,7 +1487,7 @@ public class MavenProject
{ {
if ( getModel().getReporting() == null ) if ( getModel().getReporting() == null )
{ {
return null; return Collections.EMPTY_LIST;
} }
return getModel().getReporting().getPlugins(); return getModel().getReporting().getPlugins();
@ -1494,7 +1497,7 @@ public class MavenProject
{ {
if ( getModel().getBuild() == null ) if ( getModel().getBuild() == null )
{ {
return null; return Collections.EMPTY_LIST;
} }
return getModel().getBuild().getPlugins(); return getModel().getBuild().getPlugins();
} }