[tor-commits] [exonerator/master] Make two build improvements.

[karsten at torproject.org]

commit 4b013a1c1ccd290afc68f39ab1fbfc8fe483a5b7
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Sat Oct 8 22:07:38 2016 +0200

    Make two build improvements.
    
    Upgrade to metrics-lib 1.4.0 and include newly required logging .jar
    files.
    
    Include PostgreSQL .jar file in the .war file rather than relying on
    Tomcat to provide it.
---
 build.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index dfb7c2e..42c0ee0 100644
--- a/build.xml
+++ b/build.xml
@@ -16,11 +16,14 @@
   <path id="classpath">
     <pathelement path="${classes}"/>
     <fileset dir="${libs}">
-      <include name="descriptor-1.3.1.jar"/>
+      <include name="descriptor-1.4.0.jar"/>
       <include name="commons-codec-1.9.jar"/>
       <include name="postgresql-jdbc4-9.2.jar"/>
       <include name="servlet-api-3.0.jar"/>
       <include name="commons-lang-2.6.jar"/>
+      <include name="logback-core-1.1.2.jar" />
+      <include name="logback-classic-1.1.2.jar" />
+      <include name="slf4j-api-1.7.7.jar"/>
     </fileset>
   </path>
   <path id="checkstyle.classpath" >
@@ -93,9 +96,10 @@
     <war destfile="${warfile}"
          webxml="${webxmlfile}">
       <fileset dir="web"/>
-      <lib dir="/usr/share/java">
-          <include name="commons-codec-1.9.jar"/>
-          <include name="commons-lang-2.6.jar"/>
+      <lib dir="${libs}">
+        <include name="commons-codec-1.9.jar"/>
+        <include name="commons-lang-2.6.jar"/>
+        <include name="postgresql-jdbc4-9.2.jar"/>
       </lib>
       <classes dir="${classes}"/>
       <zipfileset dir="${resources}"