jvanzyl 02/03/05 08:27:19
Modified: . build-bootstrap.xml
src/templates/build build-docs.xml build-maven.xml
build-metrics.xml build-test.xml build.init.target
Log:
Working around the bootstrap problem and the need for a huge JAR by creating
the minimum classpath required by Maven and using that classpath for
the maven tasks. With a different refid I hope that this won't interfere
with a projects classpath.
Revision Changes Path
1.28 +1 -2 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build-bootstrap.xml 5 Mar 2002 15:38:21 -0000 1.27
+++ build-bootstrap.xml 5 Mar 2002 16:27:18 -0000 1.28
@@ -49,8 +49,7 @@
<src>
<path location="src/java"/>
</src>
- <include name="org/apache/maven/BaseProjectTask.java"/>
- <include name="org/apache/maven/UpdateResources.java"/>
+ <include name="org/apache/maven/*"/>
<include name="org/apache/maven/project/*"/>
</javac>
1.24 +0 -2 jakarta-turbine-maven/src/templates/build/build-docs.xml
Index: build-docs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-docs.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build-docs.xml 5 Mar 2002 04:10:55 -0000 1.23
+++ build-docs.xml 5 Mar 2002 16:27:18 -0000 1.24
@@ -2,8 +2,6 @@
<project name="$project.id" default="docs" basedir="$antBasedir">
-##parse("build.properties.loading")
-
#parse("build.init.target")
<target
1.3 +1 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-maven.xml 5 Mar 2002 04:58:43 -0000 1.2
+++ build-maven.xml 5 Mar 2002 16:27:18 -0000 1.3
@@ -2,8 +2,6 @@
<project name="$project.id" default="jar" basedir="$antBasedir">
-##parse("build.properties.loading")
-
#parse("build.init.target")
<!-- ================================================================== -->
@@ -33,7 +31,7 @@
<target
name="update-jars"
description="o Update JARs required for building"
- depends="update-jars-proxy,update-jars-noproxy">
+ depends="init,update-jars-proxy,update-jars-noproxy">
</target>
<target
1.8 +0 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build-metrics.xml 5 Mar 2002 04:58:43 -0000 1.7
+++ build-metrics.xml 5 Mar 2002 16:27:18 -0000 1.8
@@ -2,8 +2,6 @@
<project name="$project.id" default="metrics" basedir="$antBasedir">
-##parse("build.properties.loading")
-
#parse("build.init.target")
<!-- ================================================================== -->
1.8 +0 -2 jakarta-turbine-maven/src/templates/build/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-test.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build-test.xml 5 Mar 2002 04:10:55 -0000 1.7
+++ build-test.xml 5 Mar 2002 16:27:18 -0000 1.8
@@ -2,8 +2,6 @@
<project name="$project.id" default="test" basedir="$antBasedir">
-##parse("build.properties.loading")
-
#parse("build.init.target")
<!-- ================================================================== -->
1.5 +19 -1 jakarta-turbine-maven/src/templates/build/build.init.target
Index: build.init.target
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.init.target,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.init.target 28 Feb 2002 22:41:50 -0000 1.4
+++ build.init.target 5 Mar 2002 16:27:18 -0000 1.5
@@ -1,5 +1,23 @@
+ <!-- These are the bare minimum set of JARs that maven needs to operate.
+ We don't want to make a big JAR containing everything so we
+ are creating a special maven-classpath reference which is
+ used by the maven operations.
+
+ This can be cleaned up a bit, these lines can be generated instead
+ of being hardcoded but it gets us around the bootstrap problem
+ and keeps us away from a big fat JAR.
+ -->
+
<path id="maven-classpath">
<pathelement location="${lib.repo}/maven.jar"/>
+ <pathelement location="${lib.repo}/commons-graph.jar"/>
+ <pathelement location="${lib.repo}/stratum-0.1-dev.jar"/>
+ <pathelement location="${lib.repo}/dom4j-1.1.jar"/>
+ <pathelement location="${lib.repo}/commons-beanutils.jar"/>
+ <pathelement location="${lib.repo}/commons-collections.jar"/>
+ <pathelement location="${lib.repo}/commons-util-1.0-rc2-dev.jar"/>
+ <pathelement location="${lib.repo}/commons-io.jar"/>
+ <pathelement location="${lib.repo}/commons-lang-0.1-dev.jar"/>
</path>
<!-- ================================================================== -->
@@ -40,5 +58,5 @@
references required to build -->
<project-properties projectDescriptor="project.xml"/>
-
+
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
