Author: kwright
Date: Tue Jan 14 00:52:32 2014
New Revision: 1557895
URL: http://svn.apache.org/r1557895
Log:
Pull up mock-related changes only from the CONNECTORS-840 branch. This will
not compile right now because the tests need the modified version of the
connector.
Added:
manifoldcf/branches/CONNECTORS-856/connectors/solr/connector/src/test/java/org/
- copied from r1557893,
manifoldcf/branches/CONNECTORS-840/connectors/solr/connector/src/test/java/org/
Modified:
manifoldcf/branches/CONNECTORS-856/ (props changed)
manifoldcf/branches/CONNECTORS-856/build.xml
manifoldcf/branches/CONNECTORS-856/connectors/connector-build.xml
manifoldcf/branches/CONNECTORS-856/connectors/solr/pom.xml
manifoldcf/branches/CONNECTORS-856/lib-license/LICENSE.txt
manifoldcf/branches/CONNECTORS-856/pom.xml
Propchange: manifoldcf/branches/CONNECTORS-856/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-840:r1556412-1557893
Modified: manifoldcf/branches/CONNECTORS-856/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856/build.xml?rev=1557895&r1=1557894&r2=1557895&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-856/build.xml Tue Jan 14 00:52:32 2014
@@ -3899,6 +3899,72 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-type" value="jar"/>
</antcall>
</target>
+
+ <target name="download-mock">
+ <mkdir dir="lib"/>
+ <property name="powermock-version" value="1.5.2"/>
+ <property name="powermock-package" value="org/powermock"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="${powermock-package}"/>
+ <param name="artifact-version" value="${powermock-version}"/>
+ <param name="artifact-name" value="powermock-module-junit4"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="${powermock-package}"/>
+ <param name="artifact-version" value="${powermock-version}"/>
+ <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="${powermock-package}"/>
+ <param name="artifact-version" value="${powermock-version}"/>
+ <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="${powermock-package}"/>
+ <param name="artifact-version" value="${powermock-version}"/>
+ <param name="artifact-name" value="powermock-core"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="${powermock-package}"/>
+ <param name="artifact-version" value="${powermock-version}"/>
+ <param name="artifact-name" value="powermock-reflect"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="${powermock-package}"/>
+ <param name="artifact-version" value="${powermock-version}"/>
+ <param name="artifact-name"
value="powermock-module-junit4-common"/>
+ <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>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/noggit"/>
+ <param name="artifact-version" value="0.5"/>
+ <param name="artifact-name" value="noggit"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/javassist"/>
+ <param name="artifact-version" value="3.18.0-GA"/>
+ <param name="artifact-name" value="javassist"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/objenesis"/>
+ <param name="artifact-version" value="1.2"/>
+ <param name="artifact-name" value="objenesis"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
<target name="download-junit">
<mkdir dir="lib"/>
@@ -3909,7 +3975,7 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-type" value="jar"/>
</antcall>
</target>
-
+
<target name="download-log4j">
<mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
@@ -4248,7 +4314,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-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"
>
+ <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-856/connectors/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856/connectors/connector-build.xml?rev=1557895&r1=1557894&r2=1557895&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856/connectors/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-856/connectors/connector-build.xml Tue Jan
14 00:52:32 2014
@@ -48,6 +48,15 @@
<include name="jsp-2.1*.jar"/>
<include name="jsp-api*.jar"/>
<include name="junit*.jar"/>
+ <include name="powermock-module-junit4*.jar"/>
+ <include name="powermock-core*.jar"/>
+ <include name="powermock-reflect*.jar"/>
+ <include name="powermock-api-support*.jar"/>
+ <include name="powermock-api-mockito*.jar"/>
+ <include name="mockito-all*.jar"/>
+ <include name="noggit*.jar"/>
+ <include name="javassist*.jar"/>
+ <include name="objenesis*.jar"/>
<include name="log4j*.jar"/>
<include name="serializer*.jar"/>
<include name="servlet-api*.jar"/>
Modified: manifoldcf/branches/CONNECTORS-856/connectors/solr/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856/connectors/solr/pom.xml?rev=1557895&r1=1557894&r2=1557895&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856/connectors/solr/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-856/connectors/solr/pom.xml Tue Jan 14
00:52:32 2014
@@ -101,5 +101,25 @@
<artifactId>httpclient</artifactId>
<version>${httpcomponent.httpclient.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>${powerMock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powerMock.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: manifoldcf/branches/CONNECTORS-856/lib-license/LICENSE.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856/lib-license/LICENSE.txt?rev=1557895&r1=1557894&r2=1557895&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856/lib-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-856/lib-license/LICENSE.txt Tue Jan 14
00:52:32 2014
@@ -323,10 +323,29 @@ License: Apache 2 (http://www.apache.org
This product includes a guava.jar.
License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+This product includes a mockito-all.jar.
+License: MIT (http://code.google.com/p/mockito/wiki/License)
+
This product may include pdf files that embed IPA-licensed fonts.
License: IPA Font License Agreement v1.0
(http://ossipedia.ipa.go.jp/ipafont/index.html#LicenseEng)
==========================================================================
+The following license applies to mockito-all.jar:
+--------------------------------------------------------------------------
+
+
+The MIT License
+
+Copyright (c) 2007 Mockito contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+
+==========================================================================
The following license applies to json.jar, which is generated from the json
sources from http://www.json.org/java/index.html
--------------------------------------------------------------------------
Modified: manifoldcf/branches/CONNECTORS-856/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-856/pom.xml?rev=1557895&r1=1557894&r2=1557895&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-856/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-856/pom.xml Tue Jan 14 00:52:32 2014
@@ -38,6 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- dependency versions -->
<junit.version>4.8.2</junit.version>
+ <powerMock.version>1.5.2</powerMock.version>
<postgresql.version>9.1-901.jdbc4</postgresql.version>
<mysql.version>5.1.18</mysql.version>
<hsqldb.version>2.3.1</hsqldb.version>
