cvs commit: jakarta-turbine-maven/src/plugins-build/deploy plugin.jelly

[jv...@apache.org]

jvanzyl     2002/12/11 22:46:26

  Modified:    src/plugins-build/deploy plugin.jelly
  Log:
  o allow copy-deps to move the dependencies of any POM if provided.
    otherwise use the POM in the context.
  
  o adding a fix so that the jar name comes out correctly. internally we
    are relying on the artifact factory but this doesn't mesh well when
    reading a POM directly with no processing by the artifact factory.
    So this needs to be fixed but the fix works for the moment.
  
  Revision  Changes    Path
  1.10      +7 -1      jakarta-turbine-maven/src/plugins-build/deploy/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/deploy/plugin.jelly,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- plugin.jelly	14 Nov 2002 17:46:25 -0000	1.9
  +++ plugin.jelly	12 Dec 2002 06:46:26 -0000	1.10
  @@ -125,11 +125,17 @@
       
       <define:tag name="copy-deps">
         <j:set var="mavenRepoLocal" value='${context.getVariable("maven.repo.local")}'/>
  +      
  +      <j:if test="${projectDescriptor != null}">
  +        <maven:pom projectDescriptor="${projectDescriptor}" var="pom"/>
  +      </j:if>
  +
         <mkdir dir="${todir}"/>
         <copy todir="${todir}" flatten="true">
           <fileset dir="${mavenRepoLocal}">
             <j:forEach var="dep" items="${pom.dependencies}">
  -            <include name="${dep.projectId}/jars/${dep.jar}"/>
  +            ${dep.projectId}/jars/${dep.jar}
  +            <include name="${dep.projectId}/jars/${dep.artifact}jar"/>
             </j:forEach>
             <j:if test="${excludes != ''}">
               <!-- The excludes are a list of dep ids -->