Author: kwright
Date: Mon Apr 7 17:27:12 2014
New Revision: 1585528
URL: http://svn.apache.org/r1585528
Log:
Pull up fixes from CONNECTORS-916 branch
Added:
manifoldcf/branches/CONNECTORS-916-2/connectors/amazoncloudsearch/
- copied from r1585526,
manifoldcf/branches/CONNECTORS-916/connectors/amazoncloudsearch/
Modified:
manifoldcf/branches/CONNECTORS-916-2/ (props changed)
manifoldcf/branches/CONNECTORS-916-2/build.xml
manifoldcf/branches/CONNECTORS-916-2/connectors/pom.xml
Propchange: manifoldcf/branches/CONNECTORS-916-2/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-916:r1585365-1585526
Modified: manifoldcf/branches/CONNECTORS-916-2/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-916-2/build.xml?rev=1585528&r1=1585527&r2=1585528&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-916-2/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-916-2/build.xml Mon Apr 7 17:27:12 2014
@@ -1571,7 +1571,45 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps"
depends="download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,
download-protobuf">
+ <target name="download-tika">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/tika"/>
+ <param name="artifact-version" value="1.5"/>
+ <param name="artifact-name" value="tika-core"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/tika"/>
+ <param name="artifact-version" value="1.5"/>
+ <param name="artifact-name" value="tika-parsers"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/ccil/cowan/tagsoup"/>
+ <param name="artifact-version" value="1.2.1"/>
+ <param name="artifact-name" value="tagsoup"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
+ <target name="download-jackson">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="com/fasterxml/jackson/core"/>
+ <param name="artifact-version" value="2.1.3"/>
+ <param name="artifact-name" value="jackson-databind"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="com/fasterxml/jackson/core"/>
+ <param name="artifact-version" value="2.1.2"/>
+ <param name="artifact-name" value="jackson-annotations"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
+ <target name="make-core-deps"
depends="download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,
download-protobuf,download-tika,download-jackson">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/branches/CONNECTORS-916-2/connectors/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-916-2/connectors/pom.xml?rev=1585528&r1=1585527&r2=1585528&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-916-2/connectors/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-916-2/connectors/pom.xml Mon Apr 7 17:27:12
2014
@@ -57,6 +57,7 @@
<module>generic</module>
<module>regexpmapper</module>
<module>email</module>
+ <module>amazoncloudsearch</module>
</modules>
</project>
