You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2013/06/03 12:46:02 UTC
[21/50] git commit: [MSITE-484] reporting section cannot be
deprecated in Maven core for the moment
[MSITE-484] reporting section cannot be deprecated in Maven core for the
moment
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7d359445
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7d359445
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7d359445
Branch: refs/heads/slf4j-log4j2
Commit: 7d359445d1ca21badaf4481c379939bbf531a822
Parents: 9404499
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat May 18 12:16:51 2013 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat May 18 12:16:51 2013 +0200
----------------------------------------------------------------------
.../model/plugin/DefaultReportingConverter.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/7d359445/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
index f8a2a93..7079f88 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
@@ -27,11 +27,7 @@ import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.ReportSet;
import org.apache.maven.model.Reporting;
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.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.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -104,6 +100,7 @@ public class DefaultReportingConverter
boolean hasMavenProjectInfoReportsPlugin = false;
+ /* waiting for MSITE-484 before deprecating <reporting> section
if ( !reporting.getPlugins().isEmpty()
&& request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 )
{
@@ -111,7 +108,7 @@ public class DefaultReportingConverter
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." )
.setLocation( reporting.getLocation( "" ) ) );
- }
+ }*/
for ( ReportPlugin plugin : reporting.getPlugins() )
{