dion 2004/06/29 06:03:39
Modified: dist/src/plugin-test maven.xml
dist/xdocs changes.xml
dist project.xml
Log:
Reinstate plugin tests
Revision Changes Path
1.4 +3 -12 maven-plugins/dist/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/dist/src/plugin-test/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 4 Mar 2004 18:04:01 -0000 1.3
+++ maven.xml 29 Jun 2004 13:03:39 -0000 1.4
@@ -15,27 +15,18 @@
* limitations under the License.
*/
-->
-<project xmlns:util="jelly:util"
- xmlns:dist="dist"
+<project xmlns:assert="assert"
+ xmlns:util="jelly:util"
xmlns:j="jelly:core">
<goal name="testPlugin" prereqs="test-dist">
</goal>
<goal name="test-dist">
-<!--
- <echo>dist dir is ${maven.dist.dir}</echo>
<attainGoal name="dist"/>
<util:tokenize var="files"
delim=",">-src.tar.gz,-src.zip,.tar.gz,.zip</util:tokenize>
<j:forEach var="file" items="${files}">
--->
- <!-- NOTE: maven.dist.dir doesn't work here??? -->
-<!-- <j:set var="expectedFile"
value="${maven.build.dir}/distributions/test-maven-dist-plugin-1.0-SNAPSHOT${file}"/>
- <util:file var="file" name="${expectedFile}" />
- <j:if test="${!(file.exists())}">
- <fail>${expectedFile} not generated</fail>
- </j:if>
+ <assert:assertFileExists
file="${maven.dist.dir}/test-maven-dist-plugin-1.0-SNAPSHOT${file}"/>
</j:forEach>
--->
</goal>
</project>
1.17 +3 -0 maven-plugins/dist/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/dist/xdocs/changes.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- changes.xml 25 Jun 2004 19:02:38 -0000 1.16
+++ changes.xml 29 Jun 2004 13:03:39 -0000 1.17
@@ -24,6 +24,9 @@
<author email="[EMAIL PROTECTED]">Vincent Massol</author>
</properties>
<body>
+ <release version="1.7" date="in CVS">
+ <action dev="dion" type="update">Reinstate plugin tests</action>
+ </release>
<release version="1.6" date="2004-06-25">
<action dev="brett" type="update">Use artifact plugin for deployments</action>
</release>
1.35 +1 -1 maven-plugins/dist/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/dist/project.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- project.xml 25 Jun 2004 19:01:59 -0000 1.34
+++ project.xml 29 Jun 2004 13:03:39 -0000 1.35
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-dist-plugin</id>
<name>Maven Distribution Plugin</name>
- <currentVersion>1.6</currentVersion>
+ <currentVersion>1.7-SNAPSHOT</currentVersion>
<shortDescription>Create source and binary distributions</shortDescription>
<url>http://maven.apache.org/reference/plugins/dist/</url>
<issueTrackingUrl>http://jira.codehaus.org/browse/MPDIST</issueTrackingUrl>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
