felipeal    2005/04/26 03:54:33

  Modified:    integration/maven plugin.jelly
               integration/maven/xdocs changes.xml
  Log:
  update dependency on maven-ear-plugin to 1.6.1 so we can use the 
<ear:setPath> tag used to set the dependencies path
  
  Revision  Changes    Path
  1.48      +9 -1      jakarta-cactus/integration/maven/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- plugin.jelly      25 Apr 2005 02:04:56 -0000      1.47
  +++ plugin.jelly      26 Apr 2005 10:54:33 -0000      1.48
  @@ -56,7 +56,15 @@
           Try: maven plugin:download -DgroupId=maven 
-DartifactId=maven-ejb-plugin -Dversion=[version]
         </ant:fail>
       </j:if>
  -    
  +
  +    <maven:get plugin="maven-ear-plugin" property="plugin" var="earPlugin" />
  +    <j:if test="${earPlugin.currentVersion.compareTo('1.6.1') lt 0}">
  +      <ant:fail>
  +        Must have EAR plugin v1.6.1 or greater installed to use this version 
of the Cactus plugin.
  +        Try: maven plugin:download -DgroupId=maven 
-DartifactId=maven-ear-plugin -Dversion=[version]
  +      </ant:fail>
  +    </j:if>
  +
     </goal>
   
     <!--
  
  
  
  1.67      +4 -0      jakarta-cactus/integration/maven/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/changes.xml,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- changes.xml       25 Apr 2005 02:04:57 -0000      1.66
  +++ changes.xml       26 Apr 2005 10:54:33 -0000      1.67
  @@ -8,6 +8,10 @@
     <body>
   
       <release version="1.8dev" date="in CVS">
  +      <action dev="felipeal" type="update" issue="CACTUS-197">
  +        Update depedency on <code>Maven EAR Plugin</code> to release
  +         <code>1.6.1</code>.
  +      </action>
         <action dev="felipeal" type="add" issue="CACTUS-90">
           Create empty <code>web.xml</code> file when one does not exist. 
Notice that this change 
           also introduced the <code>cactus.servlet.version</code> plugin 
property.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to