manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1708555 - in /manifoldcf/branches/CONNECTORS-1162: build.xml connectors/kafka/build.xml
Date Wed, 14 Oct 2015 07:48:57 GMT
Author: kwright
Date: Wed Oct 14 07:48:57 2015
New Revision: 1708555

URL: http://svn.apache.org/viewvc?rev=1708555&view=rev
Log:
Fix up client dependencies and separate from testing dependencies

Modified:
    manifoldcf/branches/CONNECTORS-1162/build.xml
    manifoldcf/branches/CONNECTORS-1162/connectors/kafka/build.xml

Modified: manifoldcf/branches/CONNECTORS-1162/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1162/build.xml?rev=1708555&r1=1708554&r2=1708555&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1162/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1162/build.xml Wed Oct 14 07:48:57 2015
@@ -1704,55 +1704,20 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
-            <param name="project-path" value="org/apache/kafka"/>
-            <param name="artifact-version" value="0.8.2.1"/>
-            <param name="artifact-name" value="kafka_2.11"/>
+            <param name="project-path" value="net/jpountz/lz4"/>
+            <param name="artifact-version" value="1.3.0"/>
+            <param name="artifact-name" value="lz4"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
-            <param name="project-path" value="org/apache/commons"/>
-            <param name="artifact-version" value="3.4"/>
-            <param name="artifact-name" value="commons-lang3"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
-        <antcall target="download-via-maven">
-            <param name="target" value="lib"/>
-            <param name="project-path" value="com/yammer/metrics"/>
-            <param name="artifact-version" value="2.2.0"/>
-            <param name="artifact-name" value="metrics-core"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
-        <antcall target="download-via-maven">
-            <param name="target" value="lib"/>
-            <param name="project-path" value="org/scala-lang"/>
-            <param name="artifact-version" value="2.11.0"/>
-            <param name="artifact-name" value="scala-library"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
-        <antcall target="download-via-maven">
-            <param name="target" value="lib"/>
-            <param name="project-path" value="net/sf/jopt-simple"/>
-            <param name="artifact-version" value="3.2"/>
-            <param name="artifact-name" value="jopt-simple"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
-        <antcall target="download-via-maven">
-            <param name="target" value="lib"/>
-            <param name="project-path" value="org/scala-lang/modules"/>
-            <param name="artifact-version" value="1.0.4"/>
-            <param name="artifact-name" value="scala-xml_2.11"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
-        <antcall target="download-via-maven">
-            <param name="target" value="lib"/>
-            <param name="project-path" value="org/scala-lang/modules"/>
-            <param name="artifact-version" value="1.0.4"/>
-            <param name="artifact-name" value="scala-parser-combinators_2.11"/>
+            <param name="project-path" value="org/xerial/snappy"/>
+            <param name="artifact-version" value="1.1.2"/>
+            <param name="artifact-name" value="snappy-java"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>
-
+    
    <target name="download-dropbox-client">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven">

Modified: manifoldcf/branches/CONNECTORS-1162/connectors/kafka/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1162/connectors/kafka/build.xml?rev=1708555&r1=1708554&r2=1708555&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1162/connectors/kafka/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1162/connectors/kafka/build.xml Wed Oct 14 07:48:57 2015
@@ -16,9 +16,6 @@
 -->
 
 <project name="kafka" default="all">
-	<presetdef name="javac">
-    <javac includeantruntime="false" />
-  </presetdef>
 
     <property environment="env"/>
     <condition property="mcf-dist" value="${env.MCFDISTPATH}">
@@ -33,6 +30,89 @@
 
     <import file="${mcf-dist}/connector-build.xml"/>
 
+    <path id="connector-classpath">
+        <path refid="mcf-connector-build.connector-classpath"/>
+        <fileset dir="../../lib">
+            <include name="kafka-clients*.jar"/>
+            <include name="lz4*.jar"/>
+            <include name="snappy-java*.jar"/>
+        </fileset>
+    </path>
+
+    <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="../../lib">
+                <include name="kafka-clients*.jar"/>
+                <include name="lz4*.jar"/>
+                <include name="snappy-java*.jar"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <!-- test deps
+                <include name="commons-lang3*.jar"/>
+            <include name="metrics-core*.jar"/>
+            <include name="jopt-simple*.jar"/>
+            <include name="scala-library*.jar"/>
+            <include name="kafka_2.11*.jar"/>
+            <include name="scala-xml_2.11*.jar"/>
+            <include name="scala-parser-combinators_2.11*.jar"/>
+    -->
+    <target name="download-kafka">
+        <mkdir dir="lib"/>
+        <antcall target="download-via-maven">
+            <param name="target" value="lib"/>
+            <param name="project-path" value="org/apache/kafka"/>
+            <param name="artifact-version" value="0.8.2.1"/>
+            <param name="artifact-name" value="kafka_2.11"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven">
+            <param name="target" value="lib"/>
+            <param name="project-path" value="org/apache/commons"/>
+            <param name="artifact-version" value="3.4"/>
+            <param name="artifact-name" value="commons-lang3"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven">
+            <param name="target" value="lib"/>
+            <param name="project-path" value="com/yammer/metrics"/>
+            <param name="artifact-version" value="2.2.0"/>
+            <param name="artifact-name" value="metrics-core"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven">
+            <param name="target" value="lib"/>
+            <param name="project-path" value="org/scala-lang"/>
+            <param name="artifact-version" value="2.11.0"/>
+            <param name="artifact-name" value="scala-library"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven">
+            <param name="target" value="lib"/>
+            <param name="project-path" value="net/sf/jopt-simple"/>
+            <param name="artifact-version" value="3.2"/>
+            <param name="artifact-name" value="jopt-simple"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven">
+            <param name="target" value="lib"/>
+            <param name="project-path" value="org/scala-lang/modules"/>
+            <param name="artifact-version" value="1.0.4"/>
+            <param name="artifact-name" value="scala-xml_2.11"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven">
+            <param name="target" value="lib"/>
+            <param name="project-path" value="org/scala-lang/modules"/>
+            <param name="artifact-version" value="1.0.4"/>
+            <param name="artifact-name" value="scala-parser-combinators_2.11"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
+
+
     <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
         <antcall target="general-add-output-connector">
             <param name="connector-label" value="Kafka"/>



Mime
View raw message