diff options
| author | Stephen D. Huston <shuston@apache.org> | 2011-10-21 01:19:00 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2011-10-21 01:19:00 +0000 |
| commit | ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 (patch) | |
| tree | dcfb94e75656c6c239fc3dcb754cd2015126424d /java/common.xml | |
| parent | 5eb354b338bb8d8fcd35b6ac3fb33f8103e757c3 (diff) | |
| download | qpid-python-ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5.tar.gz | |
Undo bad merge from trunk - merged at wrong level.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common.xml')
| -rw-r--r-- | java/common.xml | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/java/common.xml b/java/common.xml index c6688ee2de..066859b29f 100644 --- a/java/common.xml +++ b/java/common.xml @@ -23,9 +23,7 @@ <dirname property="project.root" file="${ant.file.common}"/> <property name="project.name" value="qpid"/> - <property name="project.version" value="0.13"/> - <property name="project.url" value="http://qpid.apache.org"/> - <property name="project.groupid" value="org.apache.qpid"/> + <property name="project.version" value="0.9"/> <property name="project.namever" value="${project.name}-${project.version}"/> <property name="resources" location="${project.root}/resources"/> @@ -42,6 +40,7 @@ <property name="build.report" location="${build}/report"/> <property name="build.release" location="${build}/release"/> <property name="build.release.prepare" location="${build.release}/prepare"/> + <property name="build.data" location="${build.scratch}/data"/> <property name="build.plugins" location="${build}/lib/plugins"/> <property name="build.coveragereport" location="${build}/coverage"/> <property name="build.findbugs" location="${build}/findbugs"/> @@ -64,11 +63,6 @@ <property name="mllib.dir" value="${project.root}/../python" /> <property name="findbugs.dir" value="${project.root}/lib/findbugs" /> - <!-- properties used to control Ant Eclipse for Eclipse classpath/project files etc --> - <property name="eclipse.updatealways" value="false"/> - <property name="eclipse.compilercompliance" value="5.0"/> - <property name="eclipse.container" value="JVM 1.5"/> - <path id="cobertura.classpath"> <fileset dir="${cobertura.dir}"> <include name="cobertura.jar" /> @@ -77,7 +71,6 @@ </path> <property name="maven.local.repo" value="${build.scratch}/maven-local-repo"/> - <property name="maven.settings.xml" value="${project.root}/maven-settings.xml"/> <property name="maven.unique.version" value="false"/> <property name="maven.snapshot" value="true"/> <condition property="maven.version.suffix" value="" else="-SNAPSHOT"> @@ -131,6 +124,8 @@ </sequential> </macrodef> + + <macrodef name="jython"> <attribute name="path"/> <element name="args"/> @@ -327,20 +322,6 @@ results directory: ${build.results} - - ant eclipse - - Generates project and classpath files for the Eclispe IDE. Requires that - the Ant Eclipse task (http://ant-eclipse.sourceforge.net/) has been installed - in $ANT_HOME/lib. - - The following system properties will be passed to the task. These can be usefully - overridden from the command line. - - eclipse.updatealways - forces Eclipse files to be regenerated even if they are newer then the build.xml (default ${eclipse.updatealways}). - eclipse.container - controls the Eclipse container (default ${eclipse.container}). - eclipse.compilercompliance" - controls the Eclipse compiler compliance (default ${eclipse.compilercompliance}). - </echo> </target> |