dion 2002/06/04 17:50:24
Modified: src/templates/build/plugins/struts build.xml
src/templates/build/plugins/metrics build.xml
src/templates/build/plugins/core Control.vm
default.properties build.xml build-init.xml
src/templates/build/plugins/test build.xml
src/templates/build/plugins/docs build.xml
src/templates/build/plugins/j2ee build.xml
src/templates/build/plugins/reactor build.xml
src/templates/build/plugins/iutest build.xml
Added: src/templates/build/plugins/core init.properties
Log:
- Fixed a bug where project.xml properties where being loaded after
plugins/core/default.properties, and hence jars were being built with
the literal name ${maven.id}-${maven.currentVersion}.
- Tested on Ant 1.4.1
Revision Changes Path
1.7 +5 -4
jakarta-turbine-maven/src/templates/build/plugins/struts/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/struts/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 4 Jun 2002 15:26:24 -0000 1.6
+++ build.xml 5 Jun 2002 00:50:23 -0000 1.7
@@ -6,27 +6,28 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up tool default properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/default.properties"/>
+ <!-- Pick up init properties for maven.jars.list -->
+ <property file="${maven.home}/plugins/core/init.properties"/>
<!-- define maven classpath for the build -->
<path id="maven-classpath">
<fileset dir="${lib.repo}" includes="${maven.jars.list}" />
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
<!-- call common build file initialization to verify project, update jars
- etc -->
+ load project and default properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="verify-project"
inheritAll="true"
inheritRefs="true"
exportAll="true"
exportRefs="true"/>
+
</target>
<!-- ================================================================== -->
1.5 +5 -4
jakarta-turbine-maven/src/templates/build/plugins/metrics/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/metrics/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 4 Jun 2002 15:26:24 -0000 1.4
+++ build.xml 5 Jun 2002 00:50:24 -0000 1.5
@@ -6,27 +6,28 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up tool default properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/default.properties"/>
+ <!-- Pick up init properties for maven.jars.list -->
+ <property file="${maven.home}/plugins/core/init.properties"/>
<!-- define maven classpath for the build -->
<path id="maven-classpath">
<fileset dir="${lib.repo}" includes="${maven.jars.list}" />
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
<!-- call common build file initialization to verify project, update jars
- etc -->
+ load project and default properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="verify-project"
inheritAll="true"
inheritRefs="true"
exportAll="true"
exportRefs="true"/>
+
</target>
<!-- ================================================================== -->
1.5 +1 -0
jakarta-turbine-maven/src/templates/build/plugins/core/Control.vm
Index: Control.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/Control.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Control.vm 4 Jun 2002 15:26:24 -0000 1.4
+++ Control.vm 5 Jun 2002 00:50:24 -0000 1.5
@@ -9,6 +9,7 @@
$buildElements.add("plugins/$plugin/default.properties")
$buildElements.add("plugins/$plugin/build-gump.xml")
$buildElements.add("plugins/$plugin/build-init.xml")
+$buildElements.add("plugins/$plugin/init.properties")
## -------------------------------------------------------
## Make the list of delegators
1.8 +0 -12
jakarta-turbine-maven/src/templates/build/plugins/core/default.properties
Index: default.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/default.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- default.properties 4 Jun 2002 01:12:03 -0000 1.7
+++ default.properties 5 Jun 2002 00:50:24 -0000 1.8
@@ -170,18 +170,6 @@
# -------------------------------------------------------------------
# This needs to be changed before prime time.
maven.updateSite = http://www.apache.org/~jvanzyl/maven/update
-# jars needed in lib.repo by maven to execute
-# this property is a replacement for jars.list. See the info in
-# src/templates/build/plugins/core/build-init.xml about what needs to be
-# done to remove jars.list from maven
-maven.jars.list=antlr-2.7.1.jar,bcel-5.0.jar,checkstyle-2.2.jar,\
-commons-beanutils-dev.jar,commons-betwixt-1.0-dev.jar,\
-commons-collections-2.0.jar,commons-digester-1.2.jar,commons-graph-0.8.jar,\
-commons-io-0.1.jar,commons-lang-0.1-dev.jar,commons-logging-1.0.jar,\
-commons-util-1.0-rc2-dev.jar,dom4j-1.3.jar,jdepend-2.2.jar,log4j-1.1.3.jar,\
-oro-2.0.6.jar,regexp-1.2.jar,velocity-1.3-dev.jar,velocity-dvsl-0.43.jar,\
-maven.jar,commons-jelly-1.0-dev.jar
-
# -------------------------------------------------------------------
# M A V E N D I S T R I B U T I O N S
1.12 +6 -4 jakarta-turbine-maven/src/templates/build/plugins/core/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 4 Jun 2002 15:26:24 -0000 1.11
+++ build.xml 5 Jun 2002 00:50:24 -0000 1.12
@@ -6,27 +6,29 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up tool default properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/default.properties"/>
+
+ <!-- Pick up init properties for maven.jars.list -->
+ <property file="${maven.home}/plugins/core/init.properties"/>
<!-- define maven classpath for the build -->
<path id="maven-classpath">
<fileset dir="${lib.repo}" includes="${maven.jars.list}" />
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
<!-- call common build file initialization to verify project, update jars
- etc -->
+ load properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="verify-project"
inheritAll="true"
inheritRefs="true"
exportAll="true"
exportRefs="true"/>
+
</target>
<!-- ================================================================== -->
1.3 +3 -3
jakarta-turbine-maven/src/templates/build/plugins/core/build-init.xml
Index: build-init.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/build-init.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-init.xml 4 Jun 2002 15:26:24 -0000 1.2
+++ build-init.xml 5 Jun 2002 00:50:24 -0000 1.3
@@ -6,7 +6,7 @@
Based on src/templates/build/build-init-target v1.37
author: dion
- version: $Id: build-init.xml,v 1.2 2002/06/04 15:26:24 dion Exp $
+ version: $Id: build-init.xml,v 1.3 2002/06/05 00:50:24 dion Exp $
-->
<project name="maven-init" default="verify-project">
@@ -50,7 +50,7 @@
<fileset dir="${lib.repo}" includes="${maven.jars.list}" />
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable? -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
@@ -263,7 +263,7 @@
<target
name="update-descriptor"
- depends="checkUpdateDescriptor"
+ depends="checkUpdateDescriptorRequired"
if="updateDescriptorRequired"
description="o Update Maven project descriptor">
1.1
jakarta-turbine-maven/src/templates/build/plugins/core/init.properties
Index: init.properties
===================================================================
# jars needed in lib.repo by maven to execute
# this property is a replacement for jars.list. See the info in
# src/templates/build/plugins/core/build-init.xml about what needs to be
# done to remove jars.list from maven
maven.jars.list=antlr-2.7.1.jar,bcel-5.0.jar,checkstyle-2.2.jar,\
commons-beanutils-dev.jar,commons-betwixt-1.0-dev.jar,\
commons-collections-2.0.jar,commons-digester-1.2.jar,commons-graph-0.8.jar,\
commons-io-0.1.jar,commons-lang-0.1-dev.jar,commons-logging-1.0.jar,\
commons-util-1.0-rc2-dev.jar,dom4j-1.3.jar,jdepend-2.2.jar,log4j-1.1.3.jar,\
oro-2.0.6.jar,regexp-1.2.jar,velocity-1.3-dev.jar,velocity-dvsl-0.43.jar,\
maven.jar,commons-jelly-1.0-dev.jar
1.4 +5 -4 jakarta-turbine-maven/src/templates/build/plugins/test/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/test/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 4 Jun 2002 15:26:24 -0000 1.3
+++ build.xml 5 Jun 2002 00:50:24 -0000 1.4
@@ -6,27 +6,28 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up tool default properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/default.properties"/>
+ <!-- Pick up init properties for maven.jars.list -->
+ <property file="${maven.home}/plugins/core/init.properties"/>
<!-- define maven classpath for the build -->
<path id="maven-classpath">
<fileset dir="${lib.repo}" includes="${maven.jars.list}" />
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
<!-- call common build file initialization to verify project, update jars
- etc -->
+ load project and default properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="verify-project"
inheritAll="true"
inheritRefs="true"
exportAll="true"
exportRefs="true"/>
+
</target>
<!-- ================================================================== -->
1.10 +5 -4 jakarta-turbine-maven/src/templates/build/plugins/docs/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/docs/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 4 Jun 2002 17:46:09 -0000 1.9
+++ build.xml 5 Jun 2002 00:50:24 -0000 1.10
@@ -6,27 +6,28 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up tool default properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/default.properties"/>
+ <!-- Pick up init properties for maven.jars.list -->
+ <property file="${maven.home}/plugins/core/init.properties"/>
<!-- define maven classpath for the build -->
<path id="maven-classpath">
<fileset dir="${lib.repo}" includes="${maven.jars.list}" />
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
<!-- call common build file initialization to verify project, update jars
- etc -->
+ load project and default properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="verify-project"
inheritAll="true"
inheritRefs="true"
exportAll="true"
exportRefs="true"/>
+
</target>
<!-- ================================================================== -->
1.13 +5 -4 jakarta-turbine-maven/src/templates/build/plugins/j2ee/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/j2ee/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 4 Jun 2002 15:26:24 -0000 1.12
+++ build.xml 5 Jun 2002 00:50:24 -0000 1.13
@@ -6,27 +6,28 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up tool default properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/default.properties"/>
+ <!-- Pick up init properties for maven.jars.list -->
+ <property file="${maven.home}/plugins/core/init.properties"/>
<!-- define maven classpath for the build -->
<path id="maven-classpath">
<fileset dir="${lib.repo}" includes="${maven.jars.list}" />
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
<!-- call common build file initialization to verify project, update jars
- etc -->
+ load project and default properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="verify-project"
inheritAll="true"
inheritRefs="true"
exportAll="true"
exportRefs="true"/>
+
</target>
<!-- ================================================================== -->
1.4 +5 -4
jakarta-turbine-maven/src/templates/build/plugins/reactor/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/reactor/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 4 Jun 2002 15:26:24 -0000 1.3
+++ build.xml 5 Jun 2002 00:50:24 -0000 1.4
@@ -6,27 +6,28 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up tool default properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/default.properties"/>
+ <!-- Pick up init properties for maven.jars.list -->
+ <property file="${maven.home}/plugins/core/init.properties"/>
<!-- define maven classpath for the build -->
<path id="maven-classpath">
<fileset dir="${lib.repo}" includes="${maven.jars.list}" />
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
<!-- call common build file initialization to verify project, update jars
- etc -->
+ load project and default properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="verify-project"
inheritAll="true"
inheritRefs="true"
exportAll="true"
exportRefs="true"/>
+
</target>
<!-- ================================================================== -->
1.4 +5 -4
jakarta-turbine-maven/src/templates/build/plugins/iutest/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/iutest/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 4 Jun 2002 15:26:24 -0000 1.3
+++ build.xml 5 Jun 2002 00:50:24 -0000 1.4
@@ -6,27 +6,28 @@
<!-- I N I T -->
<!-- ================================================================== -->
<target name="init">
- <!-- Pick up tool default properties for maven.jars.list -->
- <property file="${maven.home}/plugins/core/default.properties"/>
+ <!-- Pick up init properties for maven.jars.list -->
+ <property file="${maven.home}/plugins/core/init.properties"/>
<!-- define maven classpath for the build -->
<path id="maven-classpath">
<fileset dir="${lib.repo}" includes="${maven.jars.list}" />
</path>
- <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
<taskdef resource="maven-taskdefs.properties">
<classpath refid="maven-classpath" />
</taskdef>
<!-- call common build file initialization to verify project, update jars
- etc -->
+ load project and default properties etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
target="verify-project"
inheritAll="true"
inheritRefs="true"
exportAll="true"
exportRefs="true"/>
+
</target>
<!-- ================================================================== -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
