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 2014/06/21 17:42:52 UTC

svn commit: r1604424 - in /maven/doxia/doxia-tools/trunk/doxia-integration-tools: pom.xml src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java

Author: hboutemy
Date: Sat Jun 21 15:42:51 2014
New Revision: 1604424

URL: http://svn.apache.org/r1604424
Log:
[DOXIATOOLS-48] don't read parent site.xml if inheritance not expected

Modified:
    maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml
    maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java

Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml?rev=1604424&r1=1604423&r2=1604424&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml Sat Jun 21 15:42:51 2014
@@ -50,8 +50,8 @@
   </issueManagement>
 
   <properties>
-    <doxiaVersion>1.3</doxiaVersion>
-    <doxiaSitetoolsVersion>1.3</doxiaSitetoolsVersion>
+    <doxiaVersion>1.6-SNAPSHOT</doxiaVersion>
+    <doxiaSitetoolsVersion>1.6-SNAPSHOT</doxiaSitetoolsVersion>
     <mavenVersion>2.2.1</mavenVersion>
   </properties>
 

Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1604424&r1=1604423&r2=1604424&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original)
+++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Sat Jun 21 15:42:51 2014
@@ -1080,9 +1080,9 @@ public class DefaultSiteTool
             decoration.setLastModified( siteDescriptorLastModified );
         }
 
-        if ( parentProject != null )
+        if ( parentProject != null && decoration.isMergeParent() )
         {
-            getLogger().debug( "Parent project loaded ..." );
+            getLogger().debug( "Loading parent project site descriptor..." );
 
             MavenProject parentParentProject = getParentProject( parentProject, reactorProjects, localRepository );