[prev in list] [next in list] [prev in thread] [next in thread] 

List:       avalon-cvs
Subject:    cvs commit: avalon-sandbox/merlin project.xml
From:       mcconnell () apache ! org
Date:       2003-07-31 17:29:04
[Download RAW message or body]

mcconnell    2003/07/31 10:29:04

  Modified:    merlin   project.xml
  Log:
  Update to resolve Maven 10 bug with unresolved ${maven.conf.dir} in resource and unit test includes.
  
  Revision  Changes    Path
  1.27      +3 -3      avalon-sandbox/merlin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- project.xml	31 Jul 2003 14:54:15 -0000	1.26
  +++ project.xml	31 Jul 2003 17:29:04 -0000	1.27
  @@ -197,7 +197,7 @@
             </includes>
           </resource>
           <resource>
  -          <directory>${maven.conf.dir}</directory>
  +          <directory>${basedir}/conf</directory>
             <includes> 
               <include>**/*.properties</include>
             </includes>
  @@ -241,14 +241,14 @@
           </includes>
         </resource>
         <resource>
  -        <directory>${maven.conf.dir}</directory>
  +        <directory>${basedir}/conf</directory>
           <targetPath>BLOCK-INF</targetPath>
           <includes>
             <include>block.xml</include>
           </includes>
         </resource>
         <resource>
  -        <directory>${maven.conf.dir}</directory>
  +        <directory>${basedir}/conf</directory>
           <includes> 
             <include>**/*.properties</include>
           </includes>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

[prev in list] [next in list] [prev in thread] [next in thread]