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 18:39:08 UTC
svn commit: r1722647 - in /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy: AbstractDeployMojo.java AbstractStagingMojo.java

Author: hboutemy
Date: Sat Jan  2 17:39:08 2016
New Revision: 1722647

URL: http://svn.apache.org/viewvc?rev=1722647&view=rev
Log:
try to improve debug messages

Modified:
    maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
    maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java

Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java?rev=1722647&r1=1722646&r2=1722647&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java Sat Jan  2 17:39:08 2016
@@ -209,8 +209,10 @@ public abstract class AbstractDeployMojo
         {
             topDistributionManagementSiteUrl = determineTopDistributionManagementSiteUrl();
 
-            getLog().debug( "top distributionManagement.site.url=" + topDistributionManagementSiteUrl
-                                + ", actual module relative path: " + getDeployModuleDirectory() );
+            if ( !isDeploy() )
+            {
+                getLog().debug( "distributionManagement.site.url relative path: " + getDeployModuleDirectory() );
+            }
         }
         return topDistributionManagementSiteUrl;
     }

Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java?rev=1722647&r1=1722646&r2=1722647&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java Sat Jan  2 17:39:08 2016
@@ -22,6 +22,7 @@ package org.apache.maven.plugins.site.de
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
 
 /**
  * Abstract base class for staging mojos.
@@ -55,6 +56,19 @@ public abstract class AbstractStagingMoj
     protected String determineTopDistributionManagementSiteUrl()
         throws MojoExecutionException
     {
-        return ( StringUtils.isEmpty( topSiteURL ) ) ? getSite( getTopLevelProject( project ) ).getUrl() : topSiteURL;
+        if ( StringUtils.isEmpty( topSiteURL ) )
+        {
+            MavenProject topProject = getTopLevelProject( project );
+            String url = getSite( topProject ).getUrl();
+
+            getLog().debug( "staging top distributionManagement.site.url found in " + topProject.getId()
+                + " with value: " + url );
+
+            return url;
+        }
+
+        getLog().debug( "staging top distributionManagement.site.url configured with topSiteURL parameter: "
+            + topSiteURL );
+        return topSiteURL;
     }
 }