jvanzyl 2002/07/16 15:03:33
Modified: . build-bootstrap.xml jars.list project.xml
Log:
Revision Changes Path
1.132 +14 -15 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- build-bootstrap.xml 16 Jul 2002 16:21:16 -0000 1.131
+++ build-bootstrap.xml 16 Jul 2002 22:03:33 -0000 1.132
@@ -138,32 +138,31 @@
<!-- We need to build all the plugins -->
+ <delete dir="src/plugins-build/plugins"/>
+ <mkdir dir="src/plugins-build/plugins"/>
+
<exec executable="${maven.home}/bin/${maven.script}"
failonerror="true">
<arg line="build:plugins"/>
<env key="MAVEN_HOME" value="${maven.home}"/>
</exec>
-
- <!-- Install them all in maven.home/plugins -->
-
- <copy todir="${maven.home}/plugins" flatten="yes">
- <fileset dir="src/plugins-build">
- <include name="**/target/*.jar"/>
- </fileset>
- </copy>
-
- <!-- Remove the java,clean,test plugins need to bootstrap -->
-
- <delete dir="${maven.home}/plugins/java"/>
- <delete dir="${maven.home}/plugins/test"/>
- <delete dir="${maven.home}/plugins/clean"/>
-
+
<exec executable="${maven.home}/bin/${maven.script}"
failonerror="true">
<arg line="clean"/>
<arg line="java:jar"/>
<env key="MAVEN_HOME" value="${maven.home}"/>
</exec>
+
+ <delete dir="${maven.home}/plugins"/>
+ <mkdir dir="${maven.home}/plugins"/>
+
+ <copy todir="${maven.home}/plugins" flatten="yes">
+ <fileset dir="src/plugins-build">
+ <include name="**/target/*.jar"/>
+ <exclude name="**/target/*webserver*.jar"/>
+ </fileset>
+ </copy>
</target>
1.48 +0 -2 jakarta-turbine-maven/jars.list
Index: jars.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/jars.list,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- jars.list 16 Jul 2002 08:02:40 -0000 1.47
+++ jars.list 16 Jul 2002 22:03:33 -0000 1.48
@@ -28,7 +28,6 @@
commons-cli/jars/commons-cli-1.0-dev.jar
commons-collections/jars/commons-collections-2.0.jar
commons-digester/jars/commons-digester-1.2.jar
-commons-graph/jars/commons-graph-0.8.jar
commons-grant/jars/commons-grant-1.0-b1.jar
commons-io/jars/commons-io-0.2-dev.20020614.122300.jar
commons-jelly/jars/commons-jelly-SNAPSHOT.jar
@@ -43,7 +42,6 @@
logkit/jars/logkit-1.0.1.jar
log4j/jars/log4j-1.1.3.jar
velocity/jars/velocity-1.4-dev.jar
-velocity-dvsl/jars/velocity-dvsl-0.43.20020711.010949.jar
xerces/jars/xerces-2.0.0.jar
xml-apis/jars/xml-apis-2.0.2.jar
werkz/jars/werkz-SNAPSHOT.jar
1.158 +5 -17 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- project.xml 16 Jul 2002 16:21:16 -0000 1.157
+++ project.xml 16 Jul 2002 22:03:33 -0000 1.158
@@ -340,11 +340,6 @@
</dependency>
<dependency>
- <id>commons-graph</id>
- <version>0.8</version>
- </dependency>
-
- <dependency>
<id>commons-jelly</id>
<version>SNAPSHOT</version>
<url>http://jakarta.apache.org/commons/sandbox/jelly/</url>
@@ -369,12 +364,6 @@
</dependency>
<dependency>
- <id>velocity</id>
- <version>1.4-dev</version>
- <url>http://jakarta.apache.org/velocity/</url>
- </dependency>
-
- <dependency>
<id>werkz</id>
<version>SNAPSHOT</version>
</dependency>
@@ -451,12 +440,6 @@
<!-- Documentation dependencies -->
<dependency>
- <id>velocity-dvsl</id>
- <version>0.43.20020711.010949</version>
- <url>http://jakarta.apache.org/velocity/dvsl/</url>
- </dependency>
-
- <dependency>
<id>jdepend</id>
<version>2.2</version>
<url>http://www.clarkware.com/software/JDepend.html</url>
@@ -469,6 +452,11 @@
<version>0.5b</version>
</dependency>
-->
+
+ <dependency>
+ <id>velocity</id>
+ <version>1.4-dev</version>
+ </dependency>
</dependencies>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
