cvs commit: maven-plugins/plugin/xdocs changes.xml
brett 2004/11/10 02:26:13
Modified:plugin Tag: MAVEN_PLUGIN_1_5-branch plugin.jelly
project.xml
plugin/xdocs Tag: MAVEN_PLUGIN_1_5-branch changes.xml
Log:
remove deploy warning
Revision ChangesPath
No revision
No revision
1.41.2.1 +0 -9 maven-plugins/plugin/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven-plugins/plugin/plugin.jelly,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -u -r1.41 -r1.41.2.1
--- plugin.jelly 6 Jul 2004 22:21:07 - 1.41
+++ plugin.jelly 10 Nov 2004 10:26:13 - 1.41.2.1
@@ -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 /
1.43.2.1 +7 -2 maven-plugins/plugin/project.xml
Index: project.xml
===
RCS file: /home/cvs/maven-plugins/plugin/project.xml,v
retrieving revision 1.43
retrieving revision 1.43.2.1
diff -u -r1.43 -r1.43.2.1
--- project.xml 8 Jul 2004 14:38:57 - 1.43
+++ project.xml 10 Nov 2004 10:26:13 - 1.43.2.1
@@ -23,8 +23,8 @@
pomVersion3/pomVersion
idmaven-plugin-plugin/id
nameMaven Plugin Plugin/name
- currentVersion1.5.1/currentVersion
- descriptionMaven Plugin management plugin. Requires Maven 1.0
RC4./description
+ currentVersion1.5.2/currentVersion
+ descriptionMaven Plugin management plugin./description
shortDescriptionMaven Plugin plugin/shortDescription
urlhttp://maven.apache.org/reference/plugins/plugin//url
issueTrackingUrlhttp://jira.codehaus.org/browse/MPPLUGIN/issueTrackingUrl
@@ -59,6 +59,11 @@
id1.5.1/id
name1.5.1/name
tagMAVEN_PLUGIN_1_5_1/tag
+/version
+version
+ id1.5.2/id
+ name1.5.2/name
+ tagMAVEN_PLUGIN_1_5_2/tag
/version
/versions
developers
No revision
No revision
1.28.2.1 +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.28
retrieving revision 1.28.2.1
diff -u -r1.28 -r1.28.2.1
--- changes.xml 8 Jul 2004 14:20:27 - 1.28
+++ changes.xml 10 Nov 2004 10:26:13 - 1.28.2.1
@@ -24,6 +24,9 @@
author email=[EMAIL PROTECTED]Emmanuel Venisse/author
/properties
body
+release version=1.5.2 date=2004-11-10
+ action dev=brett type=fixRemove deploy warning/action
+/release
release version=1.5.1 date=2004-07-09
action dev=dion type=add issue=MPPLUGIN-20Prompt for
artifactId, groupId and version if missing./action
action dev=dion type=addAdd assertFileNotFound tag/action
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/plugin/xdocs changes.xml
brett 2004/11/10 02:28:08 Modified:plugin project.xml plugin/xdocs changes.xml Log: merge MAVEN_PLUGIN_1_5_2 Revision ChangesPath 1.47 +7 -2 maven-plugins/plugin/project.xml Index: project.xml === RCS file: /home/cvs/maven-plugins/plugin/project.xml,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- project.xml 23 Oct 2004 12:11:51 - 1.46 +++ project.xml 10 Nov 2004 10:28:07 - 1.47 @@ -23,8 +23,8 @@ pomVersion3/pomVersion idmaven-plugin-plugin/id nameMaven Plugin Plugin/name - currentVersion1.5.2-SNAPSHOT/currentVersion - descriptionMaven Plugin management plugin../description + currentVersion1.6-SNAPSHOT/currentVersion + descriptionMaven Plugin management plugin./description shortDescriptionMaven Plugin plugin/shortDescription urlhttp://maven.apache.org/reference/plugins/plugin//url issueTrackingUrlhttp://jira.codehaus.org/browse/MPPLUGIN/issueTrackingUrl @@ -59,6 +59,11 @@ id1.5.1/id name1.5.1/name tagMAVEN_PLUGIN_1_5_1/tag +/version +version + id1.5.2/id + name1.5.2/name + tagMAVEN_PLUGIN_1_5_2/tag /version /versions developers 1.32 +4 -1 maven-plugins/plugin/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- changes.xml 5 Aug 2004 00:34:21 - 1.31 +++ changes.xml 10 Nov 2004 10:28:08 - 1.32 @@ -24,9 +24,12 @@ author email=[EMAIL PROTECTED]Emmanuel Venisse/author /properties body -release version=1.5.2-SNAPSHOT date=in CVS +release version=1.6-SNAPSHOT date=in CVS action dev=dion type=addAdd plugin:generate-tags goal/action action dev=dion type=addMention in docs for the plugin:repository-deploy that it uses the artifact plugin/action +/release +release version=1.5.2 date=2004-11-10 + action dev=brett type=fixRemove deploy warning/action /release release version=1.5.1 date=2004-07-09 action dev=dion type=add issue=MPPLUGIN-20Prompt for artifactId, groupId and version if missing./action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/plugin/xdocs changes.xml goals.xml
dion2004/08/04 17:34:21 Modified:plugin/xdocs changes.xml goals.xml Log: Doc use of artifact plugin Revision ChangesPath 1.31 +1 -0 maven-plugins/plugin/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- changes.xml 18 Jul 2004 14:38:18 - 1.30 +++ changes.xml 5 Aug 2004 00:34:21 - 1.31 @@ -26,6 +26,7 @@ body release version=1.5.2-SNAPSHOT date=in CVS action dev=dion type=addAdd plugin:generate-tags goal/action + action dev=dion type=addMention in docs for the plugin:repository-deploy that it uses the artifact plugin/action /release release version=1.5.1 date=2004-07-09 action dev=dion type=add issue=MPPLUGIN-20Prompt for artifactId, groupId and version if missing./action 1.9 +4 -0 maven-plugins/plugin/xdocs/goals.xml Index: goals.xml === RCS file: /home/cvs/maven-plugins/plugin/xdocs/goals.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- goals.xml 18 Jul 2004 14:32:23 - 1.8 +++ goals.xml 5 Aug 2004 00:34:21 - 1.9 @@ -108,12 +108,16 @@ nameplugin:repository-deploy/name description Deploy the current plugin version to the remote repository. + This uses the a href=../artifact/index.htmlArtifact plugin/a to + do the deployment, so properties need to be set up as per that plugin. /description /goal goal nameplugin:repository-deploy-snapshot/name description Deploy a snapshot build of the plugin to the remote repository. + This uses the a href=../artifact/index.htmlArtifact plugin/a to + do the deployment, so properties need to be set up as per that plugin. /description /goal /goals - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/plugin/xdocs changes.xml
dion2004/07/18 07:38:18 Modified:plugin/xdocs changes.xml Log: Doc recent changes Revision ChangesPath 1.30 +1 -0 maven-plugins/plugin/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- changes.xml 15 Jul 2004 00:17:52 - 1.29 +++ changes.xml 18 Jul 2004 14:38:18 - 1.30 @@ -25,6 +25,7 @@ /properties body release version=1.5.2-SNAPSHOT date=in CVS + action dev=dion type=addAdd plugin:generate-tags goal/action /release release version=1.5.1 date=2004-07-09 action dev=dion type=add issue=MPPLUGIN-20Prompt for artifactId, groupId and version if missing./action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/plugin/xdocs changes.xml
dion2004/07/08 07:20:27 Modified:plugin/xdocs changes.xml Log: [maven-scm-plugin] prepare release 1.5.1 Revision ChangesPath 1.28 +2 -4 maven-plugins/plugin/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- changes.xml 8 Jul 2004 14:12:16 - 1.27 +++ changes.xml 8 Jul 2004 14:20:27 - 1.28 @@ -24,10 +24,8 @@ author email=[EMAIL PROTECTED]Emmanuel Venisse/author /properties body -release version=1.5.1-SNAPSHOT date=in CVS - action dev=dion type=add issue=MPPLUGIN-20 -Prompt for artifactId, groupId and version if missing. - /action +release version=1.5.1 date=2004-07-09 + action dev=dion type=add issue=MPPLUGIN-20Prompt for artifactId, groupId and version if missing./action action dev=dion type=addAdd assertFileNotFound tag/action /release release version=1.5 date=2004-06-28 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/plugin/xdocs changes.xml
brett 2004/06/28 02:42:48
Modified:plugin plugin.jelly project.xml
plugin/xdocs changes.xml
Log:
separate cache from plusing directory
Revision ChangesPath
1.39 +18 -36maven-plugins/plugin/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven-plugins/plugin/plugin.jelly,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- plugin.jelly 25 Jun 2004 16:52:18 - 1.38
+++ plugin.jelly 28 Jun 2004 09:42:48 - 1.39
@@ -44,33 +44,28 @@
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)
+${maven.plugin.dir} and ${maven.plugin.user.dir} (if it exists)
/ant:fail
/j:if
/j:if
- goal name=plugin
-description=Build a plugin jar and install to the maven.repo.local
-
-!-- Plugins are just a jar. --
-attainGoal name=jar:jar/
-
-copy file=${maven.build.dir}/${maven.final.name}.jar
- todir=${maven.repo.local}/${pom.groupId}/plugins /
-
+ goal name=plugin prereqs=plugin:plugin description=Build a plugin jar /
+ goal name=plugin:plugin description=Build a plugin jar
+!-- For some reason a prereq on this causes an internal error... --
+attainGoal name=jar:jar /
/goal
- goal name=plugin:install prereqs=plugin
+ goal name=plugin:install prereqs=plugin:plugin
description=Install the plugin jar, prepare Maven to expand it locally and
clear caches
plugin:uninstall name=${pom.artifactId} /
-!-- Don't clear the cache. RC3 will do this if we happened to clean up an
additional version --
+!-- Don't clear the cache. Maven will do this if we happened to clean up an
additional version --
copy file=${maven.build.dir}/${maven.final.name}.jar
- todir=${maven.home}/plugins/
+ todir=${maven.plugin.dir} /
/goal
- goal name=plugin:install-now prereqs=plugin
+ goal name=plugin:install-now prereqs=plugin:plugin
description=Build a plugin and load it into the currently running instance of
Maven.
!-- The cache should remain intact through these operations --
plugin:uninstall name=${pom.artifactId} /
@@ -90,21 +85,6 @@
maven:uninstallPlugin artifactId=${pom.artifactId} /
/goal
- goal name=plugin:deploy prereqs=plugin
-description=Install a specific unpacked plugin but no new jar
-
-mkdir dir=${maven.plugin.unpacked.dir}/${maven.final.name}/
-unzip src=${maven.build.dir}/${maven.final.name}.jar
- dest=${maven.plugin.unpacked.dir}/${maven.final.name}/
-
-echo message=
- Warning: Contents of ${maven.home}/plugins/${maven.final.name}.jar does not match
- the unpacked contents of ${maven.plugin.unpacked.dir}/${maven.final.name}
directory.
-/echo
-
- /goal
-
-
!-- generate documentation --
!-- generate docs that are usually missing --
@@ -220,7 +200,7 @@
goal name=plugin:download description=download and install a plugin from a
remote repo prereqs=plugin:download-artifact
plugin:uninstall name=${artifactId} /
-u:file var=localPlugin
name=${maven.home}/plugins/${artifactId}-${version}.jar /
+u:file var=localPlugin
name=${maven.plugin.dir}/${artifactId}-${version}.jar /
ant:copy file=${localPluginFile} tofile=${localPlugin} /
/goal
@@ -282,7 +262,7 @@
/u:available
/goal
- goal name=plugin:repository-install prereqs=plugin
+ goal name=plugin:repository-install prereqs=plugin:plugin
artifact:install
artifact=${maven.build.dir}/${maven.final.name}.jar
type=plugin
@@ -290,7 +270,7 @@
/
/goal
- goal name=plugin:repository-install-snapshot prereqs=plugin
+ goal name=plugin:repository-install-snapshot prereqs=plugin:plugin
artifact:install-snapshot
artifact=${maven.build.dir}/${maven.final.name}.jar
type=plugin
@@ -298,7 +278,7 @@
/
/goal
- goal name=plugin:repository-deploy prereqs=plugin
+ goal name=plugin:repository-deploy prereqs=plugin:plugin
artifact:deploy
artifact=${maven.build.dir}/${maven.final.name}.jar
type=plugin
@@ -306,7 +286,7 @@
/
/goal
- goal name=plugin:repository-deploy-snapshot prereqs=plugin
+ goal name=plugin:repository-deploy-snapshot prereqs=plugin:plugin
artifact:deploy-snapshot
artifact=${maven.build.dir}/${maven.final.name}.jar
type=plugin
@@ -317,7 +297,10 @@
define:taglib uri=plugin
define:tag name=uninstall
ant:delete verbose=false failonerror=false
-
cvs commit: maven-plugins/plugin/xdocs changes.xml
brett 2004/06/28 04:13:18 Modified:plugin project.xml plugin/xdocs changes.xml Log: [maven-scm-plugin] prepare release 1.5 Revision ChangesPath 1.39 +6 -1 maven-plugins/plugin/project.xml Index: project.xml === RCS file: /home/cvs/maven-plugins/plugin/project.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- project.xml 28 Jun 2004 09:42:48 - 1.38 +++ project.xml 28 Jun 2004 11:13:17 - 1.39 @@ -23,7 +23,7 @@ pomVersion3/pomVersion idmaven-plugin-plugin/id nameMaven Plugin Plugin/name - currentVersion1.5-SNAPSHOT/currentVersion + currentVersion1.5/currentVersion descriptionMaven Plugin management plugin. Requires Maven 1.0 RC4./description shortDescriptionMaven Plugin plugin/shortDescription urlhttp://maven.apache.org/reference/plugins/plugin//url @@ -49,6 +49,11 @@ id1.4/id name1.4/name tagMAVEN_PLUGIN_1_4/tag +/version +version + id1.5/id + name1.5/name + tagMAVEN_PLUGIN_1_5/tag /version /versions developers 1.24 +1 -1 maven-plugins/plugin/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- changes.xml 28 Jun 2004 09:42:48 - 1.23 +++ changes.xml 28 Jun 2004 11:13:18 - 1.24 @@ -24,7 +24,7 @@ author email=[EMAIL PROTECTED]Emmanuel Venisse/author /properties body -release version=1.5-SNAPSHOT date=in CVS +release version=1.5 date=2004-06-28 action dev=brett type=fix issue=MPPLUGIN-16Install to maven.plugin.dir instead of maven.home/plugins/action action dev=brett type=updateMore consistency in default goal naming (plugin:plugin)/action action dev=brett type=updateplugin goal no longer installs to local repository: use plugin:repository-install/action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
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 ChangesPath
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 - 1.36
+++ plugin.jelly 25 Jun 2004 13:53:28 - 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 - 1.35
+++ project.xml 25 Jun 2004 13:53:28 - 1.36
@@ -23,7 +23,7 @@
pomVersion3/pomVersion
idmaven-plugin-plugin/id
nameMaven Plugin Plugin/name
- currentVersion1.4/currentVersion
+ currentVersion1.5-SNAPSHOT/currentVersion
descriptionMaven Plugin management plugin. Requires Maven 1.0 RC3./description
shortDescriptionMaven Plugin plugin/shortDescription
urlhttp://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 - 1.21
+++ changes.xml 25 Jun 2004 13:53:28 - 1.22
@@ -24,6 +24,9 @@
author email=[EMAIL PROTECTED]Emmanuel Venisse/author
/properties
body
+release version=1.5-SNAPSHOT date=in CVS
+ action dev=brett type=updateUse 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-1219Add plugin:uninstall-now
that removes the plugin from the currently running instance of Maven./action
action dev=brett type=add issue=MAVEN-1219Add a plugin:install-now
goal that installs the plugin into the
cvs commit: maven-plugins/plugin/xdocs changes.xml
brett 2004/05/13 04:12:01 Modified:plugin project.xml plugin/xdocs changes.xml Log: [maven-scm-plugin] prepare release 1.4 Revision ChangesPath 1.33 +7 -4 maven-plugins/plugin/project.xml Index: project.xml === RCS file: /home/cvs/maven-plugins/plugin/project.xml,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- project.xml 2 May 2004 14:16:25 - 1.32 +++ project.xml 13 May 2004 11:12:01 - 1.33 @@ -23,10 +23,8 @@ pomVersion3/pomVersion idmaven-plugin-plugin/id nameMaven Plugin Plugin/name - currentVersion1.4-SNAPSHOT/currentVersion - description -Maven Plugin management plugin. Requires Maven 1.0 RC3. - /description + currentVersion1.4/currentVersion + descriptionMaven Plugin management plugin. Requires Maven 1.0 RC3./description shortDescriptionMaven Plugin plugin/shortDescription urlhttp://maven.apache.org/reference/plugins/plugin//url issueTrackingUrlhttp://jira.codehaus.org/BrowseProject.jspa?id=10364/issueTrackingUrl @@ -51,6 +49,11 @@ id1.4/id name1.4/name tagHEAD/tag +/version +version + id1.4/id + name1.4/name + tagMAVEN_PLUGIN_1_4/tag /version /versions developers 1.21 +1 -1 maven-plugins/plugin/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- changes.xml 1 May 2004 17:15:06 - 1.20 +++ changes.xml 13 May 2004 11:12:01 - 1.21 @@ -24,7 +24,7 @@ author email=[EMAIL PROTECTED]Emmanuel Venisse/author /properties body -release version=1.4-SNAPSHOT date=in CVS +release version=1.4 date=2004-05-13 action dev=brett type=add issue=MAVEN-1219Add plugin:uninstall-now that removes the plugin from the currently running instance of Maven./action action dev=brett type=add issue=MAVEN-1219Add 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 /release - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/plugin/xdocs changes.xml
brett 2004/03/21 19:36:48 Modified:plugin project.xml plugin/xdocs changes.xml Log: [maven-scm-plugin] prepare release 1.3 Revision ChangesPath 1.27 +6 -1 maven-plugins/plugin/project.xml Index: project.xml === RCS file: /home/cvs/maven-plugins/plugin/project.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- project.xml 8 Mar 2004 22:26:11 - 1.26 +++ project.xml 22 Mar 2004 03:36:48 - 1.27 @@ -23,7 +23,7 @@ pomVersion3/pomVersion idmaven-plugin-plugin/id nameMaven Plugin Plugin/name - currentVersion1.3-SNAPSHOT/currentVersion + currentVersion1.3/currentVersion description/ shortDescriptionMaven Plugin plugin/shortDescription urlhttp://maven.apache.org/reference/plugins/plugin//url @@ -69,6 +69,11 @@ id1.2/id name1.2/name tagMAVEN_PLUGIN_1_2/tag +/version +version + id1.3/id + name1.3/name + tagMAVEN_PLUGIN_1_3/tag /version /versions /project 1.17 +4 -11 maven-plugins/plugin/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- changes.xml 18 Mar 2004 05:52:26 - 1.16 +++ changes.xml 22 Mar 2004 03:36:48 - 1.17 @@ -24,18 +24,11 @@ author email=[EMAIL PROTECTED]Emmanuel Venisse/author /properties body -release version=1.3-SNAPSHOT date=in CVS - action dev=brett type=fix issue=MPPLUGIN-13 -Create local repository directory first so plugin:download doesn't fail when it doesn't exist - /action - action dev=dion type=update -Add optional msg attribute to assertFileExists and assertEquals tags - /action - action dev=brett type=fix issue=MPPLUGIN-12 -Don't uninstall incorrect plugins when running plugin:download - /action +release version=1.3 date=2004-03-22 + action dev=brett type=fix issue=MPPLUGIN-13Create local repository directory first so plugin:download doesn't fail when it doesn't exist/action + action dev=dion type=updateAdd optional msg attribute to assertFileExists and assertEquals tags/action + action dev=brett type=fix issue=MPPLUGIN-12Don't uninstall incorrect plugins when running plugin:download/action /release - release version=1.2 date=2004-03-07 action dev=epugh type=updateFixed the plugin:download goal to work. Previously it would delete the plugin you just downloaded. Also now leverages the plugin:uninstall goal./action action dev=vmassol type=addAdded assert:assertEquals tag to verify if two values are equal while testing a plugin./action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/plugin/xdocs changes.xml
brett 2004/03/08 14:26:11
Modified:plugin plugin.jelly project.xml
plugin/xdocs changes.xml
Log:
PR: MPPLUGIN-12
make uninstall delete the correct plugin when running plugin:download
Revision ChangesPath
1.32 +26 -18maven-plugins/plugin/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven-plugins/plugin/plugin.jelly,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- plugin.jelly 4 Mar 2004 18:37:55 - 1.31
+++ plugin.jelly 8 Mar 2004 22:26:11 - 1.32
@@ -19,6 +19,7 @@
project
+ xmlns:plugin=plugin
xmlns:ant=jelly:ant
xmlns:j=jelly:core
xmlns:maven=jelly:maven
@@ -38,9 +39,11 @@
/goal
- goal name=plugin:install prereqs=plugin,plugin:uninstall
+ goal name=plugin:install prereqs=plugin
description=Install the plugin jar, prepare Maven to expand it locally and
clear caches
+plugin:uninstall name=${pom.artifactId} /
+
copy file=${maven.build.dir}/${maven.final.name}.jar
todir=${maven.home}/plugins/
@@ -48,23 +51,10 @@
goal name=plugin:uninstall
description=Uninstall all versions of the plugin
-
-delete verbose=false failonerror=false
- fileset dir=${maven.home}/plugins
-include name=${pom.artifactId}-*.jar /
- /fileset
-/delete
-
-delete includeEmptyDirs=true verbose=false failonerror=false
- fileset dir=${maven.plugin.unpacked.dir}
-include name=*.cache/
-include name=**/.processed /
-include name=${pom.artifactId}-*/** /
- /fileset
-/delete
-
- /goal
+plugin:uninstall name=${pom.artifactId} /
+ /goal
+
goal name=plugin:deploy prereqs=plugin
description=Install a specific unpacked plugin but no new jar
@@ -194,7 +184,7 @@
/goal
goal name=plugin:download description=download and install a plugin from a
remote repo prereqs=plugin:download-artifact
-attainGoal name=plugin:uninstall/
+plugin:uninstall name=${artifactId} /
u:file var=localPlugin
name=${maven.home}/plugins/${artifactId}-${version}.jar /
ant:copy file=${localPluginFile} tofile=${localPlugin} /
/goal
@@ -266,6 +256,24 @@
/
/goal
+ define:taglib uri=plugin
+define:tag name=uninstall
+ ant:delete verbose=false failonerror=false
+ant:fileset dir=${maven.home}/plugins
+ ant:include name=${name}-*.jar /
+/ant:fileset
+ /ant:delete
+
+ ant:delete includeEmptyDirs=true verbose=false failonerror=false
+ant:fileset dir=${maven.plugin.unpacked.dir}
+ ant:include name=*.cache/
+ ant:include name=**/.processed /
+ ant:include name=${name}-*/** /
+/ant:fileset
+ /ant:delete
+/define:tag
+ /define:taglib
+
define:taglib uri=assert
define:tag name=assertFileExists
!-- @file : Full file path --
1.26 +1 -1 maven-plugins/plugin/project.xml
Index: project.xml
===
RCS file: /home/cvs/maven-plugins/plugin/project.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- project.xml 7 Mar 2004 00:40:41 - 1.25
+++ project.xml 8 Mar 2004 22:26:11 - 1.26
@@ -23,7 +23,7 @@
pomVersion3/pomVersion
idmaven-plugin-plugin/id
nameMaven Plugin Plugin/name
- currentVersion1.2/currentVersion
+ currentVersion1.3-SNAPSHOT/currentVersion
description/
shortDescriptionMaven Plugin plugin/shortDescription
urlhttp://maven.apache.org/reference/plugins/plugin//url
1.14 +6 -0 maven-plugins/plugin/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- changes.xml 7 Mar 2004 00:40:41 - 1.13
+++ changes.xml 8 Mar 2004 22:26:11 - 1.14
@@ -24,6 +24,12 @@
author email=[EMAIL PROTECTED]Emmanuel Venisse/author
/properties
body
+release version=1.3-SNAPSHOT date=in CVS
+ action dev=brett type=fix issue=MPPLUGIN-12
+Don't uninstall incorrect plugins when running plugin:download
+ /action
+/release
+
release version=1.2 date=2004-03-07
action dev=epugh type=updateFixed the plugin:download goal to work.
Previously it would delete the plugin you just downloaded. Also now leverages the
plugin:uninstall goal./action
action dev=vmassol type=addAdded assert:assertEquals tag to verify if
two values
cvs commit: maven-plugins/plugin/xdocs changes.xml
brett 2004/03/06 16:40:41 Modified:plugin project.xml plugin/xdocs changes.xml Log: [maven-scm-plugin] prepare release 1.2 Revision ChangesPath 1.25 +12 -4 maven-plugins/plugin/project.xml Index: project.xml === RCS file: /home/cvs/maven-plugins/plugin/project.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- project.xml 4 Mar 2004 18:37:55 - 1.24 +++ project.xml 7 Mar 2004 00:40:41 - 1.25 @@ -1,4 +1,5 @@ ?xml version=1.0 encoding=UTF-8? + !-- /* * Copyright 2001-2004 The Apache Software Foundation. @@ -17,20 +18,20 @@ */ -- - project extend../project.xml/extend pomVersion3/pomVersion idmaven-plugin-plugin/id nameMaven Plugin Plugin/name - currentVersion1.2-SNAPSHOT/currentVersion + currentVersion1.2/currentVersion description/ shortDescriptionMaven Plugin plugin/shortDescription urlhttp://maven.apache.org/reference/plugins/plugin//url siteDirectory/www/maven.apache.org/reference/plugins/plugin//siteDirectory repository -connectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic:maven/src/plugins-build/plugin//connection -urlhttp://cvs.apache.org/viewcvs/maven/src/plugins-build/plugin//url +connectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic:maven-plugins/plugin//connection +developerConnectionscm:cvs:ext:[EMAIL PROTECTED]:/home/cvs:maven-plugins/plugin//developerConnection +urlhttp://cvs.apache.org/viewcvs/maven-plugins/plugin//url /repository developers developer @@ -63,4 +64,11 @@ /properties /dependency /dependencies + versions +version + id1.2/id + name1.2/name + tagMAVEN_PLUGIN_1_2/tag +/version + /versions /project 1.13 +12 -34maven-plugins/plugin/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- changes.xml 4 Mar 2004 18:37:56 - 1.12 +++ changes.xml 7 Mar 2004 00:40:41 - 1.13 @@ -1,4 +1,5 @@ -?xml version=1.0? +?xml version=1.0 encoding=UTF-8? + !-- /* * Copyright 2001-2004 The Apache Software Foundation. @@ -22,41 +23,18 @@ titleChanges/title author email=[EMAIL PROTECTED]Emmanuel Venisse/author /properties - body -release version=1.2 date=in CVS - action dev=epugh type=update -Fixed the plugin:download goal to work. Previously it would delete -the plugin you just downloaded. Also now leverages the plugin:uninstall -goal. - /action - action dev=vmassol type=add -Added assert:assertEquals tag to verify if two values are equal -while testing a plugin. - /action - action dev=vmassol type=add -Added assert:assertFileExists tag to verify if a file exists while -testing a plugin. - /action - action dev=dion type=add -Add plugin:test goal - /action - action dev=brett type=add -Add plugin:repository-deploy goal - /action - action dev=brett type=update -Split plugin:download goal into plugin:download-artifact goal and the original goal that downloads -and installs the plugin. Download to local repository as well. - /action +release version=1.2 date=2004-03-07 + action dev=epugh type=updateFixed the plugin:download goal to work. Previously it would delete the plugin you just downloaded. Also now leverages the plugin:uninstall goal./action + action dev=vmassol type=addAdded assert:assertEquals tag to verify if two values are equal while testing a plugin./action + action dev=vmassol type=addAdded assert:assertFileExists tag to verify if a file exists while testing a plugin./action + action dev=dion type=addAdd plugin:test goal/action + action dev=brett type=addAdd plugin:repository-deploy goal/action + action dev=brett type=updateSplit plugin:download goal into plugin:download-artifact goal and the original goal that downloads and installs the plugin. Download to local repository as well./action /release - - release version=1.1 date=2003-09-29 - action dev=dion type=add - Added plugin:download goal - /action - action dev=evenisse type=fix -Fixed MAVEN-708. Fix the goals description generation if there is no plugin.jelly file. - /action +release version=1.1 date=2003-09-29 + action dev=dion type=addAdded plugin:download goal/action + action dev=evenisse
cvs commit: maven-plugins/plugin/xdocs changes.xml
brett 2004/03/01 16:17:25
Modified:plugin plugin.jelly
plugin/xdocs changes.xml
Log:
split plugin:download goal
Revision ChangesPath
1.30 +19 -22maven-plugins/plugin/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven-plugins/plugin/plugin.jelly,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- plugin.jelly 26 Feb 2004 16:26:59 - 1.29
+++ plugin.jelly 2 Mar 2004 00:17:24 - 1.30
@@ -175,22 +175,26 @@
/j:if
/goal
+ goal name=plugin:download description=download and install a plugin from a
remote repo prereqs=plugin:download-artifact
+attainGoal name=plugin:uninstall/
+u:file var=localPlugin
name=${maven.home}/plugins/${artifactId}-${version}.jar /
+ant:copy file=${localPluginFile} tofile=${localPlugin} /
+ /goal
+
!-- download a plugin from a remote repo --
- goal name=plugin:download description=download a plugin from a remote repo
+ goal name=plugin:download-artifact description=download a plugin from a
remote repo
maven:param-check value=${artifactId} fail=true message='artifactId' must
be specified/
maven:param-check value=${groupId} fail=true message='groupId' must be
specified/
maven:param-check value=${version} fail=true message='version' must be
specified/
-j:set var=repoList${maven.repo.remote}/j:set
-u:tokenize var=repos delim=,${repoList.trim()}/u:tokenize
+u:file var=localPluginFile
+ name=${maven.repo.local}/${groupId}/plugins/${artifactId}-${version}.jar /
+j:if test=${!localPluginFile.exists()}
+ j:set var=repoList${maven.repo.remote}/j:set
+ u:tokenize var=repos delim=,${repoList.trim()}/u:tokenize
-j:forEach var=repo items=${repos}
- echorepo is '${repo}'/echo
- u:file var=localPlugin
-name=${maven.home}/plugins/${artifactId}-${version}.jar /
- u:file var=localPluginTempFile
-name=${maven.home}/plugins/plugin.tmp /
- j:if test=${!localPluginTempFile.exists()}
+ j:forEach var=repo items=${repos}
+echorepo is '${repo}'/echo
j:set var=remoteFile
value=${repo}/${groupId}/plugins/${artifactId}-${version}.jar /
echotrying to download ${remoteFile}/echo
@@ -198,7 +202,7 @@
j:invokeStatic var=dummy method=getFile
className=org.apache.maven.util.HttpUtils
j:arg type=java.lang.String value=${remoteFile} /
-j:arg type=java.io.File value=${localPluginTempFile}/
+j:arg type=java.io.File value=${localPluginFile}/
j:arg type=boolean value=false/
j:arg type=boolean value=true/
j:arg type=java.lang.String value=${maven.proxy.host} /
@@ -208,20 +212,13 @@
j:arg type=boolean value=false/
/j:invokeStatic
/j:catch
- /j:if
- j:break test=${localPluginTempFile.exists()}/
-/j:forEach
+j:break test=${localPluginFile.exists()}/
+ /j:forEach
+/j:if
-j:set var=downloaded value=${localPluginTempFile.exists()}/
+j:set var=downloaded value=${localPluginFile.exists()}/
j:if test=${!downloaded}
ant:fail message=Unable to find plug-in /
-/j:if
-j:if test=${downloaded}
- echoPlugin downloaded, removing other versions/echo\
-
- attainGoal name=plugin:uninstall/
- ant:move file=${localPluginTempFile}
-tofile=${localPlugin} /
/j:if
/goal
1.11 +4 -0 maven-plugins/plugin/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- changes.xml 25 Feb 2004 22:39:29 - 1.10
+++ changes.xml 2 Mar 2004 00:17:25 - 1.11
@@ -26,6 +26,10 @@
action dev=brett type=add
Add plugin:repository-deploy goal
/action
+ action dev=brett type=update
+Split plugin:download goal into plugin:download-artifact goal and the
original goal that downloads
+and installs the plugin. Download to local repository as well.
+ /action
/release
release version=1.1 date=2003-09-29
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-plugins/plugin/xdocs changes.xml
vmassol 2003/11/24 12:46:56
Modified:plugin plugin.jelly
plugin/xdocs changes.xml
Log:
Added assert:assertEquals tag to verify if two values are equal while testing a
plugin. We probably need to use the jelly junit taglib soon or create a new one...
Revision ChangesPath
1.25 +5 -0 maven-plugins/plugin/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven-plugins/plugin/plugin.jelly,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- plugin.jelly 17 Nov 2003 21:32:41 - 1.24
+++ plugin.jelly 24 Nov 2003 20:46:56 - 1.25
@@ -257,6 +257,11 @@
ant:fail${file} does not exist/ant:fail
/j:if
/define:tag
+define:tag name=assertEquals
+ j:if test=${not(expected.equals(value))}
+ant:failExpected [${expected}] but got [${value}]/ant:fail
+ /j:if
+/define:tag
/define:taglib
/project
1.8 +4 -0 maven-plugins/plugin/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- changes.xml 17 Nov 2003 21:32:40 - 1.7
+++ changes.xml 24 Nov 2003 20:46:56 - 1.8
@@ -8,6 +8,10 @@
body
release version=1.2 date=in CVS
action dev=vmassol type=add
+Added assert:assertEquals tag to verify if two values are equal
+while testing a plugin.
+ /action
+ action dev=vmassol type=add
Added assert:assertFileExists tag to verify if a file exists while
testing a plugin.
/action
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
