[tor-commits] [exonerator/master] Update to Java 7 and metrics-lib 1.5.0.

[karsten at torproject.org]

commit 0282b71ddf312d6715d89b79122dbe71b39e8673
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Tue Nov 1 16:31:00 2016 +0100

    Update to Java 7 and metrics-lib 1.5.0.
---
 build.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 1b8fecd..fc0eb58 100644
--- a/build.xml
+++ b/build.xml
@@ -13,10 +13,12 @@
             value="${config}/context.xml.template"/>
   <property name="contextxml" value="${config}/context.xml"/>
   <property name="warfile" value="exonerator.war"/>
+  <property name="source-and-target-java-version" value="1.7" />
+  <property name="descriptorversion" value="1.5.0" />
   <path id="classpath">
     <pathelement path="${classes}"/>
     <fileset dir="${libs}">
-      <include name="descriptor-1.4.0.jar"/>
+      <include name="descriptor-${descriptorversion}.jar"/>
       <include name="commons-codec-1.9.jar"/>
       <include name="postgresql-jdbc4-9.2.jar"/>
       <include name="servlet-api-3.0.jar"/>
@@ -45,8 +47,8 @@
   <target name="compile" depends="init">
     <javac destdir="${classes}"
            srcdir="${sources}"
-           source="1.5"
-           target="1.5"
+           source="${source-and-target-java-version}"
+           target="${source-and-target-java-version}"
            debug="true"
            deprecation="true"
            optimize="false"