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/06/25 15:53:28 UTC
cvs commit: maven-plugins/plugin/xdocs changes.xml
brett 2004/06/25 06:53:28
Modified: plugin plugin.jelly project.xml
plugin/xdocs changes.xml
Log:
use artifact for deployment
Revision Changes Path
1.37 +47 -6 maven-plugins/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/plugin/plugin.jelly,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- plugin.jelly 6 May 2004 01:14:20 -0000 1.36
+++ plugin.jelly 25 Jun 2004 13:53:28 -0000 1.37
@@ -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>
1.36 +1 -1 maven-plugins/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/plugin/project.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- project.xml 1 Jun 2004 14:10:46 -0000 1.35
+++ project.xml 25 Jun 2004 13:53:28 -0000 1.36
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-plugin-plugin</id>
<name>Maven Plugin Plugin</name>
- <currentVersion>1.4</currentVersion>
+ <currentVersion>1.5-SNAPSHOT</currentVersion>
<description>Maven Plugin management plugin. Requires Maven 1.0 RC3.</description>
<shortDescription>Maven Plugin plugin</shortDescription>
<url>http://maven.apache.org/reference/plugins/plugin/</url>
1.22 +3 -0 maven-plugins/plugin/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- changes.xml 13 May 2004 11:12:01 -0000 1.21
+++ changes.xml 25 Jun 2004 13:53:28 -0000 1.22
@@ -24,6 +24,9 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<body>
+ <release version="1.5-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="update">Use the artifact plugin instead of the deploy plugin</action>
+ </release>
<release version="1.4" date="2004-05-13">
<action dev="brett" type="add" issue="MAVEN-1219">Add plugin:uninstall-now that removes the plugin from the currently running instance of Maven.</action>
<action dev="brett" type="add" issue="MAVEN-1219">Add a plugin:install-now goal that installs the plugin into the currently running instance of maven so that it can be used by subsequent goals.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org