Skip to content

Commit 453ae0e

Browse files
henhen
committed
Preparing for 1.1 rc by changing 1.1-snapshot to 1.1
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/branches/cli-1.0.x@546382 13f79535-47bb-0310-9956-ffa450edef68
1 parent efb671d commit 453ae0e

2 files changed

Lines changed: 28 additions & 71 deletions

File tree

‎build.xml‎

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

3-
<!--build.xml generated by maven from project.xml version 1.1-SNAPSHOT
4-
on date June 11 2007, time 1738-->
3+
<!--build.xml generated by maven from project.xml version 1.1
4+
on date June 11 2007, time 2220-->
55

66
<project default="jar" name="commons-cli" basedir=".">
7-
<!--Load local and user build preferences-->
8-
9-
<property file="build.properties">
10-
</property>
11-
<property file="${user.home}/build.properties">
12-
</property>
13-
<!--Build properties-->
14-
15-
<property name="defaulttargetdir" value="${basedir}/target">
16-
</property>
17-
<property name="libdir" value="${user.home}/.maven/repository">
7+
<property name="defaulttargetdir" value="target">
188
</property>
19-
<property name="classesdir" value="${basedir}/target/classes">
9+
<property name="libdir" value="target/lib">
2010
</property>
21-
<property name="testclassesdir" value="${basedir}/target/test-classes">
11+
<property name="classesdir" value="target/classes">
2212
</property>
23-
<property name="testreportdir" value="${basedir}/target/test-reports">
13+
<property name="testclassesdir" value="target/test-classes">
2414
</property>
25-
<property name="distdir" value="${basedir}/dist">
15+
<property name="testclassesdir" value="target/test-classes">
2616
</property>
27-
<property name="javadocdir" value="${basedir}/dist/docs/api">
17+
<property name="testreportdir" value="target/test-reports">
2818
</property>
29-
<property name="final.name" value="commons-cli-1.1-SNAPSHOT">
19+
<property name="distdir" value="dist">
3020
</property>
31-
<property name="proxy.host" value="">
21+
<property name="javadocdir" value="dist/docs/api">
3222
</property>
33-
<property name="proxy.port" value="">
34-
</property>
35-
<property name="proxy.username" value="">
36-
</property>
37-
<property name="proxy.password" value="">
23+
<property name="final.name" value="commons-cli-1.1">
3824
</property>
3925
<path id="build.classpath">
40-
<pathelement location="${libdir}/junit/jars/junit-3.8.1.jar">
41-
</pathelement>
26+
<fileset dir="${libdir}">
27+
<include name="**/*.jar">
28+
</include>
29+
</fileset>
4230
</path>
4331
<target name="init" description="o Initializes some properties">
4432
<mkdir dir="${libdir}">
@@ -51,25 +39,13 @@
5139

5240
<available property="Junit.present" classname="junit.framework.Test">
5341
</available>
54-
<!--Test if user defined a proxy-->
55-
56-
<condition property="useProxy">
57-
<and>
58-
<isset property="proxy.host">
59-
</isset>
60-
<not>
61-
<equals trim="true" arg2="" arg1="${proxy.host}">
62-
</equals>
63-
</not>
64-
</and>
65-
</condition>
6642
</target>
6743
<target name="compile" description="o Compile the code" depends="get-deps">
6844
<mkdir dir="${classesdir}">
6945
</mkdir>
7046
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
7147
<src>
72-
<pathelement location="${basedir}/src/java">
48+
<pathelement location="src/java">
7349
</pathelement>
7450
</src>
7551
<classpath refid="build.classpath">
@@ -103,7 +79,7 @@
10379
<target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
10480
<mkdir dir="${testreportdir}">
10581
</mkdir>
106-
<junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
82+
<junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
10783
<sysproperty key="basedir" value=".">
10884
</sysproperty>
10985
<formatter type="xml">
@@ -119,7 +95,7 @@
11995
</pathelement>
12096
</classpath>
12197
<batchtest todir="${testreportdir}">
122-
<fileset dir="${basedir}/src/test">
98+
<fileset dir="src/test">
12399
<include name="**/*Test.java">
124100
</include>
125101
</fileset>
@@ -136,7 +112,7 @@
136112
</mkdir>
137113
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
138114
<src>
139-
<pathelement location="${basedir}/src/test">
115+
<pathelement location="src/test">
140116
</pathelement>
141117
</src>
142118
<classpath>
@@ -154,48 +130,29 @@
154130
<format pattern="2002-yyyy" property="year">
155131
</format>
156132
</tstamp>
157-
<property name="copyright" value="Copyright &amp;copy; Apache Software Foundation. All Rights Reserved.">
133+
<property name="copyright" value="Copyright &amp;copy; 2002-2007 Apache Software Foundation. All Rights Reserved.">
158134
</property>
159-
<property name="title" value="CLI 1.1-SNAPSHOT API">
135+
<property name="title" value="CLI 1.1 API">
160136
</property>
161-
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.*">
137+
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.*">
162138
<classpath>
163139
<path refid="build.classpath">
164140
</path>
165141
</classpath>
166142
</javadoc>
167143
</target>
168-
<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">
169-
<mkdir dir="${libdir}/junit/jars/">
170-
</mkdir>
171-
<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">
172-
</get>
173-
</target>
174-
<target name="get-custom-dep-junit.jar" if="junit.jar" depends="init,setProxy,noProxy">
175-
<mkdir dir="${libdir}/junit/jars/">
176-
</mkdir>
177-
<get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="${junit.jar}">
178-
</get>
179-
</target>
180-
<target name="get-deps" unless="noget" depends="get-dep-junit.jar">
181-
</target>
182-
<target name="setProxy" if="useProxy" depends="init">
144+
<target name="get-deps" unless="noget" depends="init">
183145
<!--Proxy settings works only with a JDK 1.2 and higher.-->
184146

185-
<echo>Proxy used :</echo>
186-
<echo>Proxy host [${proxy.host}]</echo>
187-
<echo>Proxy port [${proxy.port}]</echo>
188-
<echo>Proxy user [${proxy.username}]</echo>
189-
<setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}">
147+
<setproxy>
190148
</setproxy>
191-
</target>
192-
<target name="noProxy" unless="useProxy" depends="init">
193-
<echo>Proxy not used.</echo>
149+
<get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/junit/jars/junit-3.8.1.jar">
150+
</get>
194151
</target>
195152
<target name="install-maven">
196153
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
197154
</get>
198155
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
199156
</unjar>
200157
</target>
201-
</project>
158+
</project>

‎project.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<groupId>commons-cli</groupId>
2020
<artifactId>commons-cli</artifactId>
2121
<name>CLI</name>
22-
<currentVersion>1.1-SNAPSHOT</currentVersion>
22+
<currentVersion>1.1</currentVersion>
2323
<inceptionYear>2002</inceptionYear>
2424
<shortDescription>Commons CLI</shortDescription>
2525
<description>

0 commit comments

Comments
 (0)