Author: robbie
Date: Mon Sep 23 23:23:40 2013
New Revision: 1525729
URL: http://svn.apache.org/r1525729
Log:
QPID-5157: Remove dead target whose execution is conditional on a property
which is never set. Remove unused properties/refs.
Modified:
qpid/trunk/qpid/java/common/build.xml
qpid/trunk/qpid/java/module.xml
Modified: qpid/trunk/qpid/java/common/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/build.xml?rev=1525729&r1=1525728&r2=1525729&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build.xml (original)
+++ qpid/trunk/qpid/java/common/build.xml Mon Sep 23 23:23:40 2013
@@ -26,7 +26,6 @@
<property name="generated.package" value="org/apache/qpid/framing" />
<property name="framing.generated.dir"
location="${module.precompiled}/${generated.package}" />
- <property name="qpidbuildversion.java"
location="${module.precompiled}/org/apache/qpid/QpidBuildVersion.java" />
<property name="xml.spec.dir" location="${project.root}/../specs" />
<property name="xml.spec.deps" value="amqp0-8-qpid.stripped.xml
amqp0-9-qpid.stripped.xml amqp0-9-1.stripped.xml" />
<property name="xml.spec.list"
value='"${xml.spec.dir}/amqp0-8-qpid.stripped.xml"
"${xml.spec.dir}/amqp0-9-qpid.stripped.xml"
"${xml.spec.dir}/amqp0-9-1.stripped.xml"' />
@@ -83,25 +82,6 @@
<touch file="${gentools.timestamp}" />
</target>
- <target name="build-version" depends="create-version" if="version-stale">
- <tstamp>
- <format property="build.time" pattern="yyyy-MM-dd HH:mm:ss z"
timezone="UTC"/>
- </tstamp>
-
- <echo file="${qpidbuildversion.java}" append="false">package
org.apache.qpid;
-
-public class QpidBuildVersion
-{
- public static final String VERSION = "${project.version}";
- public static final String SVN_VERSION = "${svnversion.output}";
- public static final String BUILD_PROJECT = "${project.name}";
- public static final String BUILD_TIME = "${build.time}";
-
-}
-</echo>
-
- </target>
-
<target name="jms-selector">
<copy tofile="${module.build}/javacc.jar" failonerror="true">
<fileset dir="${project.root}/lib/required">
@@ -114,7 +94,7 @@ public class QpidBuildVersion
javacchome="${module.build}"/>
</target>
- <target name="precompile"
depends="gentools,jython,create-version,build-version,jms-selector"/>
+ <target name="precompile"
depends="gentools,jython,create-version,jms-selector"/>
<target name="bundle" depends="bundle-tasks"/>
Modified: qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1525729&r1=1525728&r2=1525729&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Mon Sep 23 23:23:40 2013
@@ -398,7 +398,6 @@
<property name="test.output" value="${module.results}"/>
<property name="QPID_HOME" value="${qpid.home}"/>
<property name="QPID_WORK" value="${qpid.work}"/>
- <property name="broker.existing.qpid.work" value=""/>
<propertyset id="all.test.systemproperties">
<propertyref prefix="test"/>
@@ -423,7 +422,6 @@
<propertyref name="QPID_HOME"/>
<propertyref name="QPID_WORK"/>
- <propertyref name="example.plugin.target"/>
</propertyset>
<target name="test" depends="build,compile-tests" if="module.test.src.exists"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
