maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance DefaultModelInheritanceAssembler.java
Date Sun, 20 Jun 2004 13:36:34 GMT
jvanzyl     2004/06/20 06:36:34

  Modified:    maven-core .cvsignore
               maven-core/src/main/java/org/apache/maven/project/inheritance
                        DefaultModelInheritanceAssembler.java
  Log:
  
  
  Revision  Changes    Path
  1.2       +1 -0      maven-components/maven-core/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore	11 Jun 2004 15:11:51 -0000	1.1
  +++ .cvsignore	20 Jun 2004 13:36:34 -0000	1.2
  @@ -4,6 +4,7 @@
   dist
   *.ipr
   *.iws
  +*.iml
   dist
   target
   .classpath
  
  
  
  1.4       +6 -1      maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
  
  Index: DefaultModelInheritanceAssembler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultModelInheritanceAssembler.java	20 Jun 2004 02:44:28 -0000	1.3
  +++ DefaultModelInheritanceAssembler.java	20 Jun 2004 13:36:34 -0000	1.4
  @@ -164,6 +164,11 @@
               {
                   child.getBuild().setTestOutput( parent.getBuild().getTestOutput() );
               }
  +
  +            if ( child.getBuild().getUnitTest() == null )
  +            {
  +                child.getBuild().setUnitTest( parent.getBuild().getUnitTest() );
  +            }
           }
   
           // Dependencies :: aggregate
  
  
  

Mime
View raw message