You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/09/11 03:16:37 UTC

cvs commit: maven-plugins/plugin plugin.jelly

brett       2004/09/10 18:16:37

  Modified:    jar      plugin.jelly
               dist     plugin.jelly
               plugin   plugin.jelly
  Log:
  remove stupid deploy warning message
  
  Revision  Changes    Path
  1.43      +0 -10     maven-plugins/jar/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/jar/plugin.jelly,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- plugin.jelly	12 Jul 2004 23:35:06 -0000	1.42
  +++ plugin.jelly	11 Sep 2004 01:16:36 -0000	1.43
  @@ -24,7 +24,6 @@
     xmlns:license="license"
     xmlns:maven="jelly:maven"
     xmlns:artifact="artifact"
  -  xmlns:deploy="deploy"
     xmlns:util="jelly:util"
     xmlns:doc="doc">
   
  @@ -35,15 +34,6 @@
         <ant:fail>
           Must have artifact plugin v1.3 installed to use this version of the jar plugin.
           Try: maven plugin:download -DgroupId=maven -DartifactId=maven-artifact-plugin -Dversion=1.3
  -      </ant:fail>
  -    </j:if>
  -    <!-- Can remove deploy dependency above when this is gone -->
  -    <maven:get plugin="maven-deploy-plugin" property="plugin" var="deployPlugin" />
  -    <j:if test="${deployPlugin != null}">
  -      <ant:fail>
  -        Must remove the deploy plugin to use this version of the jar plugin.
  -        Please delete ${deployPlugin.artifactId}-${deployPlugin.currentVersion}.jar from
  -        ${maven.plugin.dir} and ${maven.plugin.user.dir} (if it exists)
         </ant:fail>
       </j:if>
     </j:if>
  
  
  
  1.22      +0 -10     maven-plugins/dist/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/dist/plugin.jelly,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- plugin.jelly	27 Aug 2004 11:15:05 -0000	1.21
  +++ plugin.jelly	11 Sep 2004 01:16:36 -0000	1.22
  @@ -23,7 +23,6 @@
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
     xmlns:artifact="artifact"
  -  xmlns:deploy="deploy"
     xmlns:util="jelly:util">
   
     <!-- Poor mans version check - plugin dependencies still suck for multiple versions -->
  @@ -32,15 +31,6 @@
       <ant:fail>
         Must have artifact plugin v1.3 installed to use this version of the dist plugin.
         Try: maven plugin:download -DgroupId=maven -DartifactId=maven-artifact-plugin -Dversion=1.3
  -    </ant:fail>
  -  </j:if>
  -  <!-- Can remove deploy dependency above when this is gone -->
  -  <maven:get plugin="maven-deploy-plugin" property="plugin" var="deployPlugin" />
  -  <j:if test="${deployPlugin != null}">
  -    <ant:fail>
  -      Must remove the deploy plugin to use this version of the dist plugin.
  -      Please delete ${deployPlugin.artifactId}-${deployPlugin.currentVersion}.jar from
  -      ${maven.plugin.dir} and ${maven.plugin.user.dir} (if it exists)
       </ant:fail>
     </j:if>
   
  
  
  
  1.44      +0 -9      maven-plugins/plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/plugin/plugin.jelly,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- plugin.jelly	18 Jul 2004 14:20:03 -0000	1.43
  +++ plugin.jelly	11 Sep 2004 01:16:37 -0000	1.44
  @@ -38,15 +38,6 @@
           Try: maven plugin:download -DgroupId=maven -DartifactId=maven-artifact-plugin -Dversion=1.3
         </ant:fail>
       </j:if>
  -    <!-- Can remove deploy dependency above when this is gone -->
  -    <maven:get plugin="maven-deploy-plugin" property="plugin" var="deployPlugin" />
  -    <j:if test="${deployPlugin != null}">
  -      <ant:fail>
  -        Must remove the deploy plugin to use this version of the plugin plugin.
  -        Please delete ${deployPlugin.artifactId}-${deployPlugin.currentVersion}.jar from
  -        ${maven.plugin.dir} and ${maven.plugin.user.dir} (if it exists)
  -      </ant:fail>
  -    </j:if>
     </j:if>
   
     <goal name="plugin" prereqs="plugin:plugin" description="Build a plugin jar" />
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org