You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/10/17 12:06:21 UTC
svn commit: r705543 - in /maven/components/branches/maven-2.1.x/maven-project/src: main/java/org/apache/maven/project/inheritance/ test/java/org/apache/maven/project/inheritance/

Author: brett
Date: Fri Oct 17 03:06:20 2008
New Revision: 705543

URL: http://svn.apache.org/viewvc?rev=705543&view=rev
Log:
[MNG-1999] fix excludeDefaults inheritance
Merged from: r705540 on maven-2.0.x

Modified:
    maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
    maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java

Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=705543&r1=705542&r2=705543&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Fri Oct 17 03:06:20 2008
@@ -233,7 +233,10 @@
                 child.setReporting( childReporting );
             }
 
-            childReporting.setExcludeDefaults( parentReporting.isExcludeDefaults() );
+            if ( parentReporting.isExcludeDefaults() )
+            {
+                childReporting.setExcludeDefaults( true );
+            }
 
             if ( StringUtils.isEmpty( childReporting.getOutputDirectory() ) )
             {

Modified: maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java?rev=705543&r1=705542&r2=705543&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java Fri Oct 17 03:06:20 2008
@@ -674,6 +674,27 @@
         assembler.assembleModelInheritance( child, parent );
 
         assertTrue( "Check excludeDefaults is inherited", child.getReporting().isExcludeDefaults() );
+
+        child = makeBaseModel( "child" );
+        child.setReporting( new Reporting() );
+
+        parentBuild.setExcludeDefaults( true );
+
+        assembler.assembleModelInheritance( child, parent );
+
+        assertTrue( "Check excludeDefaults is inherited when reporting is set but excludeDefaults is not",
+                    child.getReporting().isExcludeDefaults() );
+
+        child = makeBaseModel( "child" );
+        Reporting childReporting = new Reporting();
+        child.setReporting( childReporting );
+
+        parent.setReporting( new Reporting() );
+        childReporting.setExcludeDefaults( true );
+
+        assembler.assembleModelInheritance( child, parent );
+
+        assertTrue( "Check excludeDefaults is inherited properly", child.getReporting().isExcludeDefaults() );
     }
 
     public void testReportInheritanceWhereParentReportWithoutInheritFlagAndChildHasNoReports()