You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/01/08 22:39:16 UTC
svn commit: r1556646 - in /manifoldcf/branches/CONNECTORS-840: build.xml
connectors/connector-build.xml
Author: kwright
Date: Wed Jan 8 21:39:15 2014
New Revision: 1556646
URL: http://svn.apache.org/r1556646
Log:
Add mockito-all dependency; still doesn't work though
Modified:
manifoldcf/branches/CONNECTORS-840/build.xml
manifoldcf/branches/CONNECTORS-840/connectors/connector-build.xml
Modified: manifoldcf/branches/CONNECTORS-840/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-840/build.xml?rev=1556646&r1=1556645&r2=1556646&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-840/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-840/build.xml Wed Jan 8 21:39:15 2014
@@ -3900,7 +3900,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="download-powerMockModule">
+ <target name="download-mock">
<mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/powermock"/>
@@ -3908,16 +3908,24 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="powermock-module-junit4"/>
<param name="artifact-type" value="jar"/>
</antcall>
- </target>
-
- <target name="download-powerMockMockito">
- <mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/powermock"/>
<param name="artifact-version" value="1.5.2"/>
<param name="artifact-name" value="powermock-api-mockito"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/powermock"/>
+ <param name="artifact-version" value="1.5.2"/>
+ <param name="artifact-name" value="powermock-api-support"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/mockito"/>
+ <param name="artifact-version" value="1.9.5"/>
+ <param name="artifact-name" value="mockito-all"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-junit">
@@ -4268,7 +4276,7 @@ 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-powerMockModule,download-powerMockMockito,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-p
oi,download-chemistry,download-ecj,download-hadoop">
+ <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-mock,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,do
wnload-hadoop">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/branches/CONNECTORS-840/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-840/connectors/connector-build.xml?rev=1556646&r1=1556645&r2=1556646&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-840/connectors/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-840/connectors/connector-build.xml Wed Jan 8 21:39:15 2014
@@ -49,6 +49,7 @@
<include name="jsp-api*.jar"/>
<include name="junit*.jar"/>
<include name="powermock*.jar"/>
+ <include name="mockito-all*.jar"/>
<include name="log4j*.jar"/>
<include name="serializer*.jar"/>
<include name="servlet-api*.jar"/>