mirror of https://github.com/apache/lucene.git
SOLR-4916: Move MiniDfsCluster test dependencies from solr test-framework to solr-core; download solr-core test dependencies to solr/core/test-lib/ instead of solr/core/lib/; download DIH test dependencies to solr/contrib/dataimporthandler/test-lib instead of [...]/lib/
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1502105 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe
parent
90d792dd1d
commit
b2bc345a60
|
|
@ -205,7 +205,7 @@
|
|||
<!-- TODO: find a better way to exclude duplicate JAR files & fix the servlet-api mess! -->
|
||||
<pathconvert property="eclipse.fileset.libs" pathsep="|" dirsep="/">
|
||||
<fileset dir="${basedir}/lucene" includes="**/lib/*.jar" excludes="**/*servlet-api*.jar, analysis/uima/**, tools/**, build/**"/>
|
||||
<fileset dir="${basedir}/solr" includes="**/lib/*.jar" excludes="core/lib/*servlet-api*.jar, contrib/analysis-extras/**, test-framework/lib/junit*, test-framework/lib/ant*, test-framework/lib/randomizedtesting*, build/**, dist/**, package/**" />
|
||||
<fileset dir="${basedir}/solr" includes="**/test-lib/*.jar,**/lib/*.jar" excludes="core/test-lib/*servlet-api*.jar, contrib/analysis-extras/**, test-framework/lib/junit*, test-framework/lib/ant*, test-framework/lib/randomizedtesting*, build/**, dist/**, package/**" />
|
||||
<map from="${basedir}/" to=""/>
|
||||
</pathconvert>
|
||||
<xslt in="${ant.file}" out=".classpath" style="dev-tools/eclipse/dot.classpath.xsl" force="true">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
<component name="libraryTable">
|
||||
<library name="Solr DIH test library">
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/test-lib" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/test-lib" recursive="false" />
|
||||
</library>
|
||||
</component>
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
<component name="libraryTable">
|
||||
<library name="Solr core test library">
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/solr/core/test-lib" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
<jarDirectory url="file://$PROJECT_DIR$/solr/core/test-lib" recursive="false" />
|
||||
</library>
|
||||
</component>
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="HSQLDB" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Derby" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Solr DIH test library" level="project" />
|
||||
<orderEntry type="library" name="Solr core library" level="project" />
|
||||
<orderEntry type="library" name="Solrj library" level="project" />
|
||||
<orderEntry type="library" name="Solr DIH library" level="project" />
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Solr core library" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Solr core test library" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Solrj library" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Solr example library" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Solr test framework library" level="project" />
|
||||
|
|
|
|||
|
|
@ -56,6 +56,148 @@
|
|||
<artifactId>easymock</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-common</artifactId>
|
||||
<classifier>tests</classifier>
|
||||
<scope>test</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-math</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>xmlenc</groupId>
|
||||
<artifactId>xmlenc</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-httpclient</groupId>
|
||||
<artifactId>commons-httpclient</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-net</groupId>
|
||||
<artifactId>commons-net</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.sun.jersey</groupId>
|
||||
<artifactId>jersey-json</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.sun.jersey</groupId>
|
||||
<artifactId>jersey-server</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>tomcat</groupId>
|
||||
<artifactId>jasper-compiler</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>tomcat</groupId>
|
||||
<artifactId>jasper-runtime</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-el</groupId>
|
||||
<artifactId>commons-el</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>net.java.dev.jets3t</groupId>
|
||||
<artifactId>jets3t</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-digester</groupId>
|
||||
<artifactId>commons-digester</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.apache.avro</groupId>
|
||||
<artifactId>avro</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>net.sf.kosmosfs</groupId>
|
||||
<artifactId>kfs</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.jcraft</groupId>
|
||||
<artifactId>jsch</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-beanutils</groupId>
|
||||
<artifactId>commons-beanutils-core</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-hdfs</artifactId>
|
||||
<classifier>tests</classifier>
|
||||
<scope>test</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.sun.jersey</groupId>
|
||||
<artifactId>jersey-server</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>tomcat</groupId>
|
||||
<artifactId>jasper-runtime</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>xmlenc</groupId>
|
||||
<artifactId>xmlenc</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-daemon</groupId>
|
||||
<artifactId>commons-daemon</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- Jetty 6 required for Hadoop DfsMiniCluster -->
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jetty</artifactId>
|
||||
<scope>test</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jetty-util</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<sourceDirectory/>
|
||||
|
|
|
|||
|
|
@ -64,128 +64,6 @@
|
|||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-common</artifactId>
|
||||
<classifier>tests</classifier>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-math</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>xmlenc</groupId>
|
||||
<artifactId>xmlenc</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-httpclient</groupId>
|
||||
<artifactId>commons-httpclient</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-net</groupId>
|
||||
<artifactId>commons-net</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.sun.jersey</groupId>
|
||||
<artifactId>jersey-json</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.sun.jersey</groupId>
|
||||
<artifactId>jersey-server</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>tomcat</groupId>
|
||||
<artifactId>jasper-compiler</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>tomcat</groupId>
|
||||
<artifactId>jasper-runtime</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-el</groupId>
|
||||
<artifactId>commons-el</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>net.java.dev.jets3t</groupId>
|
||||
<artifactId>jets3t</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-digester</groupId>
|
||||
<artifactId>commons-digester</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.apache.avro</groupId>
|
||||
<artifactId>avro</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>net.sf.kosmosfs</groupId>
|
||||
<artifactId>kfs</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.jcraft</groupId>
|
||||
<artifactId>jsch</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-beanutils</groupId>
|
||||
<artifactId>commons-beanutils-core</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-hdfs</artifactId>
|
||||
<classifier>tests</classifier>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.sun.jersey</groupId>
|
||||
<artifactId>jersey-server</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>tomcat</groupId>
|
||||
<artifactId>jasper-runtime</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>xmlenc</groupId>
|
||||
<artifactId>xmlenc</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>commons-daemon</groupId>
|
||||
<artifactId>commons-daemon</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-servlet</artifactId>
|
||||
|
|
@ -195,22 +73,6 @@
|
|||
<artifactId>jetty-util</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Jetty 6 required for Hadoop DfsMiniCluster -->
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jetty</artifactId>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>jetty-util</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- If your tests don't use BaseDistributedSearchTestCase or SolrJettyTestBase,
|
||||
you can exclude the two Jetty dependencies below. -->
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -356,7 +356,7 @@
|
|||
<target name="resolve" depends="ivy-availability-check,ivy-configure">
|
||||
<!-- todo, make this a property or something.
|
||||
only special cases need bundles -->
|
||||
<ivy:retrieve type="jar,bundle,tests" log="download-only"
|
||||
<ivy:retrieve type="jar,bundle,tests"
|
||||
conf="${ivy.default.configuration}" sync="${ivy.sync}"/>
|
||||
</target>
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
limitations under the License.
|
||||
-->
|
||||
|
||||
<project name="solr-dataimporthandler" default="default">
|
||||
<project name="solr-dataimporthandler" default="default" xmlns:ivy="antlib:org.apache.ivy.ant">
|
||||
|
||||
<description>
|
||||
Data Import Handler
|
||||
|
|
@ -26,6 +26,20 @@
|
|||
<!-- the tests have some parallel problems: writability to single copy of dataimport.properties -->
|
||||
<property name="tests.jvms.override" value="1"/>
|
||||
|
||||
<property name="test.lib.dir" location="test-lib"/>
|
||||
|
||||
<import file="../contrib-build.xml"/>
|
||||
|
||||
<path id="test.classpath">
|
||||
<path refid="solr.test.base.classpath"/>
|
||||
<fileset dir="${test.lib.dir}" includes="*.jar"/>
|
||||
</path>
|
||||
|
||||
<target name="resolve" depends="ivy-availability-check,ivy-fail,ivy-configure">
|
||||
<sequential>
|
||||
<ivy:retrieve conf="compile" type="jar,bundle" sync="${ivy.sync}" log="download-only"/>
|
||||
<ivy:retrieve conf="test" type="jar,bundle,test" sync="${ivy.sync}" log="download-only"
|
||||
pattern="${test.lib.dir}/[artifact]-[revision](-[classifier]).[ext]"/>
|
||||
</sequential>
|
||||
</target>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -18,9 +18,16 @@
|
|||
-->
|
||||
<ivy-module version="2.0">
|
||||
<info organisation="org.apache.solr" module="dataimporthandler"/>
|
||||
<configurations>
|
||||
<conf name="compile" transitive="false"/>
|
||||
<conf name="test" transitive="false"/>
|
||||
</configurations>
|
||||
<dependencies>
|
||||
<dependency org="javax.activation" name="activation" rev="1.1" transitive="false"/>
|
||||
<dependency org="javax.mail" name="mail" rev="1.4.1" transitive="false"/>
|
||||
<dependency org="javax.activation" name="activation" rev="1.1" conf="compile->*"/>
|
||||
<dependency org="javax.mail" name="mail" rev="1.4.1" conf="compile->*"/>
|
||||
|
||||
<dependency org="org.easymock" name="easymock" rev="3.0" conf="test->*"/>
|
||||
|
||||
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
|
||||
</dependencies>
|
||||
</ivy-module>
|
||||
|
|
|
|||
|
|
@ -15,16 +15,23 @@
|
|||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<project name="solr-core" default="default">
|
||||
<project name="solr-core" default="default" xmlns:ivy="antlib:org.apache.ivy.ant">
|
||||
<description>Solr Core</description>
|
||||
|
||||
<!-- html file for testing -->
|
||||
<property name="rat.excludes" value="**/htmlStripReaderTest.html,**/*.iml"/>
|
||||
|
||||
<property name="test.lib.dir" location="test-lib"/>
|
||||
|
||||
<import file="../common-build.xml"/>
|
||||
|
||||
<target name="compile-core" depends="compile-solrj,common-solr.compile-core"/>
|
||||
|
||||
<path id="test.classpath">
|
||||
<path refid="solr.test.base.classpath"/>
|
||||
<fileset dir="${test.lib.dir}" includes="*.jar"/>
|
||||
</path>
|
||||
|
||||
<!-- specialized to ONLY depend on solrj -->
|
||||
<target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solrj">
|
||||
<sequential>
|
||||
|
|
@ -43,8 +50,13 @@
|
|||
|
||||
<target name="dist-maven" depends="dist-maven-src-java"/>
|
||||
|
||||
|
||||
|
||||
<target name="resolve" depends="ivy-availability-check,ivy-fail,ivy-configure">
|
||||
<sequential>
|
||||
<ivy:retrieve conf="compile,compile.hadoop" type="jar,bundle" sync="${ivy.sync}" log="download-only"/>
|
||||
<ivy:retrieve conf="test,test.DfsMiniCluster" type="jar,bundle,test" sync="${ivy.sync}" log="download-only"
|
||||
pattern="${test.lib.dir}/[artifact]-[revision](-[classifier]).[ext]"/>
|
||||
</sequential>
|
||||
</target>
|
||||
|
||||
<target name="javacc" depends="javacc-QueryParser"/>
|
||||
<target name="javacc-QueryParser" depends="resolve-javacc">
|
||||
|
|
@ -67,7 +79,7 @@
|
|||
<target name="resolve-javacc" xmlns:ivy="antlib:org.apache.ivy.ant">
|
||||
<!-- setup a "fake" JavaCC distribution folder in ${build.dir} to make JavaCC ANT task happy: -->
|
||||
<ivy:retrieve organisation="net.java.dev.javacc" module="javacc" revision="5.0"
|
||||
inline="true" conf="default" transitive="false" type="jar" sync="true"
|
||||
inline="true" transitive="false" type="jar" sync="true"
|
||||
pattern="${build.dir}/javacc/bin/lib/[artifact].[ext]"/>
|
||||
</target>
|
||||
|
||||
|
|
|
|||
|
|
@ -19,31 +19,54 @@
|
|||
<!DOCTYPE ivy-module [
|
||||
<!ENTITY hadoop.version "2.0.5-alpha">
|
||||
]>
|
||||
<ivy-module version="2.0">
|
||||
<ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
|
||||
<info organisation="org.apache.solr" module="core"/>
|
||||
|
||||
<dependencies>
|
||||
<dependency org="commons-codec" name="commons-codec" rev="1.7" transitive="false"/>
|
||||
<dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.1" transitive="false"/>
|
||||
<dependency org="commons-cli" name="commons-cli" rev="1.2" transitive="false"/>
|
||||
<dependency org="commons-lang" name="commons-lang" rev="2.6" transitive="false"/>
|
||||
<dependency org="com.google.guava" name="guava" rev="14.0.1" transitive="false"/>
|
||||
<dependency org="org.easymock" name="easymock" rev="3.0" transitive="false"/>
|
||||
<dependency org="cglib" name="cglib-nodep" rev="2.2" transitive="false"/>
|
||||
<dependency org="org.objenesis" name="objenesis" rev="1.2" transitive="false"/>
|
||||
<dependency org="com.spatial4j" name="spatial4j" rev="0.3" transitive="false"/>
|
||||
<dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" transitive="false"/>
|
||||
<dependency org="org.restlet.jee" name="org.restlet" rev="2.1.1" transitive="false"/>
|
||||
<dependency org="org.restlet.jee" name="org.restlet.ext.servlet" rev="2.1.1" transitive="false"/>
|
||||
<dependency org="joda-time" name="joda-time" rev="2.2" transitive="false"/>
|
||||
<configurations>
|
||||
<!-- artifacts in the "compile" and "compile.hadoop" configurations will go into solr/core/lib/ -->
|
||||
<conf name="compile" transitive="false"/>
|
||||
<conf name="test" transitive="false"/>
|
||||
<conf name="compile.hadoop" transitive="false"/>
|
||||
<!-- artifacts in the "test" and "test.DfsMiniCluster" configuration will go into solr/core/test-lib/ -->
|
||||
<conf name="test.DfsMiniCluster" transitive="false"/>
|
||||
</configurations>
|
||||
|
||||
<dependencies>
|
||||
<dependency org="commons-codec" name="commons-codec" rev="1.7" conf="compile->*"/>
|
||||
<dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.1" conf="compile->*"/>
|
||||
<dependency org="commons-cli" name="commons-cli" rev="1.2" conf="compile->*"/>
|
||||
<dependency org="commons-lang" name="commons-lang" rev="2.6" conf="compile->*"/>
|
||||
<dependency org="com.google.guava" name="guava" rev="14.0.1" conf="compile->*"/>
|
||||
<dependency org="com.spatial4j" name="spatial4j" rev="0.3" conf="compile->*"/>
|
||||
<dependency org="org.restlet.jee" name="org.restlet" rev="2.1.1" conf="compile->*"/>
|
||||
<dependency org="org.restlet.jee" name="org.restlet.ext.servlet" rev="2.1.1" conf="compile->*"/>
|
||||
<dependency org="joda-time" name="joda-time" rev="2.2" conf="compile->*"/>
|
||||
|
||||
<dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" conf="test->*"/>
|
||||
<dependency org="org.easymock" name="easymock" rev="3.0" conf="test->*"/>
|
||||
<dependency org="cglib" name="cglib-nodep" rev="2.2" conf="test->*"/>
|
||||
<dependency org="org.objenesis" name="objenesis" rev="1.2" conf="test->*"/>
|
||||
|
||||
<dependency org="org.apache.hadoop" name="hadoop-common" rev="&hadoop.version;" conf="compile.hadoop->*"/>
|
||||
<dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="&hadoop.version;" conf="compile.hadoop->*"/>
|
||||
<dependency org="org.apache.hadoop" name="hadoop-annotations" rev="&hadoop.version;" conf="compile.hadoop->*"/>
|
||||
<dependency org="org.apache.hadoop" name="hadoop-auth" rev="&hadoop.version;" conf="compile.hadoop->*"/>
|
||||
<dependency org="commons-configuration" name="commons-configuration" rev="1.6" conf="compile.hadoop->*"/>
|
||||
<dependency org="com.google.protobuf" name="protobuf-java" rev="2.4.0a" conf="compile.hadoop->*"/>
|
||||
<dependency org="com.googlecode.concurrentlinkedhashmap" name="concurrentlinkedhashmap-lru" rev="1.2" conf="compile.hadoop->*"/>
|
||||
|
||||
<!-- Hadoop DfsMiniCluster Dependencies-->
|
||||
<dependency org="org.apache.hadoop" name="hadoop-common" rev="&hadoop.version;" conf="test.DfsMiniCluster->*">
|
||||
<artifact name="hadoop-common" type="test" ext="jar" maven:classifier="tests" />
|
||||
</dependency>
|
||||
<dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="&hadoop.version;" conf="test.DfsMiniCluster->*">
|
||||
<artifact name="hadoop-hdfs" type="test" ext="jar" maven:classifier="tests" />
|
||||
</dependency>
|
||||
<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26" conf="test.DfsMiniCluster->*"/>
|
||||
<dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" conf="test.DfsMiniCluster->*"/>
|
||||
<dependency org="com.sun.jersey" name="jersey-core" rev="1.16" conf="test.DfsMiniCluster->*"/>
|
||||
<dependency org="commons-collections" name="commons-collections" rev="3.2.1" conf="test.DfsMiniCluster->*"/>
|
||||
|
||||
<dependency org="org.apache.hadoop" name="hadoop-common" rev="&hadoop.version;" transitive="false"/>
|
||||
<dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="&hadoop.version;" transitive="false"/>
|
||||
<dependency org="org.apache.hadoop" name="hadoop-annotations" rev="&hadoop.version;" transitive="false"/>
|
||||
<dependency org="org.apache.hadoop" name="hadoop-auth" rev="&hadoop.version;" transitive="false"/>
|
||||
<dependency org="commons-configuration" name="commons-configuration" rev="1.6" transitive="false"/>
|
||||
<dependency org="com.google.protobuf" name="protobuf-java" rev="2.4.0a" transitive="false"/>
|
||||
<dependency org="com.googlecode.concurrentlinkedhashmap" name="concurrentlinkedhashmap-lru" rev="1.2" transitive="false"/>
|
||||
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
|
||||
</dependencies>
|
||||
</ivy-module>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<!DOCTYPE ivy-module [
|
||||
<!ENTITY hadoop.version "2.0.5-alpha">
|
||||
]>
|
||||
<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
|
||||
<ivy-module version="2.0">
|
||||
<info organisation="org.apache.solr" module="solr-test-framework"/>
|
||||
|
||||
<configurations>
|
||||
|
|
@ -40,18 +40,6 @@
|
|||
<dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.10" transitive="false" conf="default->*;junit4-stdalone->*" />
|
||||
<dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.10" transitive="false" conf="default->*;junit4-stdalone->*" />
|
||||
|
||||
<!-- Hadoop DfsMiniCluster Dependencies-->
|
||||
<dependency org="org.apache.hadoop" name="hadoop-common" transitive="false" rev="&hadoop.version;" conf="default->*;junit4-stdalone->*">
|
||||
<artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests" />
|
||||
</dependency>
|
||||
<dependency org="org.apache.hadoop" name="hadoop-hdfs" transitive="false" rev="&hadoop.version;" conf="default->*;junit4-stdalone->*">
|
||||
<artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests" />
|
||||
</dependency>
|
||||
<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26" transitive="false"/>
|
||||
<dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" transitive="false"/>
|
||||
<dependency org="com.sun.jersey" name="jersey-core" rev="1.16" transitive="false"/>
|
||||
<dependency org="commons-collections" name="commons-collections" rev="3.2.1" transitive="false"/>
|
||||
|
||||
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
|
||||
</dependencies>
|
||||
</ivy-module>
|
||||
|
|
|
|||
|
|
@ -50,12 +50,7 @@
|
|||
<war destfile="${dist}/solr-${version}${solr.war.suffix}.war"
|
||||
webxml="web/WEB-INF/web.xml"
|
||||
manifest="${manifest.file}">
|
||||
<lib dir="${common-solr.dir}/core/lib" excludes="${exclude.from.war},${common.classpath.excludes}">
|
||||
<exclude name="*servlet-api*.jar" />
|
||||
<exclude name="easymock-*.jar" />
|
||||
<exclude name="cglib-nodep-*.jar" />
|
||||
<exclude name="objenesis-*.jar" />
|
||||
</lib>
|
||||
<lib dir="${common-solr.dir}/core/lib" excludes="${exclude.from.war},${common.classpath.excludes}"/>
|
||||
<lib dir="${common-solr.dir}/solrj/lib" excludes="${exclude.from.war},${common.classpath.excludes}"/>
|
||||
<lib dir="${lucene-libs}" excludes="${exclude.from.war},${common.classpath.excludes}" />
|
||||
<lib dir="${dist}" excludes="${exclude.from.war},${common.classpath.excludes}">
|
||||
|
|
|
|||
Loading…
Reference in New Issue