call plugin:repository-* goals instead

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116190 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett 2004-10-30 03:02:31 +00:00
parent d3534dfd77
commit 113571dbe4
2 changed files with 25 additions and 16 deletions

View File

@ -248,10 +248,12 @@ maven -Dgoal=clean multiproject:goal</maven:param-check>
</goal> </goal>
<goal name="multiproject:install-callback"> <goal name="multiproject:install-callback">
<j:set var="g" value="${maven.multiproject.type}:install" />
<ant:echo>Running ${maven.multiproject.type}:install for ${pom.name}</ant:echo> <j:if test="${g == 'plugin:install'}">
<attainGoal name="${maven.multiproject.type}:install"/> <j:set var="g" value="plugin:repository-install" />
</j:if>
<ant:echo>Running ${g} for ${pom.name}</ant:echo>
<attainGoal name="${g}"/>
</goal> </goal>
<!--==================================================================--> <!--==================================================================-->
@ -262,12 +264,15 @@ maven -Dgoal=clean multiproject:goal</maven:param-check>
<j:set var="goal" value="multiproject:install-snapshot-callback"/> <j:set var="goal" value="multiproject:install-snapshot-callback"/>
<attainGoal name="multiproject:goal"/> <attainGoal name="multiproject:goal"/>
</goal> </goal>
<goal name="multiproject:install-snapshot-callback"> <goal name="multiproject:install-snapshot-callback">
<ant:echo>Running ${maven.multiproject.type}:install-snapshot for ${pom.name}</ant:echo> <j:set var="g" value="${maven.multiproject.type}:install-snapshot" />
<attainGoal name="${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> </goal>
<!--==================================================================--> <!--==================================================================-->
@ -278,14 +283,15 @@ maven -Dgoal=clean multiproject:goal</maven:param-check>
<j:set var="goal" value="multiproject:deploy-callback"/> <j:set var="goal" value="multiproject:deploy-callback"/>
<attainGoal name="multiproject:goal"/> <attainGoal name="multiproject:goal"/>
</goal> </goal>
<goal name="multiproject:deploy-callback"> <goal name="multiproject:deploy-callback">
<j:set var="g" value="${maven.multiproject.type}:deploy" />
<ant:echo>Running ${maven.multiproject.type}:deploy for ${pom.name}</ant:echo> <j:if test="${g == 'plugin:deploy'}">
<attainGoal name="${maven.multiproject.type}:deploy"/> <j:set var="g" value="plugin:repository-deploy" />
</j:if>
<ant:echo>Running ${g} for ${pom.name}</ant:echo>
<attainGoal name="${g}"/>
</goal> </goal>
<!--==================================================================--> <!--==================================================================-->
@ -299,10 +305,12 @@ maven -Dgoal=clean multiproject:goal</maven:param-check>
</goal> </goal>
<goal name="multiproject:deploy-snapshot-callback"> <goal name="multiproject:deploy-snapshot-callback">
<j:set var="g" value="${maven.multiproject.type}:deploy-snapshot" />
<ant:echo>Running ${maven.multiproject.type}:deploy-snapshot for ${pom.name}</ant:echo> <j:if test="${g == 'plugin:deploy-snapshot'}">
<attainGoal name="${maven.multiproject.type}: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> </goal>
<!--==================================================================--> <!--==================================================================-->

View File

@ -26,6 +26,7 @@
</properties> </properties>
<body> <body>
<release version="1.4-SNAPSHOT" date="in CVS"> <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="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="fix" issue="MPMULTIPROJECT-41">Document multiproject dependency convergence report</action>
<action dev="dion" type="add" issue="MPMULTIPROJECT-33">Add multiproject:site-deploy</action> <action dev="dion" type="add" issue="MPMULTIPROJECT-33">Add multiproject:site-deploy</action>