manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1598192 - in /manifoldcf/branches/release-1.6-branch: ./ CHANGES.txt connectors/elasticsearch/build.xml framework/buildfiles/connector-build.xml
Date Thu, 29 May 2014 01:30:54 GMT
Author: kwright
Date: Thu May 29 01:30:53 2014
New Revision: 1598192

URL: http://svn.apache.org/r1598192
Log:
Pull up fix for CONNECTORS-947 from trunk

Modified:
    manifoldcf/branches/release-1.6-branch/   (props changed)
    manifoldcf/branches/release-1.6-branch/CHANGES.txt
    manifoldcf/branches/release-1.6-branch/connectors/elasticsearch/build.xml
    manifoldcf/branches/release-1.6-branch/framework/buildfiles/connector-build.xml

Propchange: manifoldcf/branches/release-1.6-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1598191

Modified: manifoldcf/branches/release-1.6-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/CHANGES.txt?rev=1598192&r1=1598191&r2=1598192&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.6-branch/CHANGES.txt Thu May 29 01:30:53 2014
@@ -3,6 +3,9 @@ $Id$
 
 ======================= Release 1.6.1 =====================
 
+CONNECTORS-947: ant test fails when make-deps is not run.
+(Karl Wright)
+
 CONNECTORS-944: Maven build has different stuff in war file than
 ant build.
 (Arcadius Ahouansou, Karl Wright)

Modified: manifoldcf/branches/release-1.6-branch/connectors/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/connectors/elasticsearch/build.xml?rev=1598192&r1=1598191&r2=1598192&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/connectors/elasticsearch/build.xml (original)
+++ manifoldcf/branches/release-1.6-branch/connectors/elasticsearch/build.xml Thu May 29 01:30:53
2014
@@ -69,7 +69,7 @@
     </target>
 
     <target name="calculate-testcode-condition">
-        <available file="test-materials-proprietary" property="tests-present"/>
+        <available file="test-materials-proprietary/elasticsearch-1.0.1" property="tests-present"/>
     </target>
 
     <path id="connector-test-classpath">

Modified: manifoldcf/branches/release-1.6-branch/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/framework/buildfiles/connector-build.xml?rev=1598192&r1=1598191&r2=1598192&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/release-1.6-branch/framework/buildfiles/connector-build.xml Thu May
29 01:30:53 2014
@@ -290,7 +290,7 @@
         </javac>
     </target>
 
-    <target name="has-tests-check" depends="precompile-check" if="canBuild">
+    <target name="has-tests-check" depends="pretest-check" if="canTest">
         <available file="connector/src/test/java" property="hasTests"/>
     </target>
 



Mime
View raw message