You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2019/02/23 22:46:12 UTC
[maven] 02/02: [MNG-6601] add input location tracking for m-site-p
converted reports
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-6597
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 3b36beb3e6f3e3796a075a744ce93e86bc345a81
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Feb 23 12:55:25 2019 +0100
[MNG-6601] add input location tracking for m-site-p converted reports
---
.../model/plugin/DefaultReportingConverter.java | 45 +++++++++++++++-------
1 file changed, 32 insertions(+), 13 deletions(-)
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 8bfa580..70eff4c 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
@@ -20,6 +20,8 @@ package org.apache.maven.model.plugin;
*/
import org.apache.maven.model.Build;
+import org.apache.maven.model.InputLocation;
+import org.apache.maven.model.InputSource;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
@@ -45,6 +47,15 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
public class DefaultReportingConverter
implements ReportingConverter
{
+ private final InputLocation location;
+ {
+ String modelId = "org.apache.maven:maven-model-builder:"
+ + this.getClass().getPackage().getImplementationVersion() + ":reporting-converter";
+ InputSource inputSource = new InputSource();
+ inputSource.setModelId( modelId );
+ location = new InputLocation( -1, -1, inputSource );
+ location.setLocation( 0, location );
+ }
@Override
public void convertReporting( Model model, ModelBuildingRequest request, ModelProblemCollector problems )
@@ -62,6 +73,7 @@ public class DefaultReportingConverter
{
build = new Build();
model.setBuild( build );
+ model.setLocation( "build", location );
}
Plugin sitePlugin = findSitePlugin( build );
@@ -70,6 +82,7 @@ public class DefaultReportingConverter
{
sitePlugin = new Plugin();
sitePlugin.setArtifactId( "maven-site-plugin" );
+ sitePlugin.setLocation( "artifactId", location );
PluginManagement pluginManagement = build.getPluginManagement();
if ( pluginManagement == null )
{
@@ -83,7 +96,7 @@ public class DefaultReportingConverter
if ( configuration == null )
{
- configuration = new Xpp3Dom( "configuration" );
+ configuration = new Xpp3Dom( "configuration", location );
sitePlugin.setConfiguration( configuration );
}
@@ -102,10 +115,11 @@ public class DefaultReportingConverter
if ( configuration.getChild( "outputDirectory" ) == null )
{
- addDom( configuration, "outputDirectory", reporting.getOutputDirectory() );
+ addDom( configuration, "outputDirectory", reporting.getOutputDirectory(),
+ reporting.getLocation( "outputDirectory" ) );
}
- reportPlugins = new Xpp3Dom( "reportPlugins" );
+ reportPlugins = new Xpp3Dom( "reportPlugins", location );
configuration.addChild( reportPlugins );
boolean hasMavenProjectInfoReportsPlugin = false;
@@ -136,7 +150,7 @@ public class DefaultReportingConverter
if ( !reporting.isExcludeDefaults() && !hasMavenProjectInfoReportsPlugin )
{
- Xpp3Dom dom = new Xpp3Dom( "reportPlugin" );
+ Xpp3Dom dom = new Xpp3Dom( "reportPlugin", location );
addDom( dom, "groupId", "org.apache.maven.plugins" );
addDom( dom, "artifactId", "maven-project-info-reports-plugin" );
@@ -178,11 +192,11 @@ public class DefaultReportingConverter
private Xpp3Dom convert( ReportPlugin plugin )
{
- Xpp3Dom dom = new Xpp3Dom( "reportPlugin" );
+ Xpp3Dom dom = new Xpp3Dom( "reportPlugin", plugin.getLocation( "" ) );
- addDom( dom, "groupId", plugin.getGroupId() );
- addDom( dom, "artifactId", plugin.getArtifactId() );
- addDom( dom, "version", plugin.getVersion() );
+ addDom( dom, "groupId", plugin.getGroupId(), plugin.getLocation( "groupId" ) );
+ addDom( dom, "artifactId", plugin.getArtifactId(), plugin.getLocation( "artifactId" ) );
+ addDom( dom, "version", plugin.getVersion(), plugin.getLocation( "version" ) );
Xpp3Dom configuration = (Xpp3Dom) plugin.getConfiguration();
if ( configuration != null )
@@ -193,7 +207,7 @@ public class DefaultReportingConverter
if ( !plugin.getReportSets().isEmpty() )
{
- Xpp3Dom reportSets = new Xpp3Dom( "reportSets" );
+ Xpp3Dom reportSets = new Xpp3Dom( "reportSets", location );
for ( ReportSet reportSet : plugin.getReportSets() )
{
Xpp3Dom rs = convert( reportSet );
@@ -207,7 +221,7 @@ public class DefaultReportingConverter
private Xpp3Dom convert( ReportSet reportSet )
{
- Xpp3Dom dom = new Xpp3Dom( "reportSet" );
+ Xpp3Dom dom = new Xpp3Dom( "reportSet", location );
addDom( dom, "id", reportSet.getId() );
@@ -233,15 +247,20 @@ public class DefaultReportingConverter
private void addDom( Xpp3Dom parent, String childName, String childValue )
{
+ addDom( parent, childName, childValue, location );
+ }
+
+ private void addDom( Xpp3Dom parent, String childName, String childValue, InputLocation location )
+ {
if ( StringUtils.isNotEmpty( childValue ) )
{
- parent.addChild( newDom( childName, childValue ) );
+ parent.addChild( newDom( childName, childValue, location ) );
}
}
- private Xpp3Dom newDom( String name, String value )
+ private Xpp3Dom newDom( String name, String value, InputLocation location )
{
- Xpp3Dom dom = new Xpp3Dom( name );
+ Xpp3Dom dom = new Xpp3Dom( name, location );
dom.setValue( value );
return dom;
}