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 2016/01/02 11:11:42 UTC
svn commit: r1722617 -
/maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Author: hboutemy
Date: Sat Jan 2 10:11:42 2016
New Revision: 1722617
URL: http://svn.apache.org/viewvc?rev=1722617&view=rev
Log:
make systematic debug message for parent project retrieval (instead of only sometimes and as info)
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Modified: maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1722617&r1=1722616&r2=1722617&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Sat Jan 2 10:11:42 2016
@@ -527,6 +527,8 @@ public class DefaultSiteTool
&& reactorProject.getVersion().equals( origParent.getVersion() ) )
{
parentProject = reactorProject;
+
+ getLogger().debug( "Parent project " + origParent.getId() + " picked from reactor" );
break;
}
}
@@ -555,14 +557,16 @@ public class DefaultSiteTool
&& mavenProject.getVersion().equals( origParent.getVersion() ) )
{
parentProject = mavenProject;
- }
- getLogger().info( "Parent project loaded from a relative path: " + relativePath );
+ getLogger().debug( "Parent project " + origParent.getId() + " loaded from a relative path: "
+ + relativePath );
+ }
}
}
catch ( ProjectBuildingException e )
{
- getLogger().info( "Unable to load parent project from a relative path: " + e.getMessage() );
+ getLogger().info( "Unable to load parent project " + origParent.getId() + " from a relative path: "
+ + e.getMessage() );
}
}
@@ -572,19 +576,23 @@ public class DefaultSiteTool
{
parentProject = mavenProjectBuilder.buildFromRepository( aProject.getParentArtifact(), aProject
.getRemoteArtifactRepositories(), localRepository );
- getLogger().info( "Parent project loaded from repository: " + parentProject.getId() );
+
+ getLogger().debug( "Parent project " + origParent.getId() + " loaded from repository" );
}
catch ( ProjectBuildingException e )
{
- getLogger().warn( "Unable to load parent project from repository: " + e.getMessage() );
+ getLogger().warn( "Unable to load parent project " + origParent.getId() + " from repository: "
+ + e.getMessage() );
}
}
if ( parentProject == null )
{
- // fallback to uninterpolated value
+ // fallback to original parent, which may contain uninterpolated value (still need a unit test)
parentProject = origParent;
+
+ getLogger().debug( "Parent project " + origParent.getId() + " picked from original value" );
}
}
return parentProject;