You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by br...@apache.org on 2002/03/05 05:58:43 UTC
cvs commit: jakarta-turbine-maven/src/templates/build build-maven.xml build-metrics.xml build.xml
brekke 02/03/04 20:58:43
Modified: . build.xml
src/templates/build build-maven.xml build-metrics.xml
build.xml
Log:
To ease migration of custom builds to maven based builds the delegate targets
have been prefixed with maven: in the build.xml file.
The default target is maven:jar which now will run the unit tests before
creating the jar file. This will in effect run the tests at each compile.
If you need to compile without running the tests, you can use the
maven:compile target.
Caught a reference in build-metrics.xml referencing build.xml and should have
been maven/build-maven.xml.
Revision Changes Path
1.12 +15 -15 jakarta-turbine-maven/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 5 Mar 2002 04:12:57 -0000 1.11
+++ build.xml 5 Mar 2002 04:58:43 -0000 1.12
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="maven" default="jar" basedir=".">
+<project name="maven" default="maven:jar" basedir=".">
<!-- Give user a chance to override without editing this file
(and without typing -D each time they invoke a target) -->
@@ -62,59 +62,59 @@
<!-- D E L E G A T O R S -->
<!-- ================================================================== -->
- <target name="site">
+ <target name="maven:site">
<ant antfile="maven/build-docs.xml" target="site"/>
</target>
- <target name="jar">
+ <target name="maven:jar">
<ant antfile="maven/build-maven.xml" target="jar"/>
</target>
- <target name="install-jar">
+ <target name="maven:install-jar">
<ant antfile="maven/build-maven.xml" target="install-jar"/>
</target>
- <target name="env">
+ <target name="maven:env">
<ant antfile="maven/build-maven.xml" target="env"/>
</target>
- <target name="docs">
+ <target name="maven:docs">
<ant antfile="maven/build-docs.xml" target="docs"/>
</target>
- <target name="test">
+ <target name="maven:test">
<ant antfile="maven/build-test.xml" target="test"/>
</target>
- <target name="clean">
+ <target name="maven:clean">
<ant antfile="maven/build-maven.xml" target="clean"/>
</target>
- <target name="metrics">
+ <target name="maven:metrics">
<ant antfile="maven/build-metrics.xml" target="metrics"/>
</target>
- <target name="dist">
+ <target name="maven:dist">
<ant antfile="maven/build-maven.xml" target="dist"/>
</target>
- <target name="deploy-site">
+ <target name="maven:deploy-site">
<ant antfile="maven/build-docs.xml" target="deploy-site"/>
</target>
- <target name="gump-descriptor">
+ <target name="maven:gump-descriptor">
<ant antfile="maven/build-maven.xml" target="gump-descriptor"/>
</target>
- <target name="javadocs">
+ <target name="maven:javadocs">
<ant antfile="maven/build-docs.xml" target="javadocs"/>
</target>
- <target name="compile">
+ <target name="maven:compile">
<ant antfile="maven/build-maven.xml" target="compile"/>
</target>
- <target name="update-jars">
+ <target name="maven:update-jars">
<ant antfile="maven/build-maven.xml" target="update-jars"/>
</target>
1.2 +2 -0 jakarta-turbine-maven/src/templates/build/build-maven.xml
Index: build-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-maven.xml 5 Mar 2002 04:10:55 -0000 1.1
+++ build-maven.xml 5 Mar 2002 04:58:43 -0000 1.2
@@ -179,6 +179,8 @@
depends="compile,jar-resources"
description="o Generates the ${project} JAR file (default)">
+ <ant antfile="maven/build-test.xml" target="test"/>
+
<jar
jarfile="${build.dir}/${final.name}.jar"
basedir="${build.dest}"
1.7 +1 -1 jakarta-turbine-maven/src/templates/build/build-metrics.xml
Index: build-metrics.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-metrics.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-metrics.xml 5 Mar 2002 04:10:55 -0000 1.6
+++ build-metrics.xml 5 Mar 2002 04:58:43 -0000 1.7
@@ -12,7 +12,7 @@
<target
name="compile">
- <ant antfile="build.xml" target="compile"/>
+ <ant antfile="maven/build-maven.xml" target="compile"/>
</target>
<!-- ================================================================== -->
1.19 +15 -15 jakarta-turbine-maven/src/templates/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 5 Mar 2002 04:10:55 -0000 1.18
+++ build.xml 5 Mar 2002 04:58:43 -0000 1.19
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="maven" default="jar" basedir=".">
+<project name="maven" default="maven:jar" basedir=".">
<!-- Give user a chance to override without editing this file
(and without typing -D each time they invoke a target) -->
@@ -20,59 +20,59 @@
<!-- D E L E G A T O R S -->
<!-- ================================================================== -->
- <target name="site">
+ <target name="maven:site">
<ant antfile="maven/build-docs.xml" target="site"/>
</target>
- <target name="jar">
+ <target name="maven:jar">
<ant antfile="maven/build-maven.xml" target="jar"/>
</target>
- <target name="install-jar">
+ <target name="maven:install-jar">
<ant antfile="maven/build-maven.xml" target="install-jar"/>
</target>
- <target name="env">
+ <target name="maven:env">
<ant antfile="maven/build-maven.xml" target="env"/>
</target>
- <target name="docs">
+ <target name="maven:docs">
<ant antfile="maven/build-docs.xml" target="docs"/>
</target>
- <target name="test">
+ <target name="maven:test">
<ant antfile="maven/build-test.xml" target="test"/>
</target>
- <target name="clean">
+ <target name="maven:clean">
<ant antfile="maven/build-maven.xml" target="clean"/>
</target>
- <target name="metrics">
+ <target name="maven:metrics">
<ant antfile="maven/build-metrics.xml" target="metrics"/>
</target>
- <target name="dist">
+ <target name="maven:dist">
<ant antfile="maven/build-maven.xml" target="dist"/>
</target>
- <target name="deploy-site">
+ <target name="maven:deploy-site">
<ant antfile="maven/build-docs.xml" target="deploy-site"/>
</target>
- <target name="gump-descriptor">
+ <target name="maven:gump-descriptor">
<ant antfile="maven/build-maven.xml" target="gump-descriptor"/>
</target>
- <target name="javadocs">
+ <target name="maven:javadocs">
<ant antfile="maven/build-docs.xml" target="javadocs"/>
</target>
- <target name="compile">
+ <target name="maven:compile">
<ant antfile="maven/build-maven.xml" target="compile"/>
</target>
- <target name="update-jars">
+ <target name="maven:update-jars">
<ant antfile="maven/build-maven.xml" target="update-jars"/>
</target>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>