You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by pr...@apache.org on 2003/07/28 01:44:00 UTC
cvs commit: jakarta-commons/jelly maven.xml project.xml
proyal 2003/07/27 16:44:00
Modified: jelly maven.xml project.xml
Log:
* Remove postgoals and use native maven features now. it has been long enough
* Add explicit sourceDirectory and unitTestSourceDirectory
Revision Changes Path
1.63 +4 -31 jakarta-commons/jelly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/maven.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- maven.xml 27 Jul 2003 18:28:21 -0000 1.62
+++ maven.xml 27 Jul 2003 23:43:59 -0000 1.63
@@ -287,37 +287,10 @@
<echo>YYYY</echo>
</goal>
-
- <!-- NOTE that the following 2 postGoals can be removed when we can assume 1.0 Maven everywhere -->
- <!-- copies JAR resources stuff -->
- <postGoal name="java:compile">
- <copy todir="${maven.build.dest}">
- <fileset dir="src/java">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
- </postGoal>
-
- <!-- copies unit testing stuff -->
- <postGoal name="test:compile">
- <copy todir="${maven.test.dest}">
- <fileset dir="src/test">
- <include name="**/*.properties"/>
- <include name="META-INF/services/*"/>
- <include name="**/*.jelly"/>
- <include name="**/*.xml"/>
- <include name="**/*.html"/>
- <include name="**/*.dtd"/>
- <include name="**/*.rng"/>
- </fileset>
- </copy>
- </postGoal>
-
-
- <!--
- || Disable some goals not currently working with CVS HEAD
- -->
- <goal name="maven-license-plugin:report"/>
+ <!--
+ || Disable some goals not currently working with CVS HEAD
+ -->
+ <goal name="maven-license-plugin:report"/>
<!-- define the classpath used to run examples -->
1.129 +13 -0 jakarta-commons/jelly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/project.xml,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- project.xml 23 Jun 2003 00:15:01 -0000 1.128
+++ project.xml 27 Jul 2003 23:43:59 -0000 1.129
@@ -280,6 +280,18 @@
</dependencies>
<build>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
<!-- Unit test classes -->
<unitTest>
<includes>
@@ -289,6 +301,7 @@
<resource>
<directory>src/test</directory>
<includes>
+ <include>META-INF/services/*</include>
<include>**/*.jelly</include>
<include>**/*.xml</include>
<include>**/*.xsl</include>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org