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/10/30 05:02:31 UTC
cvs commit: maven-plugins/multiproject/xdocs changes.xml
brett 2004/10/29 20:02:31
Modified: multiproject plugin.jelly
multiproject/xdocs changes.xml
Log:
call plugin:repository-* goals instead
Revision Changes Path
1.47 +24 -16 maven-plugins/multiproject/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/multiproject/plugin.jelly,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- plugin.jelly 3 Aug 2004 01:13:43 -0000 1.46
+++ plugin.jelly 30 Oct 2004 03:02:31 -0000 1.47
@@ -248,10 +248,12 @@
</goal>
<goal name="multiproject:install-callback">
-
- <ant:echo>Running ${maven.multiproject.type}:install for ${pom.name}</ant:echo>
- <attainGoal name="${maven.multiproject.type}:install"/>
-
+ <j:set var="g" value="${maven.multiproject.type}:install" />
+ <j:if test="${g == 'plugin:install'}">
+ <j:set var="g" value="plugin:repository-install" />
+ </j:if>
+ <ant:echo>Running ${g} for ${pom.name}</ant:echo>
+ <attainGoal name="${g}"/>
</goal>
<!--==================================================================-->
@@ -262,12 +264,15 @@
<j:set var="goal" value="multiproject:install-snapshot-callback"/>
<attainGoal name="multiproject:goal"/>
-
</goal>
<goal name="multiproject:install-snapshot-callback">
- <ant:echo>Running ${maven.multiproject.type}:install-snapshot for ${pom.name}</ant:echo>
- <attainGoal name="${maven.multiproject.type}:install-snapshot"/>
+ <j:set var="g" value="${maven.multiproject.type}:install-snapshot" />
+ <j:if test="${g == 'plugin:install-snapshot'}">
+ <j:set var="g" value="plugin:repository-install-snapshot" />
+ </j:if>
+ <ant:echo>Running ${g} for ${pom.name}</ant:echo>
+ <attainGoal name="${g}"/>
</goal>
<!--==================================================================-->
@@ -278,14 +283,15 @@
<j:set var="goal" value="multiproject:deploy-callback"/>
<attainGoal name="multiproject:goal"/>
-
</goal>
<goal name="multiproject:deploy-callback">
-
- <ant:echo>Running ${maven.multiproject.type}:deploy for ${pom.name}</ant:echo>
- <attainGoal name="${maven.multiproject.type}:deploy"/>
-
+ <j:set var="g" value="${maven.multiproject.type}:deploy" />
+ <j:if test="${g == 'plugin:deploy'}">
+ <j:set var="g" value="plugin:repository-deploy" />
+ </j:if>
+ <ant:echo>Running ${g} for ${pom.name}</ant:echo>
+ <attainGoal name="${g}"/>
</goal>
<!--==================================================================-->
@@ -299,10 +305,12 @@
</goal>
<goal name="multiproject:deploy-snapshot-callback">
-
- <ant:echo>Running ${maven.multiproject.type}:deploy-snapshot for ${pom.name}</ant:echo>
- <attainGoal name="${maven.multiproject.type}:deploy-snapshot"/>
-
+ <j:set var="g" value="${maven.multiproject.type}:deploy-snapshot" />
+ <j:if test="${g == 'plugin:deploy-snapshot'}">
+ <j:set var="g" value="plugin:repository-deploy-snapshot" />
+ </j:if>
+ <ant:echo>Running ${g} for ${pom.name}</ant:echo>
+ <attainGoal name="${g}"/>
</goal>
<!--==================================================================-->
1.31 +1 -0 maven-plugins/multiproject/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/multiproject/xdocs/changes.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- changes.xml 21 Sep 2004 13:47:53 -0000 1.30
+++ changes.xml 30 Oct 2004 03:02:31 -0000 1.31
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.4-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="fix">multiproject:install[-snapshot] and multiproject:deploy[-snapshot] now call plugin:repository-* for plugins instead of plugin:* which are not correct</action>
<action dev="brett" type="update">Make compatible with Maven 1.1</action>
<action dev="dion" type="fix" issue="MPMULTIPROJECT-41">Document multiproject dependency convergence report</action>
<action dev="dion" type="add" issue="MPMULTIPROJECT-33">Add multiproject:site-deploy</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org