Skip to content

Commit 8f46f46

Browse files
committed
Updating the build.xml with a new maven ant. This fixes the copying from a cli2 directory, the repository location, an unnecessary jdepend dependency and all importantly, the version number. Thanks to Brian Egge in CLI-129 for this, though I ended up using his patch as a pointer to the parts of project.xml that needed fixing rather than a fix for the build.xml.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/branches/cli-1.0.x@538025 13f79535-47bb-0310-9956-ffa450edef68
1 parent f557733 commit 8f46f46

1 file changed

Lines changed: 7 additions & 35 deletions

File tree

build.xml

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!--build.xml generated by maven from project.xml version 2.0-SNAPSHOT
4-
on date March 3 2006, time 1447-->
3+
<!--build.xml generated by maven from project.xml version 1.1-SNAPSHOT
4+
on date May 14 2007, time 1658-->
55

66
<project default="jar" name="commons-cli" basedir=".">
77
<!--Load local and user build preferences-->
@@ -26,7 +26,7 @@
2626
</property>
2727
<property name="javadocdir" value="${basedir}/dist/docs/api">
2828
</property>
29-
<property name="final.name" value="commons-cli-2.0-SNAPSHOT">
29+
<property name="final.name" value="commons-cli-1.1-SNAPSHOT">
3030
</property>
3131
<property name="proxy.host" value="">
3232
</property>
@@ -41,8 +41,6 @@
4141
</pathelement>
4242
<pathelement location="${libdir}/junit/jars/junit-3.8.1.jar">
4343
</pathelement>
44-
<pathelement location="${libdir}/jdepend/jars/jdepend-2.5.jar">
45-
</pathelement>
4644
</path>
4745
<target name="init" description="o Initializes some properties">
4846
<mkdir dir="${libdir}">
@@ -79,14 +77,6 @@
7977
<classpath refid="build.classpath">
8078
</classpath>
8179
</javac>
82-
<mkdir dir="${classesdir}/org/apache/commons/cli2">
83-
</mkdir>
84-
<copy todir="${classesdir}/org/apache/commons/cli2">
85-
<fileset dir="${basedir}/src/java/org/apache/commons/cli2">
86-
<include name="**/*.properties">
87-
</include>
88-
</fileset>
89-
</copy>
9080
</target>
9181
<target name="jar" description="o Create the jar" depends="compile,test">
9282
<jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
@@ -160,12 +150,6 @@
160150
</pathelement>
161151
</classpath>
162152
</javac>
163-
<copy todir="${testclassesdir}/org/apache/commons/cli2">
164-
<fileset dir="${basedir}/src/test/org/apache/commons/cli2">
165-
<include name="**/*.properties">
166-
</include>
167-
</fileset>
168-
</copy>
169153
</target>
170154
<target name="javadoc" description="o Generate javadoc" depends="get-deps">
171155
<mkdir dir="${javadocdir}">
@@ -176,7 +160,7 @@
176160
</tstamp>
177161
<property name="copyright" value="Copyright &amp;copy; Apache Software Foundation. All Rights Reserved.">
178162
</property>
179-
<property name="title" value="CLI 2.0-SNAPSHOT API">
163+
<property name="title" value="CLI 1.1-SNAPSHOT API">
180164
</property>
181165
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.*">
182166
<classpath>
@@ -188,7 +172,7 @@
188172
<target name="get-dep-commons-lang.jar" description="o Download the dependency : commons-lang.jar" unless="commons-lang.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-lang.jar">
189173
<mkdir dir="${libdir}/commons-lang/jars/">
190174
</mkdir>
191-
<get dest="${libdir}/commons-lang/jars/commons-lang-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-2.1.jar">
175+
<get dest="${libdir}/commons-lang/jars/commons-lang-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/commons-lang/jars/commons-lang-2.1.jar">
192176
</get>
193177
</target>
194178
<target name="get-custom-dep-commons-lang.jar" if="commons-lang.jar" depends="init,setProxy,noProxy">
@@ -200,7 +184,7 @@
200184
<target name="get-dep-junit.jar" description="o Download the dependency : junit.jar" unless="junit.jar" depends="init,setProxy,noProxy,get-custom-dep-junit.jar">
201185
<mkdir dir="${libdir}/junit/jars/">
202186
</mkdir>
203-
<get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
187+
<get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/junit/jars/junit-3.8.1.jar">
204188
</get>
205189
</target>
206190
<target name="get-custom-dep-junit.jar" if="junit.jar" depends="init,setProxy,noProxy">
@@ -209,19 +193,7 @@
209193
<get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="${junit.jar}">
210194
</get>
211195
</target>
212-
<target name="get-dep-jdepend.jar" description="o Download the dependency : jdepend.jar" unless="jdepend.jar" depends="init,setProxy,noProxy,get-custom-dep-jdepend.jar">
213-
<mkdir dir="${libdir}/jdepend/jars/">
214-
</mkdir>
215-
<get dest="${libdir}/jdepend/jars/jdepend-2.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jdepend/jars/jdepend-2.5.jar">
216-
</get>
217-
</target>
218-
<target name="get-custom-dep-jdepend.jar" if="jdepend.jar" depends="init,setProxy,noProxy">
219-
<mkdir dir="${libdir}/jdepend/jars/">
220-
</mkdir>
221-
<get dest="${libdir}/jdepend/jars/jdepend-2.5.jar" usetimestamp="true" ignoreerrors="true" src="${jdepend.jar}">
222-
</get>
223-
</target>
224-
<target name="get-deps" unless="noget" depends="get-dep-commons-lang.jar,get-dep-junit.jar,get-dep-jdepend.jar">
196+
<target name="get-deps" unless="noget" depends="get-dep-commons-lang.jar,get-dep-junit.jar">
225197
</target>
226198
<target name="setProxy" if="useProxy" depends="init">
227199
<!--Proxy settings works only with a JDK 1.2 and higher.-->

0 commit comments

Comments
 (0)