use artifact for deployment

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115536 13f79535-47bb-0310-9956-ffa450edef68

plugin/plugin.jelly

@@ -25,9 +25,28 @@
   xmlns:maven="jelly:maven"
   xmlns:u="jelly:util"
   xmlns:define="jelly:define"
+  xmlns:artifact="artifact"
   xmlns:deploy="deploy"
   xmlns:x="jelly:xml">
   
+  <!-- Poor mans version check - plugin dependencies still suck for multiple versions -->
+  <maven:get plugin="maven-artifact-plugin" property="plugin" var="artifactPlugin" />
+  <j:if test="${artifactPlugin.currentVersion.compareTo('1.3') lt 0}">
+    <ant:fail>
+      Must have artifact plugin v1.3 installed to use this version of the plugin 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 plugin plugin.
+      Please delete ${deployPlugin.artifactId}-${deployPlugin.currentVersion}.jar from
+      ${maven.plugin.dir} and ${maven.plugin.unpacked.dir} (if it exists)
+    </ant:fail>
+  </j:if>
+
   <goal name="plugin"
     description="Build a plugin jar and install to the maven.repo.local">
 
@@ -261,13 +280,35 @@
     </u:available>
   </goal>
 
+  <goal name="plugin:repository-install" prereqs="plugin">
+    <artifact:install
+      artifact="${maven.build.dir}/${maven.final.name}.jar"
+      type="plugin"
+      project="${pom}"
+    />
+  </goal>
+
+  <goal name="plugin:repository-install-snapshot" prereqs="plugin">
+    <artifact:install-snapshot
+      artifact="${maven.build.dir}/${maven.final.name}.jar"
+      type="plugin"
+      project="${pom}"
+    />
+  </goal>
+
   <goal name="plugin:repository-deploy" prereqs="plugin">
-    <maven:makeRelativePath separator="/" basedir="${basedir}" path="${maven.build.dir}/${maven.final.name}.jar" var="artifactFilename" />
-    <deploy:artifact
-      artifact="${artifactFilename}"
-      type="plugins"
-      assureDirectoryCommand="mkdir -p"
-      siteCommand="cd @deployDirectory@; chmod g+w ${maven.final.name}.jar; chgrp ${maven.remote.group} ${maven.final.name}.jar"
+    <artifact:deploy
+      artifact="${maven.build.dir}/${maven.final.name}.jar"
+      type="plugin"
+      project="${pom}"
+    />
+  </goal>
+
+  <goal name="plugin:repository-deploy-snapshot" prereqs="plugin">
+    <artifact:deploy-snapshot
+      artifact="${maven.build.dir}/${maven.final.name}.jar"
+      type="plugin"
+      project="${pom}"
     />
   </goal>