[libpostgresql-jdbc-java] 77/93: backpatch fix to build to allow travis CI to build it

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag REL9_3_1102
in repository libpostgresql-jdbc-java.

commit 88b9a034c8dd86a1de961f370e548cac74ed1031
Author: Dave Cramer <davecramer at gmail.com>
Date:   Sat Apr 5 16:56:33 2014 -0400

    backpatch fix to build to allow travis CI to build it
---
 build.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 2b86a36..152517d 100644
--- a/build.xml
+++ b/build.xml
@@ -106,6 +106,10 @@
     <include name="${package}/xa/jdbc4/*.java" if="jdbc4any"/>
   </patternset>
 
+  <artifact:dependencies pathId="dependency.classpath" useScope="test">
+    <dependency groupId="junit" artifactId="junit" version="3.8.2" scope="test"/>
+  </artifact:dependencies>
+
   <target name="check_versions">
     <condition property="jdbc2">
       <or>
@@ -229,6 +233,7 @@
     <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
 
     <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}" source="${java.specification.version}">
+      <classpath refid="dependency.classpath" />
       <patternset refid="jdbc.version.src.pattern"/>
     </javac>
   </target>
@@ -429,9 +434,9 @@
 
   <!-- This compiles and builds the test jarfile. -->  
   <target name="testjar" depends="jar">
-    <fail message="JUnit could not be found in your classpath.  You must download and install it from http://junit.org to build and run the test suite." unless="junit" />
     <mkdir dir="${builddir}/tests"/>
     <javac srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}" source="${java.specification.version}">
+      <classpath refid="dependency.classpath" />
       <include name="${package}/test/**" />
 
       <exclude name="${package}/test/jdbc4/**" unless="jdbc4tests" />
@@ -467,6 +472,7 @@
       <sysproperty key="protocolVersion" value="${protocolVersion}" />
       <sysproperty key="ssltest.properties" value="${ssltest.properties}" />
 
+      <classpath refid="dependency.classpath" />
       <classpath>
         <pathelement location="${artifact.jar}" />
         <pathelement location="${jardir}/postgresql-tests.jar" />

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git