You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/02/02 22:08:03 UTC

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

jvanzyl     2003/02/02 13:08:03

  Modified:    src/plugins-build/plexus plugin.jelly
  Log:
  o Adjust the plugin so that it will try the local repository first. The
    start of transitive dependencies is here.
  
  Revision  Changes    Path
  1.5       +46 -10    jakarta-turbine-maven/src/plugins-build/plexus/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/plexus/plugin.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- plugin.jelly	2 Feb 2003 19:14:53 -0000	1.4
  +++ plugin.jelly	2 Feb 2003 21:08:03 -0000	1.5
  @@ -46,7 +46,7 @@
       <mkdir dir="${maven.plexus.work}"/>
               
       <mkdir dir="${maven.plexus.components}"/>
  -    
  +
       <!--
        |
        | Create a project object from the Plexus POM so that we can glean
  @@ -57,7 +57,22 @@
       <maven:pom 
         projectDescriptor="${maven.plexus.pom}"
         var="plexusPom"/>
  -      
  +
  +    <j:set 
  +      var="plexusJar"
  +      value="${maven.repo.local}/plexus/jars/${plexusPom.artifactId}-${plexusPom.currentVersion}.jar"/>
  +
  +    <util:available file="${plexusJar}">
  +      <j:set var="plexusJarPresent" value="true"/>
  +      <copy file="${plexusJar}" todir="${maven.plexus.lib}"/>
  +    </util:available>
  +  
  +    <j:if test="${plexusJarPresent != 'true'}">
  +      <get 
  +        src="http://www.ibiblio.org/maven/plexus/jars/${plexusPom.artifactId}-${plexusPom.currentVersion}.jar"
  +        dest="${maven.plexus.lib}"/>
  +    </j:if>
  +
       <!--
        |
        | Now we need to pull down Plexus' dependencies to satisfy runtime
  @@ -125,11 +140,21 @@
         <j:if test="${component.length() > 0}">
         
           <echo> component = '${component}' </echo>
  +
  +        <j:set 
  +          var="pom" 
  +          value="${maven.repo.local}/plexus/poms/${depPom.artifactId}-${depPom.currentVersion}.pom"/>
         
  -        <get 
  -          src="http://www.ibiblio.org/maven/plexus/poms/${component}.pom"
  -          dest="${pomDir}/${component}.pom"
  -        />
  +        <util:available file="${pom}">
  +          <j:set var="pomPresent" value="true"/>
  +          <copy file="${pom}" todir="${pomDir}"/>
  +        </util:available>
  +      
  +        <j:if test="${pomPresent != 'true'}">
  +          <get 
  +            src="http://www.ibiblio.org/maven/plexus/poms/${component}.pom"
  +            dest="${pomDir}/${component}.pom"/>
  +        </j:if>
         </j:if>
       </j:forEach>
   
  @@ -147,10 +172,21 @@
         <maven:pom projectDescriptor="${depPomFile}" var="depPom"/>
         
         <echo>Verifying dependencies for ${depPom.artifactId} ...</echo>
  -
  -      <get 
  -        src="http://www.ibiblio.org/maven/plexus/jars/${depPom.artifactId}-${depPom.currentVersion}.jar"
  -        dest="${maven.plexus.components}/${depPom.artifactId}-${depPom.currentVersion}.jar"/>
  +      
  +      <j:set 
  +        var="artifact" 
  +        value="${maven.repo.local}/plexus/jars/${depPom.artifactId}-${depPom.currentVersion}.jar"/>
  +      
  +      <util:available file="${artifact}">
  +        <j:set var="depPresent" value="true"/>
  +        <copy file="${artifact}" todir="${maven.plexus.components}"/>
  +      </util:available>
  +      
  +      <j:if test="${depPresent != 'true'}">
  +        <get 
  +          src="http://www.ibiblio.org/maven/plexus/jars/${depPom.artifactId}-${depPom.currentVersion}.jar"
  +          dest="${maven.plexus.components}/${depPom.artifactId}-${depPom.currentVersion}.jar"/>
  +      </j:if>
   
         ${depPom.verifyDependencys()}