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

[MSITE-484] reporting section cannot be deprecated in Maven core for the 

moment
This commit is contained in:
Hervé Boutemy 2013-05-18 12:16:51 +02:00
parent 9404499ccd
commit 7d359445d1
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
View File

@ -27,11 +27,7 @@ import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.ReportSet; import org.apache.maven.model.ReportSet;
import org.apache.maven.model.Reporting; import org.apache.maven.model.Reporting;
import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblemCollector; import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelProblem.Version;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3Dom;
@ -104,6 +100,7 @@ public class DefaultReportingConverter
boolean hasMavenProjectInfoReportsPlugin = false; boolean hasMavenProjectInfoReportsPlugin = false;
/* waiting for MSITE-484 before deprecating <reporting> section
if ( !reporting.getPlugins().isEmpty() if ( !reporting.getPlugins().isEmpty()
&& request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 ) && request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 )
{ {
@ -111,7 +108,7 @@ public class DefaultReportingConverter
problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V31 ) problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V31 )
.setMessage( "The <reporting> section is deprecated, please move the reports to the <configuration> section of the new Maven Site Plugin." ) .setMessage( "The <reporting> section is deprecated, please move the reports to the <configuration> section of the new Maven Site Plugin." )
.setLocation( reporting.getLocation( "" ) ) ); .setLocation( reporting.getLocation( "" ) ) );
} }*/
for ( ReportPlugin plugin : reporting.getPlugins() ) for ( ReportPlugin plugin : reporting.getPlugins() )
{ {