dion 2003/10/16 00:56:57
Modified: ant/src/plugin-resources/templates build.jelly
ant project.xml
ant/xdocs changes.xml
Log:
Fix MAVEN-938
Revision Changes Path
1.5 +9 -3 maven-plugins/ant/src/plugin-resources/templates/build.jelly
Index: build.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/ant/src/plugin-resources/templates/build.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.jelly 8 Oct 2003 05:54:22 -0000 1.4
+++ build.jelly 16 Oct 2003 07:56:57 -0000 1.5
@@ -12,7 +12,10 @@
<j:set var="repo">${repos[0]}</j:set>
<!-- set up relative paths -->
<maven:makeRelativePath var="srcDir" basedir="${basedir}"
path="${pom.build.sourceDirectory}" separator="/"/>
- <maven:makeRelativePath var="testSrcDir" basedir="${basedir}"
path="${pom.build.unitTestSourceDirectory}" separator="/"/>
+
+ <j:if test="${unitTestSourcesPresent == 'true'}">
+ <maven:makeRelativePath var="testSrcDir" basedir="${basedir}"
path="${pom.build.unitTestSourceDirectory}" separator="/"/>
+ </j:if>
<x:comment>
@@ -25,8 +28,11 @@
<property name="defaulttargetdir" value="target"/>
<property name="libdir" value="target/lib" />
<property name="classesdir" value="target/classes"/>
- <property name="testclassesdir" value="target/test-classes"/>
- <property name="testreportdir" value="target/test-reports"/>
+
+ <j:if test="${unitTestSourcesPresent == 'true'}">
+ <property name="testclassesdir" value="target/test-classes"/>
+ <property name="testreportdir" value="target/test-reports"/>
+ </j:if>
<property name="distdir" value="dist"/>
<property name="javadocdir" value="dist/docs/api"/>
1.23 +1 -1 maven-plugins/ant/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ant/project.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- project.xml 10 Oct 2003 19:20:59 -0000 1.22
+++ project.xml 16 Oct 2003 07:56:57 -0000 1.23
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-ant-plugin</id>
<name>Maven Ant Plug-in</name>
- <currentVersion>1.5</currentVersion>
+ <currentVersion>1.6-SNAPSHOT</currentVersion>
<description>Generates ant build files from a maven project, so that plain ant
users can build your project</description>
<shortDescription>Generate Ant build file</shortDescription>
<url>http://maven.apache.org/reference/plugins/ant/</url>
1.8 +7 -1 maven-plugins/ant/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ant/xdocs/changes.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- changes.xml 8 Oct 2003 05:54:22 -0000 1.7
+++ changes.xml 16 Oct 2003 07:56:57 -0000 1.8
@@ -7,7 +7,13 @@
<body>
- <release version="1.5" date="in CVS">
+ <release version="1.6" date="in CVS">
+ <action dev="dion" type="fix">
+ Check unit test source dir exists before making relative path
+ </action>
+ </release>
+
+ <release version="1.5" date="Unknown">
<action dev="dion" type="fix">
Make relative paths output for various pom values. MAVEN-909
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
