[Maven-plugins-cvs] cvs commit: maven-plugins/uberdist plugin.jelly

[Eric G. <ri...@us...>]

rikgig      05/05/18 11:20:01

  Modified:    uberdist plugin.jelly
  Log:
  Fix stupid cut n paste error that broke dependency deployment
  
  Revision  Changes    Path
  1.4       +5 -5      maven-plugins/uberdist/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/uberdist/plugin.jelly,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- plugin.jelly	12 May 2005 19:56:24 -0000	1.3
  +++ plugin.jelly	18 May 2005 18:20:00 -0000	1.4
  @@ -94,15 +94,15 @@
               <j:if test="${lib.dependency.getProperty(projectId)=='true'}">
                 <j:set var="depDeployDir" value="${projectDepDeployDir}"/>
                   <!-- Check to see if the jar.dependency.deploy.dir was overriden at the dependency level -->
  -              <j:if test="${dep.dependency.getProperty('jar.dependency.dist.dir')!=null}">
  -                <j:set var="depDeployDir" value="${dep.dependency.getProperty('jar.dependency.dist.dir')}${'/'}"/>
  +              <j:if test="${lib.dependency.getProperty('jar.dependency.dist.dir')!=null}">
  +                <j:set var="depDeployDir" value="${lib.dependency.getProperty('jar.dependency.dist.dir')}${'/'}"/>
                 </j:if>
                     <!-- Here check if the deploy name for the dependency must be overriden to satisfy
                          either plateform requirement or libraries manifest sepecifications -->
                 <j:choose>
  -                  <j:when test="${dep.dependency.getProperty('jar.dependency.dist.name')!=null}">
  -                      <j:set var="depDeployName" value="${dep.dependency.getProperty('jar.dependency.dist.name')}"/>
  -                      <echo message="Deploying dependency: ${dep.file.name} under overriden name: ${depDeployName}"/>
  +                  <j:when test="${lib.dependency.getProperty('jar.dependency.dist.name')!=null}">
  +                      <j:set var="depDeployName" value="${lib.dependency.getProperty('jar.dependency.dist.name')}"/>
  +                      <echo message="Deploying dependency: ${lib.file.name} under overriden name: ${depDeployName}"/>
                     </j:when>
                     <j:otherwise>
                         <j:set var="depDeployName" value="${lib.file.name}"/>