| commit | 639756c9ccfa73f69a7c7f363e4f6ce71c58355f | [log] [tgz] |
|---|---|---|
| author | Herve Boutemy <hboutemy@apache.org> | Sat Jun 21 15:42:51 2014 +0000 |
| committer | Herve Boutemy <hboutemy@apache.org> | Sat Jun 21 15:42:51 2014 +0000 |
| tree | 58f08983787c95982ecf63acb7edfea1e6aca2ec | |
| parent | 23c1de6180afbeb748e4cd4dd1580c6607add3f1 [diff] |
[DOXIATOOLS-48] don't read parent site.xml if inheritance not expected git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk@1604424 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml index 982a861..4172b47 100644 --- a/doxia-integration-tools/pom.xml +++ b/doxia-integration-tools/pom.xml
@@ -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>
diff --git a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java index ca7667d..741e28d 100644 --- a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java +++ b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
@@ -1080,9 +1080,9 @@ 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 );