fix build

johnspackman · Feb 27, 2018 · 2517064 · 2517064
1 parent 202614a
commit 2517064
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/build.xml b/build.xml
@@ -2,14 +2,15 @@
 
 	<property name="build.compiler" value="modern" />
 	<property name="src.dir" value="src" />
-	<property name="build.dir" value="../build" />
-	<property name="version" value="1.0" />
+	<property name="build.dir" value="build" />
+	<property name="version" value="6.0-alpha" />
 	<property name="jarfile" value="${build.dir}/qso-${version}.jar" />
 	<property name="depsfile" value="${build.dir}/qso-${version}-deps.jar" />
 
 	<path id="classpath">
-		<fileset dir="other-libs" includes="*.jar" />
-		<fileset dir="lib" includes="*.jar" />
+        <fileset dir="WebContent/WEB-INF/lib" includes="*.jar" />
+        <fileset dir="lib" includes="*.jar" />
+        <fileset dir="../../../../../../../../../bin/apache-tomcat-7.0.81/lib" includes="*.jar" />
 	</path>
 
 	<target name="clean">
@@ -39,7 +40,6 @@
 	<target name="dist" depends="jar">
 		<delete file="${depsfile}" />
 		<jar destfile="${depsfile}">
-			<fileset dir="other-libs" includes="*.jar" />
 			<fileset dir="lib" includes="*.jar" />
 		</jar>
 	</target>

diff --git a/lib/junit-4.12.jar b/lib/junit-4.12.jar
diff --git a/lib/junit-interface-0.11.jar b/lib/junit-interface-0.11.jar
diff --git a/src/java/com/zenesis/qx/remote/AbstractProxyProperty.java b/src/java/com/zenesis/qx/remote/AbstractProxyProperty.java
@@ -2,13 +2,10 @@
 
 import java.io.IOException;
 import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 
-import org.hamcrest.core.IsAnything;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.SerializerProvider;