bwalding 2003/07/04 06:18:04
Modified: . build-bootstrap.xml build-bootstrap-core.xml
src/bin forehead.conf
Log:
Applied patch for MAVEN-470
Submitted by: Brett Porter
Revision Changes Path
1.200 +11 -2 maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/maven/build-bootstrap.xml,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- build-bootstrap.xml 1 Jul 2003 15:29:34 -0000 1.199
+++ build-bootstrap.xml 4 Jul 2003 13:18:04 -0000 1.200
@@ -178,10 +178,19 @@
<mkdir dir="${maven.bootstrap.install.dir}/lib/endorsed" />
<copy todir="${maven.bootstrap.install.dir}/lib/endorsed">
<fileset dir="${maven.bootstrap.install.dir}/lib">
- <include name="xml-apis*.jar" />
- <include name="xerces*.jar" />
+ <include name="xml-apis-*.jar" />
+ <include name="xerces-*.jar" />
</fileset>
</copy>
+
+ <!-- Don't duplicate endorsed files -->
+ <delete>
+ <fileset dir="${maven.bootstrap.install.dir}/lib">
+ <include name="xml-apis-*.jar" />
+ <include name="xerces-*.jar" />
+ <include name="piccolo-*.jar" />
+ </fileset>
+ </delete>
<!-- Install maven in the lib directory -->
1.2 +12 -3 maven/build-bootstrap-core.xml
Index: build-bootstrap-core.xml
===================================================================
RCS file: /home/cvs/maven/build-bootstrap-core.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-bootstrap-core.xml 10 Jun 2003 03:15:39 -0000 1.1
+++ build-bootstrap-core.xml 4 Jul 2003 13:18:04 -0000 1.2
@@ -178,11 +178,20 @@
<mkdir dir="${maven.bootstrap.install.dir}/lib/endorsed" />
<copy todir="${maven.bootstrap.install.dir}/lib/endorsed">
<fileset dir="${maven.bootstrap.install.dir}/lib">
- <include name="xml-apis*.jar" />
- <include name="xerces*.jar" />
- <include name="piccolo*.jar" />
+ <include name="xml-apis-*.jar" />
+ <include name="xerces-*.jar" />
+ <include name="piccolo-*.jar" />
</fileset>
</copy>
+
+ <!-- Don't duplicate endorsed files -->
+ <delete>
+ <fileset dir="${maven.bootstrap.install.dir}/lib">
+ <include name="xml-apis-*.jar" />
+ <include name="xerces-*.jar" />
+ <include name="piccolo-*.jar" />
+ </fileset>
+ </delete>
<!-- Install maven in the lib directory -->
1.18 +3 -2 maven/src/bin/forehead.conf
Index: forehead.conf
===================================================================
RCS file: /home/cvs/maven/src/bin/forehead.conf,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- forehead.conf 18 May 2003 11:10:53 -0000 1.17
+++ forehead.conf 4 Jul 2003 13:18:04 -0000 1.18
@@ -9,9 +9,10 @@
${tools.jar}
${maven.home}/lib/commons-grant-1.0-beta-4.jar
${maven.home}/lib/ant-1.5.3-1.jar
- ${maven.home}/lib/xml-apis-1.0.b2.jar
+ ${maven.home}/lib/endorsed/xml-apis-1.0.b2.jar
${maven.home}/lib/ant-optional-1.5.3-1.jar
- ${maven.home}/lib/xerces-2.2.1.jar
+ ${maven.home}/lib/endorsed/xerces-2.2.1.jar
[root.maven]
${maven.home}/lib/*.jar
+ ${maven.home}/lib/endorsed/*.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
