Author: robbie
Date: Mon May 14 21:11:13 2012
New Revision: 1338426
URL: http://svn.apache.org/viewvc?rev=1338426&view=rev
Log:
QPID-3994: add properties for libraries used only in the build
Modified:
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/common.xml
qpid/trunk/qpid/java/module.xml
Modified: qpid/trunk/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1338426&r1=1338425&r2=1338426&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Mon May 14 21:11:13 2012
@@ -54,8 +54,6 @@ felix.libs=${felix-main}
jackson-core=lib/required/jackson-core-asl-1.9.0.jar
jackson-mapper=lib/required/jackson-mapper-asl-1.9.0.jar
-bnd=lib/required/bnd-0.0.384.jar
-
commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
${commons-codec} ${commons-lang} ${commons-collections}
${commons-configuration}
@@ -162,3 +160,8 @@ jcommon.jar=lib/jfree/jcommon-1.0.16.jar
csvjdbc.jar=lib/csvjdbc/csvjdbc-1.0.8.jar
perftests-visualisation-jfc.libs=${jfreechart.jar} ${jcommon.jar}
${csvjdbc.jar}
perftests-visualisation-jfc.test.libs=${test.libs}
+
+# Libraries used only within the build
+bnd=lib/required/bnd-0.0.384.jar
+jython=lib/required/jython-standalone-2.5.2.jar
+maven-ant-tasks=lib/required/maven-ant-tasks-2.1.1.jar
Modified: qpid/trunk/qpid/java/common.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=1338426&r1=1338425&r2=1338426&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Mon May 14 21:11:13 2012
@@ -180,7 +180,7 @@
<attribute name="path"/>
<element name="args"/>
<sequential>
- <java jar="${project.root}/lib/required/jython-standalone-2.5.2.jar"
fork="true" failonerror="true">
+ <java jar="${project.root}/${jython}" fork="true" failonerror="true">
<arg value="-Dpython.path=@{path}"/>
<args/>
</java>
Modified: qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1338426&r1=1338425&r2=1338426&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Mon May 14 21:11:13 2012
@@ -22,7 +22,9 @@
<import file="common.xml"/>
- <path id="maven-ant-tasks.classpath"
path="${project.root}/lib/required/maven-ant-tasks-2.1.1.jar" />
+ <property file="${project.root}/build.deps"/>
+
+ <path id="maven-ant-tasks.classpath"
path="${project.root}/${maven-ant-tasks}" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="antlib:org.apache.maven.artifact.ant"
classpathref="maven-ant-tasks.classpath" />
@@ -39,8 +41,6 @@
<echo message="Running ant for module : ${module}" level="info"/>
- <property file="${project.root}/build.deps"/>
-
<property name="module.build" location="${build.scratch}/${module}"/>
<property name="module.classes" location="${module.build}/classes"/>
<property name="module.instrumented"
location="${module.build}/classes-instrumented"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
