Author: bayard
Date: Mon Jun 11 22:23:16 2007
New Revision: 546382
URL: http://svn.apache.org/viewvc?view=rev&rev=546382
Log:
Preparing for 1.1 rc by changing 1.1-snapshot to 1.1
Modified:
jakarta/commons/proper/cli/branches/cli-1.0.x/build.xml
jakarta/commons/proper/cli/branches/cli-1.0.x/project.xml
Modified: jakarta/commons/proper/cli/branches/cli-1.0.x/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/cli/branches/cli-1.0.x/build.xml?view=diff&rev=546382&r1=546381&r2=546382
==============================================================================
--- jakarta/commons/proper/cli/branches/cli-1.0.x/build.xml (original)
+++ jakarta/commons/proper/cli/branches/cli-1.0.x/build.xml Mon Jun 11 22:23:16
2007
@@ -1,44 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--build.xml generated by maven from project.xml version 1.1-SNAPSHOT
- on date June 11 2007, time 1738-->
+<!--build.xml generated by maven from project.xml version 1.1
+ on date June 11 2007, time 2220-->
<project default="jar" name="commons-cli" basedir=".">
- <!--Load local and user build preferences-->
-
- <property file="build.properties">
- </property>
- <property file="${user.home}/build.properties">
- </property>
- <!--Build properties-->
-
- <property name="defaulttargetdir" value="${basedir}/target">
- </property>
- <property name="libdir" value="${user.home}/.maven/repository">
+ <property name="defaulttargetdir" value="target">
</property>
- <property name="classesdir" value="${basedir}/target/classes">
+ <property name="libdir" value="target/lib">
</property>
- <property name="testclassesdir" value="${basedir}/target/test-classes">
+ <property name="classesdir" value="target/classes">
</property>
- <property name="testreportdir" value="${basedir}/target/test-reports">
+ <property name="testclassesdir" value="target/test-classes">
</property>
- <property name="distdir" value="${basedir}/dist">
+ <property name="testclassesdir" value="target/test-classes">
</property>
- <property name="javadocdir" value="${basedir}/dist/docs/api">
+ <property name="testreportdir" value="target/test-reports">
</property>
- <property name="final.name" value="commons-cli-1.1-SNAPSHOT">
+ <property name="distdir" value="dist">
</property>
- <property name="proxy.host" value="">
+ <property name="javadocdir" value="dist/docs/api">
</property>
- <property name="proxy.port" value="">
- </property>
- <property name="proxy.username" value="">
- </property>
- <property name="proxy.password" value="">
+ <property name="final.name" value="commons-cli-1.1">
</property>
<path id="build.classpath">
- <pathelement location="${libdir}/junit/jars/junit-3.8.1.jar">
- </pathelement>
+ <fileset dir="${libdir}">
+ <include name="**/*.jar">
+ </include>
+ </fileset>
</path>
<target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}">
@@ -51,25 +39,13 @@
<available property="Junit.present" classname="junit.framework.Test">
</available>
- <!--Test if user defined a proxy-->
-
- <condition property="useProxy">
- <and>
- <isset property="proxy.host">
- </isset>
- <not>
- <equals trim="true" arg2="" arg1="${proxy.host}">
- </equals>
- </not>
- </and>
- </condition>
</target>
<target name="compile" description="o Compile the code" depends="get-deps">
<mkdir dir="${classesdir}">
</mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
<src>
- <pathelement location="${basedir}/src/java">
+ <pathelement location="src/java">
</pathelement>
</src>
<classpath refid="build.classpath">
@@ -103,7 +79,7 @@
<target name="internal-test" if="Junit.present"
depends="junit-present,compile-tests">
<mkdir dir="${testreportdir}">
</mkdir>
- <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes"
fork="true" haltonerror="true">
+ <junit dir="./" failureproperty="test.failure" printSummary="yes"
fork="true" haltonerror="true">
<sysproperty key="basedir" value=".">
</sysproperty>
<formatter type="xml">
@@ -119,7 +95,7 @@
</pathelement>
</classpath>
<batchtest todir="${testreportdir}">
- <fileset dir="${basedir}/src/test">
+ <fileset dir="src/test">
<include name="**/*Test.java">
</include>
</fileset>
@@ -136,7 +112,7 @@
</mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
<src>
- <pathelement location="${basedir}/src/test">
+ <pathelement location="src/test">
</pathelement>
</src>
<classpath>
@@ -154,43 +130,24 @@
<format pattern="2002-yyyy" property="year">
</format>
</tstamp>
- <property name="copyright" value="Copyright &copy; Apache Software
Foundation. All Rights Reserved.">
+ <property name="copyright" value="Copyright &copy; 2002-2007 Apache
Software Foundation. All Rights Reserved.">
</property>
- <property name="title" value="CLI 1.1-SNAPSHOT API">
+ <property name="title" value="CLI 1.1 API">
</property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="${basedir}/src/java"
packagenames="org.apache.commons.*">
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.commons.*">
<classpath>
<path refid="build.classpath">
</path>
</classpath>
</javadoc>
</target>
- <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">
- <mkdir dir="${libdir}/junit/jars/">
- </mkdir>
- <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";>
- </get>
- </target>
- <target name="get-custom-dep-junit.jar" if="junit.jar"
depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/junit/jars/">
- </mkdir>
- <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true" src="${junit.jar}">
- </get>
- </target>
- <target name="get-deps" unless="noget" depends="get-dep-junit.jar">
- </target>
- <target name="setProxy" if="useProxy" depends="init">
+ <target name="get-deps" unless="noget" depends="init">
<!--Proxy settings works only with a JDK 1.2 and higher.-->
- <echo>Proxy used :</echo>
- <echo>Proxy host [${proxy.host}]</echo>
- <echo>Proxy port [${proxy.port}]</echo>
- <echo>Proxy user [${proxy.username}]</echo>
- <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}"
proxypassword="${proxy.password}" proxyhost="${proxy.host}">
+ <setproxy>
</setproxy>
- </target>
- <target name="noProxy" unless="useProxy" depends="init">
- <echo>Proxy not used.</echo>
+ <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";>
+ </get>
</target>
<target name="install-maven">
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true"
src="${repo}/maven/maven-install-latest.jar">
@@ -198,4 +155,4 @@
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
</unjar>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/commons/proper/cli/branches/cli-1.0.x/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/cli/branches/cli-1.0.x/project.xml?view=diff&rev=546382&r1=546381&r2=546382
==============================================================================
--- jakarta/commons/proper/cli/branches/cli-1.0.x/project.xml (original)
+++ jakarta/commons/proper/cli/branches/cli-1.0.x/project.xml Mon Jun 11
22:23:16 2007
@@ -19,7 +19,7 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<name>CLI</name>
- <currentVersion>1.1-SNAPSHOT</currentVersion>
+ <currentVersion>1.1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Commons CLI</shortDescription>
<description>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
