[tor-commits] [onionoo/master] Avoid name clash with metrics-lib.

[karsten@xxxxxxxxxxxxxx]

commit 15de42a51c5c7966bf86175e2538464e5be8f3d1
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Sat May 30 11:53:53 2015 +0200

    Avoid name clash with metrics-lib.
---
 build.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 5986416..b10987b 100644
--- a/build.xml
+++ b/build.xml
@@ -17,7 +17,7 @@
   <property name="webxml" value="${config}/web.xml"/>
   <property name="warfile"
             value="${dist}/onionoo-${release.version}.war"/>
-  <property name="jarfile"
+  <property name="onionoo.jarfile"
             value="${dist}/onionoo-${release.version}.jar"/>
   <property name="source-and-target-java-version" value="1.7" />
 
@@ -161,7 +161,7 @@
   </target>
 
   <target name="jar" depends="compile">
-    <jar destfile="${jarfile}"
+    <jar destfile="${onionoo.jarfile}"
          basedir="${classes}">
       <zipgroupfileset dir="/usr/share/java">
         <include name="commons-codec-1.6.jar"/>

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits