You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ol...@apache.org on 2004/09/06 20:02:02 UTC
cvs commit: jakarta-commons/httpclient maven.xml
olegk 2004/09/06 11:02:02
Modified: httpclient maven.xml
Log:
Fixed compatibility problem with Maven 1.0
Revision Changes Path
1.5 +24 -24 jakarta-commons/httpclient/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 17 Aug 2004 15:38:44 -0000 1.4
+++ maven.xml 6 Sep 2004 18:02:02 -0000 1.5
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- Author: Jeff Dever -->
-<project>
+<project xmlns:ant="jelly:ant">
<!-- ================================================================== -->
<!-- START : C O M M O N S - B U I L D -->
@@ -9,12 +9,12 @@
<!-- Required: Look and Feel for documentation within distributions -->
<!-- ================================================================== -->
<postGoal name="xdoc:copy-resources">
- <copy todir="${basedir}/target/docs/style/" failonerror="false">
+ <ant:copy todir="${basedir}/target/docs/style/" failonerror="false">
<fileset dir="${basedir}/../commons-build/xdocs/style">
<include name='**/*'/>
<exclude name='**/CVS/**'/>
</fileset>
- </copy>
+ </ant:copy>
</postGoal>
<!-- ================================================================== -->
<!-- END: C O M M O N S - B U I L D -->
@@ -30,7 +30,7 @@
<echo>[HttpClient] dist:prepare-bin-filesystem postGoal</echo>
- <copy todir="${maven.dist.bin.assembly.dir}/docs">
+ <ant:copy todir="${maven.dist.bin.assembly.dir}/docs">
<fileset dir="./docs">
<include name="*.txt"/>
<include name="*.html"/>
@@ -38,21 +38,21 @@
<fileset dir="target/docs">
<include name="**/*"/>
</fileset>
- </copy>
+ </ant:copy>
- <copy file="release_notes.txt" tofile="${maven.dist.bin.assembly.dir}/RELEASE_NOTES.txt" />
+ <ant:copy file="release_notes.txt" tofile="${maven.dist.bin.assembly.dir}/RELEASE_NOTES.txt" />
- <fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="lf" encoding="ISO-8859-1"
+ <ant:fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="lf" encoding="ISO-8859-1"
includes="**/*.xml **/*.properties **/*.html **/*.css" />
- <fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="crlf" encoding="ISO-8859-1"
+ <ant:fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="crlf" encoding="ISO-8859-1"
includes="**/*.txt" />
- <copy file="LICENSE.txt" tofile="${maven.dist.bin.assembly.dir}/LICENSE" />
- <copy file="README.txt" tofile="${maven.dist.bin.assembly.dir}/README" />
- <copy file="release_notes.txt" tofile="${maven.dist.bin.assembly.dir}/RELEASE_NOTES" />
+ <ant:copy file="LICENSE.txt" tofile="${maven.dist.bin.assembly.dir}/LICENSE" />
+ <ant:copy file="README.txt" tofile="${maven.dist.bin.assembly.dir}/README" />
+ <ant:copy file="release_notes.txt" tofile="${maven.dist.bin.assembly.dir}/RELEASE_NOTES" />
- <fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="lf" encoding="ISO-8859-1"
+ <ant:fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="lf" encoding="ISO-8859-1"
includes="LICENSE README RELEASE_NOTES" />
</postGoal>
@@ -61,13 +61,13 @@
<echo>[HttpClient] dist:prepare-src-filesystem postGoal</echo>
- <copy todir="${maven.dist.src.assembly.dir}">
+ <ant:copy todir="${maven.dist.src.assembly.dir}">
<fileset dir=".">
<include name="build.properties.sample"/>
</fileset>
- </copy>
+ </ant:copy>
- <copy todir="${maven.dist.src.assembly.dir}/docs">
+ <ant:copy todir="${maven.dist.src.assembly.dir}/docs">
<fileset dir="./docs">
<include name="*.txt"/>
<include name="*.html"/>
@@ -75,25 +75,25 @@
<fileset dir="target/docs">
<include name="**/*"/>
</fileset>
- </copy>
+ </ant:copy>
- <copy file="release_notes.txt" tofile="${maven.dist.src.assembly.dir}/RELEASE_NOTES.txt" />
+ <ant:copy file="release_notes.txt" tofile="${maven.dist.src.assembly.dir}/RELEASE_NOTES.txt" />
- <fixcrlf srcdir="${maven.dist.src.assembly.dir}" javafiles="true"
+ <ant:fixcrlf srcdir="${maven.dist.src.assembly.dir}" javafiles="true"
eol="lf" tab="remove" tablength="4" encoding="ISO-8859-1"
includes="**/*.java" />
- <fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="lf" encoding="ISO-8859-1"
+ <ant:fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="lf" encoding="ISO-8859-1"
includes="**/*.xml **/*.properties **/*.html **/*.css" />
- <fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="crlf" encoding="ISO-8859-1"
+ <ant:fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="crlf" encoding="ISO-8859-1"
includes="**/*.txt" />
- <copy file="LICENSE.txt" tofile="${maven.dist.src.assembly.dir}/LICENSE" />
- <copy file="README.txt" tofile="${maven.dist.src.assembly.dir}/README" />
- <copy file="release_notes.txt" tofile="${maven.dist.src.assembly.dir}/RELEASE_NOTES" />
+ <ant:copy file="LICENSE.txt" tofile="${maven.dist.src.assembly.dir}/LICENSE" />
+ <ant:copy file="README.txt" tofile="${maven.dist.src.assembly.dir}/README" />
+ <ant:copy file="release_notes.txt" tofile="${maven.dist.src.assembly.dir}/RELEASE_NOTES" />
- <fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="lf" encoding="ISO-8859-1"
+ <ant:fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="lf" encoding="ISO-8859-1"
includes="LICENSE README RELEASE_NOTES" />
</postGoal>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org