dion 2004/06/29 06:43:16
Modified: java/xdocs changes.xml
java/src/plugin-test maven.xml
java project.xml
Log:
Use assert taglib in plugin test
Revision Changes Path
1.12 +3 -0 maven-plugins/java/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/java/xdocs/changes.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- changes.xml 16 May 2004 01:08:45 -0000 1.11
+++ changes.xml 29 Jun 2004 13:43:16 -0000 1.12
@@ -25,6 +25,9 @@
<author email="[EMAIL PROTECTED]">Kurt Schrader</author>
</properties>
<body>
+ <release version="1.5-SNAPSHOT" date="in CVS">
+ <action dev="dion" type="update">Use assert taglib for tests</action>
+ </release>
<release version="1.4" date="2004-05-15">
<action dev="brett" type="fix" issue="MPJAVA-18" due-to="Lynn Richards">Allow
specifying a JDK to compile with other than the running one</action>
<action dev="brett" type="fix" issue="MPJAVA-1" due-to="Scott Foster">Add
memory usage parameters to pass to the ant javac task</action>
1.3 +2 -5 maven-plugins/java/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/java/src/plugin-test/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 4 Mar 2004 18:35:34 -0000 1.2
+++ maven.xml 29 Jun 2004 13:43:16 -0000 1.3
@@ -16,6 +16,7 @@
*/
-->
<project xmlns:util="jelly:util"
+ xmlns:assert="assert"
xmlns:j="jelly:core">
<goal name="testPlugin" prereqs="test-java-compile">
@@ -25,10 +26,6 @@
<goal name="test-java-compile">
<attainGoal name="java:compile"/>
- <j:set var="expectedFile"
value="${maven.build.dest}/org/apache/maven/Dummy.class"/>
- <util:file var="file" name="${expectedFile}" />
- <j:if test="${!(file.exists())}">
- <fail>${expectedFile} not generated</fail>
- </j:if>
+ <assert:assertFileExists
file="${maven.build.dest}/org/apache/maven/Dummy.class"/>
</goal>
</project>
1.26 +1 -1 maven-plugins/java/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/java/project.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- project.xml 25 Jun 2004 15:24:28 -0000 1.25
+++ project.xml 29 Jun 2004 13:43:16 -0000 1.26
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-java-plugin</id>
<name>Maven Java Plug-in</name>
- <currentVersion>1.4</currentVersion>
+ <currentVersion>1.5-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Compile java code</shortDescription>
<url>http://maven.apache.org/reference/plugins/java/</url>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
