lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1589953 - in /lucene/dev/trunk: dev-tools/idea/.idea/libraries/ dev-tools/idea/solr/contrib/analysis-extras/ dev-tools/idea/solr/contrib/clustering/ dev-tools/idea/solr/contrib/dataimporthandler-extras/ dev-tools/idea/solr/contrib/extracti...
Date Fri, 25 Apr 2014 08:55:06 GMT
Author: sarowe
Date: Fri Apr 25 08:55:05 2014
New Revision: 1589953

URL: http://svn.apache.org/r1589953
Log:
SOLR-6006: fix Solr contrib test dependencies by adding jcl-over-slf4j and retrieving it into each contrib's test-lib/ directory

Added:
    lucene/dev/trunk/solr/contrib/analysis-extras/test-lib/   (with props)
    lucene/dev/trunk/solr/contrib/clustering/test-lib/   (with props)
    lucene/dev/trunk/solr/contrib/dataimporthandler-extras/test-lib/   (with props)
    lucene/dev/trunk/solr/contrib/extraction/test-lib/   (with props)
    lucene/dev/trunk/solr/contrib/langid/test-lib/   (with props)
    lucene/dev/trunk/solr/contrib/map-reduce/test-lib/   (with props)
    lucene/dev/trunk/solr/contrib/morphlines-cell/test-lib/   (with props)
    lucene/dev/trunk/solr/contrib/uima/test-lib/   (with props)
    lucene/dev/trunk/solr/contrib/velocity/test-lib/   (with props)
Removed:
    lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solrj_test_library.xml
Modified:
    lucene/dev/trunk/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
    lucene/dev/trunk/dev-tools/idea/solr/contrib/clustering/clustering.iml
    lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
    lucene/dev/trunk/dev-tools/idea/solr/contrib/extraction/extraction.iml
    lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml
    lucene/dev/trunk/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml
    lucene/dev/trunk/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml
    lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml
    lucene/dev/trunk/dev-tools/idea/solr/contrib/velocity/velocity.iml
    lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/contrib/analysis-extras/build.xml
    lucene/dev/trunk/solr/contrib/analysis-extras/ivy.xml
    lucene/dev/trunk/solr/contrib/clustering/build.xml
    lucene/dev/trunk/solr/contrib/clustering/ivy.xml
    lucene/dev/trunk/solr/contrib/contrib-build.xml
    lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml
    lucene/dev/trunk/solr/contrib/dataimporthandler-extras/ivy.xml
    lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
    lucene/dev/trunk/solr/contrib/dataimporthandler/ivy.xml
    lucene/dev/trunk/solr/contrib/extraction/build.xml
    lucene/dev/trunk/solr/contrib/extraction/ivy.xml
    lucene/dev/trunk/solr/contrib/langid/build.xml
    lucene/dev/trunk/solr/contrib/langid/ivy.xml
    lucene/dev/trunk/solr/contrib/map-reduce/build.xml
    lucene/dev/trunk/solr/contrib/map-reduce/ivy.xml
    lucene/dev/trunk/solr/contrib/morphlines-cell/build.xml
    lucene/dev/trunk/solr/contrib/morphlines-cell/ivy.xml
    lucene/dev/trunk/solr/contrib/morphlines-core/build.xml
    lucene/dev/trunk/solr/contrib/morphlines-core/ivy.xml
    lucene/dev/trunk/solr/contrib/uima/build.xml
    lucene/dev/trunk/solr/contrib/uima/ivy.xml
    lucene/dev/trunk/solr/contrib/velocity/build.xml
    lucene/dev/trunk/solr/contrib/velocity/ivy.xml

Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml Fri Apr 25 08:55:05 2014
@@ -27,6 +27,16 @@
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
     <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/test-lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/test-lib" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="morfologik" />
     <orderEntry type="module" module-name="icu" />
     <orderEntry type="module" module-name="smartcn" />

Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/clustering/clustering.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/clustering/clustering.iml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/clustering/clustering.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/clustering/clustering.iml Fri Apr 25 08:55:05 2014
@@ -27,6 +27,16 @@
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
     <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/test-lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/test-lib" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="highlighter" />
     <orderEntry type="module" module-name="memory" />
     <orderEntry type="module" module-name="misc" />

Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml Fri Apr 25 08:55:05 2014
@@ -14,6 +14,16 @@
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
     <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/test-lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/test-lib" recursive="false" />
+      </library>
+    </orderEntry>
     <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" />

Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/extraction/extraction.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/extraction/extraction.iml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/extraction/extraction.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/extraction/extraction.iml Fri Apr 25 08:55:05 2014
@@ -14,6 +14,16 @@
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
     <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/test-lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/test-lib" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="library" name="Solr core library" level="project" />
     <orderEntry type="library" name="Solrj library" level="project" />
     <orderEntry type="library" name="Solr extraction library" level="project" />

Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/langid/langid.iml Fri Apr 25 08:55:05 2014
@@ -28,6 +28,16 @@
     </orderEntry>
     <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/test-lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/test-lib" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="solr-core" />
     <orderEntry type="module" module-name="solrj" />
   </component>

Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml Fri Apr 25 08:55:05 2014
@@ -21,6 +21,16 @@
     <orderEntry type="library" scope="TEST" name="Solr example library" level="project" />
     <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/test-lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/test-lib" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="solr-core" />
     <orderEntry type="module" module-name="solrj" />
     <orderEntry type="module" module-name="misc" />

Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml Fri Apr 25 08:55:05 2014
@@ -21,6 +21,16 @@
     <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="lucene-core" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/test-lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/test-lib" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="solr-core" />
     <orderEntry type="module" module-name="solrj" />
     <orderEntry type="module" module-name="extraction" />

Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml Fri Apr 25 08:55:05 2014
@@ -27,6 +27,16 @@
     </orderEntry>
     <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/test-lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/test-lib" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="solr-core" />
     <orderEntry type="module" module-name="solrj" />
     <orderEntry type="module" module-name="lucene-core" />

Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/velocity/velocity.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/velocity/velocity.iml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/velocity/velocity.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/velocity/velocity.iml Fri Apr 25 08:55:05 2014
@@ -17,6 +17,16 @@
     <orderEntry type="library" name="Solr velocity library" level="project" />
     <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/test-lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/test-lib" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="lucene-core" />
     <orderEntry type="module" module-name="solr-core" />
     <orderEntry type="module" module-name="solrj" />

Modified: lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/solrj/src/test/solrj-tests.iml Fri Apr 25 08:55:05 2014
@@ -12,7 +12,16 @@
     <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="Solrj library" level="project" />
-    <orderEntry type="library" scope="TEST" name="Solrj test library" level="project" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/test-lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/test-lib" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="library" scope="TEST" name="Solr example library" level="project" />
     <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Apr 25 08:55:05 2014
@@ -138,9 +138,9 @@ Other Changes
 Build
 ---------------------
 
-* SOLR-6006: Separate test and compile scope dependencies in the Solrj ivy.xml
-  file, so that the derived Maven dependencies get filled out properly in the
-  Solrj POM. (Steven Scott, Steve Rowe)
+* SOLR-6006: Separate test and compile scope dependencies in the Solrj and
+  Solr contrib ivy.xml files, so that the derived Maven dependencies get
+  filled out properly in the corresponding POMs. (Steven Scott, Steve Rowe)
 
 ==================  4.8.0 ==================
 

Modified: lucene/dev/trunk/solr/contrib/analysis-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/build.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/build.xml Fri Apr 25 08:55:05 2014
@@ -17,7 +17,7 @@
     limitations under the License.
  -->
 
-<project name="solr-analysis-extras" default="default">
+<project name="solr-analysis-extras" default="default" xmlns:ivy="antlib:org.apache.ivy.ant">
 
   <description>
     Additional analysis components
@@ -43,6 +43,10 @@
     <path refid="solr.base.classpath"/>
   </path>
 
+  <path id="test.classpath">
+    <path refid="solr.test.base.classpath"/>
+    <fileset dir="${test.lib.dir}" includes="*.jar"/>
+  </path>
 
   <!-- 
     Although the smartcn, stempel, and morfologik jars are not dependencies of

Modified: lucene/dev/trunk/solr/contrib/analysis-extras/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/ivy.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/ivy.xml Fri Apr 25 08:55:05 2014
@@ -17,17 +17,24 @@
    under the License.    
 -->
 <ivy-module version="2.0">
-    <info organisation="org.apache.solr" module="analysis-extras"/>
-    <dependencies>
-      <dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" transitive="false"/>
-      <!-- 
-        Although the 3rd party morfologik jars are not dependencies of code in 
-        the analysis-extras contrib, they must remain here in order to
-        populate the Solr distribution
-       -->
-      <dependency org="org.carrot2" name="morfologik-polish" rev="${/org.carrot2/morfologik-polish}" transitive="false"/>
-      <dependency org="org.carrot2" name="morfologik-fsa" rev="${/org.carrot2/morfologik-fsa}" transitive="false"/>
-      <dependency org="org.carrot2" name="morfologik-stemming" rev="${/org.carrot2/morfologik-stemming}" transitive="false"/>
-      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
-    </dependencies>
+  <info organisation="org.apache.solr" module="analysis-extras"/>
+  <configurations>
+    <conf name="compile" transitive="false"/>
+    <conf name="test" transitive="false"/>
+  </configurations>
+  <dependencies>
+    <dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" conf="compile->*"/>
+    <!--
+      Although the 3rd party morfologik jars are not dependencies of code in
+      the analysis-extras contrib, they must remain here in order to
+      populate the Solr distribution
+     -->
+    <dependency org="org.carrot2" name="morfologik-polish" rev="${/org.carrot2/morfologik-polish}" conf="compile->*"/>
+    <dependency org="org.carrot2" name="morfologik-fsa" rev="${/org.carrot2/morfologik-fsa}" conf="compile->*"/>
+    <dependency org="org.carrot2" name="morfologik-stemming" rev="${/org.carrot2/morfologik-stemming}" conf="compile->*"/>
+
+    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
+
+    <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+  </dependencies>
 </ivy-module>

Modified: lucene/dev/trunk/solr/contrib/clustering/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/build.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/clustering/build.xml Fri Apr 25 08:55:05 2014
@@ -17,11 +17,26 @@
     limitations under the License.
  -->
 
-<project name="solr-clustering" default="default">
+<project name="solr-clustering" default="default" xmlns:ivy="antlib:org.apache.ivy.ant">
 
   <description>
     Clustering Integraton
   </description>
 
+  <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>

Modified: lucene/dev/trunk/solr/contrib/clustering/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/ivy.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/clustering/ivy.xml Fri Apr 25 08:55:05 2014
@@ -17,27 +17,33 @@
    under the License.    
 -->
 <ivy-module version="2.0">
-    <info organisation="org.apache.solr" module="clustering"/>
-    <dependencies>
-      <dependency org="org.carrot2" name="carrot2-mini" rev="${/org.carrot2/carrot2-mini}" transitive="false"/>
+  <info organisation="org.apache.solr" module="clustering"/>
+  <configurations>
+    <conf name="compile" transitive="false"/>
+    <conf name="test" transitive="false"/>
+  </configurations>
+  <dependencies>
+    <dependency org="org.carrot2" name="carrot2-mini" rev="${/org.carrot2/carrot2-mini}" transitive="false"/>
+
+    <dependency org="com.carrotsearch" name="hppc" rev="${/com.carrotsearch/hppc}" transitive="false"/>
+    <dependency org="org.carrot2.attributes" name="attributes-binder" rev="${/org.carrot2.attributes/attributes-binder}" transitive="false"/>
+    <dependency org="org.simpleframework" name="simple-xml" rev="${/org.simpleframework/simple-xml}" transitive="false"/>
+
+    <dependency org="org.apache.mahout" name="mahout-math" rev="${/org.apache.mahout/mahout-math}" transitive="false"/>
+    <dependency org="org.apache.mahout" name="mahout-collections" rev="${/org.apache.mahout/mahout-collections}" transitive="false"/>
+
+    <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${/org.codehaus.jackson/jackson-core-asl}" transitive="false"/>
+    <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${/org.codehaus.jackson/jackson-mapper-asl}" transitive="false"/>
+
+    <!--
+    Included as part of Solr's environment.
+
+    com.google.guava:guava:jar:14.0.1:compile
+    commons-lang:commons-lang:jar:2.6:compile
+     -->
 
-      <dependency org="com.carrotsearch" name="hppc" rev="${/com.carrotsearch/hppc}" transitive="false"/>
-      <dependency org="org.carrot2.attributes" name="attributes-binder" rev="${/org.carrot2.attributes/attributes-binder}" transitive="false"/>
-      <dependency org="org.simpleframework" name="simple-xml" rev="${/org.simpleframework/simple-xml}" transitive="false"/>
+    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
 
-      <dependency org="org.apache.mahout" name="mahout-math" rev="${/org.apache.mahout/mahout-math}" transitive="false"/>
-      <dependency org="org.apache.mahout" name="mahout-collections" rev="${/org.apache.mahout/mahout-collections}" transitive="false"/>
-
-      <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${/org.codehaus.jackson/jackson-core-asl}" transitive="false"/>
-      <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${/org.codehaus.jackson/jackson-mapper-asl}" transitive="false"/>
-
-      <!--
-      Included as part of Solr's environment.
-
-      com.google.guava:guava:jar:14.0.1:compile
-      commons-lang:commons-lang:jar:2.6:compile
-      -->
-
-      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
-    </dependencies>
+    <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+  </dependencies>
 </ivy-module>

Modified: lucene/dev/trunk/solr/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/contrib-build.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/contrib-build.xml (original)
+++ lucene/dev/trunk/solr/contrib/contrib-build.xml Fri Apr 25 08:55:05 2014
@@ -17,10 +17,12 @@
     limitations under the License.
  -->
 
-<project name="solr-contrib-build">
+<project name="solr-contrib-build" xmlns:ivy="antlib:org.apache.ivy.ant">
   <dirname file="${ant.file.solr-contrib-build}" property="solr-contrib.dir"/>
   <property name="build.dir" location="${solr-contrib.dir}/../build/contrib/${ant.project.name}"/>
 
+  <property name="test.lib.dir" location="test-lib"/>
+
   <import file="../common-build.xml"/>
 
   <target name="compile-core" depends="compile-solr-core,compile-solrj,common-solr.compile-core"/>
@@ -44,4 +46,12 @@
       <fileset dir="${build.dir}" includes="lucene-libs/**"/>
     </copy>
   </target>
+
+  <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>

Modified: lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml Fri Apr 25 08:55:05 2014
@@ -63,6 +63,7 @@
     <path refid="solr.test.base.classpath"/>
     <pathelement location="${common-solr.dir}/build/contrib/solr-dataimporthandler/classes/test"/>
     <path refid="classpath"/>
+    <fileset dir="${test.lib.dir}" includes="*.jar"/>
   </path>
 
   <!-- TODO: make this nicer like lucene? -->

Modified: lucene/dev/trunk/solr/contrib/dataimporthandler-extras/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler-extras/ivy.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler-extras/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler-extras/ivy.xml Fri Apr 25 08:55:05 2014
@@ -26,5 +26,11 @@
         
         https://issues.apache.org/jira/browse/SOLR-3848
     -->
-
+  <configurations>
+    <conf name="compile" transitive="false"/>
+    <conf name="test" transitive="false"/>
+  </configurations>
+  <dependencies>
+    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
+  </dependencies>
 </ivy-module>

Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml Fri Apr 25 08:55:05 2014
@@ -17,7 +17,7 @@
     limitations under the License.
  -->
 
-<project name="solr-dataimporthandler" default="default" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="solr-dataimporthandler" default="default">
 	
   <description>
     Data Import Handler
@@ -26,20 +26,10 @@
   <!-- 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>

Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/ivy.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/ivy.xml Fri Apr 25 08:55:05 2014
@@ -24,11 +24,12 @@
   </configurations>
   <dependencies>
     <dependency org="javax.activation" name="activation" rev="${/javax.activation/activation}" conf="compile->*"/>
-    <dependency org="javax.mail" name="mail" rev="${/javax.mail/mail}"  conf="compile->*"/>
+    <dependency org="javax.mail" name="mail" rev="${/javax.mail/mail}" conf="compile->*"/>
 
-    <dependency org="hsqldb" name="hsqldb" rev="${/hsqldb/hsqldb}" transitive="false" conf="test->*"/>
-    <dependency org="org.apache.derby" name="derby" rev="${/org.apache.derby/derby}" transitive="false" conf="test->*"/>
-    <dependency org="org.easymock" name="easymock" rev="${/org.easymock/easymock}" transitive="false" conf="test->*"/>
+    <dependency org="hsqldb" name="hsqldb" rev="${/hsqldb/hsqldb}" conf="test->*"/>
+    <dependency org="org.apache.derby" name="derby" rev="${/org.apache.derby/derby}" conf="test->*"/>
+    <dependency org="org.easymock" name="easymock" rev="${/org.easymock/easymock}" conf="test->*"/>
+    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
 
     <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
   </dependencies>

Modified: lucene/dev/trunk/solr/contrib/extraction/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/build.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/extraction/build.xml Fri Apr 25 08:55:05 2014
@@ -25,4 +25,8 @@
 
   <import file="../contrib-build.xml"/>
 
+  <path id="test.classpath">
+    <path refid="solr.test.base.classpath"/>
+    <fileset dir="${test.lib.dir}" includes="*.jar"/>
+  </path>
 </project>

Modified: lucene/dev/trunk/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/ivy.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/extraction/ivy.xml Fri Apr 25 08:55:05 2014
@@ -17,47 +17,54 @@
    under the License.    
 -->
 <ivy-module version="2.0">
-    <info organisation="org.apache.solr" module="extraction"/>
-    <dependencies>
-      <!-- Tika JARs -->
-      <dependency org="org.apache.tika" name="tika-core" rev="${/org.apache.tika/tika-core}" transitive="false"/>
-      <dependency org="org.apache.tika" name="tika-parsers" rev="${/org.apache.tika/tika-parsers}" transitive="false"/>
-      <dependency org="org.apache.tika" name="tika-xmp" rev="${/org.apache.tika/tika-xmp}" transitive="false"/>
-      <!-- Tika dependencies - see http://tika.apache.org/1.3/gettingstarted.html#Using_Tika_as_a_Maven_dependency -->
-      <!-- When upgrading Tika, upgrade dependencies versions and add any new ones
-           (except slf4j-api, commons-codec, commons-logging, geronimo-stax-api_1.0_spec) -->
-      <dependency org="org.gagravarr" name="vorbis-java-tika" rev="${/org.gagravarr/vorbis-java-tika}" transitive="false"/>
-      <dependency org="org.gagravarr" name="vorbis-java-core" rev="${/org.gagravarr/vorbis-java-core}" transitive="false"/>
-      <dependency org="edu.ucar" name="netcdf" rev="${/edu.ucar/netcdf}" transitive="false"/>
-      <dependency org="org.apache.james" name="apache-mime4j-core" rev="${/org.apache.james/apache-mime4j-core}" transitive="false"/>
-      <dependency org="org.apache.james" name="apache-mime4j-dom" rev="${/org.apache.james/apache-mime4j-dom}" transitive="false"/>
-      <dependency org="org.apache.commons" name="commons-compress" rev="${/org.apache.commons/commons-compress}" transitive="false"/>
-      <dependency org="org.apache.pdfbox" name="pdfbox" rev="${/org.apache.pdfbox/pdfbox}" transitive="false"/>
-      <dependency org="org.apache.pdfbox" name="fontbox" rev="${/org.apache.pdfbox/fontbox}" transitive="false"/>
-      <dependency org="org.apache.pdfbox" name="jempbox" rev="${/org.apache.pdfbox/jempbox}" transitive="false"/>
-      <dependency org="org.bouncycastle" name="bcmail-jdk15" rev="${/org.bouncycastle/bcmail-jdk15}" transitive="false"/>
-      <dependency org="org.bouncycastle" name="bcprov-jdk15" rev="${/org.bouncycastle/bcprov-jdk15}" transitive="false"/>
-      <dependency org="org.apache.poi" name="poi" rev="${/org.apache.poi/poi}" transitive="false"/>
-      <dependency org="org.apache.poi" name="poi-scratchpad" rev="${/org.apache.poi/poi-scratchpad}" transitive="false"/>
-      <dependency org="org.apache.poi" name="poi-ooxml" rev="${/org.apache.poi/poi-ooxml}" transitive="false"/>
-      <dependency org="org.apache.poi" name="poi-ooxml-schemas" rev="${/org.apache.poi/poi-ooxml-schemas}" transitive="false"/>
-      <dependency org="org.apache.xmlbeans" name="xmlbeans" rev="${/org.apache.xmlbeans/xmlbeans}" transitive="false"/>
-      <dependency org="dom4j" name="dom4j" rev="${/dom4j/dom4j}" transitive="false"/>
-      <dependency org="org.ccil.cowan.tagsoup" name="tagsoup" rev="${/org.ccil.cowan.tagsoup/tagsoup}" transitive="false"/>
-      <dependency org="com.googlecode.mp4parser" name="isoparser" rev="${/com.googlecode.mp4parser/isoparser}" transitive="false"/>
-      <dependency org="org.aspectj" name="aspectjrt" rev="${/org.aspectj/aspectjrt}" transitive="false"/>
-      <dependency org="com.drewnoakes" name="metadata-extractor" rev="${/com.drewnoakes/metadata-extractor}" transitive="false"/>
-      <dependency org="de.l3s.boilerpipe" name="boilerpipe" rev="${/de.l3s.boilerpipe/boilerpipe}" transitive="false"/>
-      <dependency org="rome" name="rome" rev="${/rome/rome}" transitive="false"/>
-      <dependency org="jdom" name="jdom" rev="${/jdom/jdom}" transitive="false"/>
-      <dependency org="com.googlecode.juniversalchardet" name="juniversalchardet" rev="${/com.googlecode.juniversalchardet/juniversalchardet}" transitive="false"/>
-      <dependency org="org.tukaani" name="xz" rev="${/org.tukaani/xz}" transitive="false"/>
-      <dependency org="com.adobe.xmp" name="xmpcore" rev="${/com.adobe.xmp/xmpcore}" transitive="false"/>
-      <dependency org="asm" name="asm" rev="${/asm/asm}" transitive="false"/>
+  <info organisation="org.apache.solr" module="extraction"/>
+  <configurations>
+    <conf name="compile" transitive="false"/>
+    <conf name="test" transitive="false"/>
+  </configurations>
+  <dependencies>
+    <!-- Tika JARs -->
+    <dependency org="org.apache.tika" name="tika-core" rev="${/org.apache.tika/tika-core}" conf="compile->*"/>
+    <dependency org="org.apache.tika" name="tika-parsers" rev="${/org.apache.tika/tika-parsers}" conf="compile->*"/>
+    <dependency org="org.apache.tika" name="tika-xmp" rev="${/org.apache.tika/tika-xmp}" conf="compile->*"/>
+    <!-- Tika dependencies - see http://tika.apache.org/1.3/gettingstarted.html#Using_Tika_as_a_Maven_dependency -->
+    <!-- When upgrading Tika, upgrade dependencies versions and add any new ones
+         (except slf4j-api, commons-codec, commons-logging, geronimo-stax-api_1.0_spec) -->
+    <dependency org="org.gagravarr" name="vorbis-java-tika" rev="${/org.gagravarr/vorbis-java-tika}" conf="compile->*"/>
+    <dependency org="org.gagravarr" name="vorbis-java-core" rev="${/org.gagravarr/vorbis-java-core}" conf="compile->*"/>
+    <dependency org="edu.ucar" name="netcdf" rev="${/edu.ucar/netcdf}" conf="compile->*"/>
+    <dependency org="org.apache.james" name="apache-mime4j-core" rev="${/org.apache.james/apache-mime4j-core}" conf="compile->*"/>
+    <dependency org="org.apache.james" name="apache-mime4j-dom" rev="${/org.apache.james/apache-mime4j-dom}" conf="compile->*"/>
+    <dependency org="org.apache.commons" name="commons-compress" rev="${/org.apache.commons/commons-compress}" conf="compile->*"/>
+    <dependency org="org.apache.pdfbox" name="pdfbox" rev="${/org.apache.pdfbox/pdfbox}" conf="compile->*"/>
+    <dependency org="org.apache.pdfbox" name="fontbox" rev="${/org.apache.pdfbox/fontbox}" conf="compile->*"/>
+    <dependency org="org.apache.pdfbox" name="jempbox" rev="${/org.apache.pdfbox/jempbox}" conf="compile->*"/>
+    <dependency org="org.bouncycastle" name="bcmail-jdk15" rev="${/org.bouncycastle/bcmail-jdk15}" conf="compile->*"/>
+    <dependency org="org.bouncycastle" name="bcprov-jdk15" rev="${/org.bouncycastle/bcprov-jdk15}" conf="compile->*"/>
+    <dependency org="org.apache.poi" name="poi" rev="${/org.apache.poi/poi}" conf="compile->*"/>
+    <dependency org="org.apache.poi" name="poi-scratchpad" rev="${/org.apache.poi/poi-scratchpad}" conf="compile->*"/>
+    <dependency org="org.apache.poi" name="poi-ooxml" rev="${/org.apache.poi/poi-ooxml}" conf="compile->*"/>
+    <dependency org="org.apache.poi" name="poi-ooxml-schemas" rev="${/org.apache.poi/poi-ooxml-schemas}" conf="compile->*"/>
+    <dependency org="org.apache.xmlbeans" name="xmlbeans" rev="${/org.apache.xmlbeans/xmlbeans}" conf="compile->*"/>
+    <dependency org="dom4j" name="dom4j" rev="${/dom4j/dom4j}" conf="compile->*"/>
+    <dependency org="org.ccil.cowan.tagsoup" name="tagsoup" rev="${/org.ccil.cowan.tagsoup/tagsoup}" conf="compile->*"/>
+    <dependency org="com.googlecode.mp4parser" name="isoparser" rev="${/com.googlecode.mp4parser/isoparser}" conf="compile->*"/>
+    <dependency org="org.aspectj" name="aspectjrt" rev="${/org.aspectj/aspectjrt}" conf="compile->*"/>
+    <dependency org="com.drewnoakes" name="metadata-extractor" rev="${/com.drewnoakes/metadata-extractor}" conf="compile->*"/>
+    <dependency org="de.l3s.boilerpipe" name="boilerpipe" rev="${/de.l3s.boilerpipe/boilerpipe}" conf="compile->*"/>
+    <dependency org="rome" name="rome" rev="${/rome/rome}" conf="compile->*"/>
+    <dependency org="jdom" name="jdom" rev="${/jdom/jdom}" conf="compile->*"/>
+    <dependency org="com.googlecode.juniversalchardet" name="juniversalchardet" rev="${/com.googlecode.juniversalchardet/juniversalchardet}" conf="compile->*"/>
+    <dependency org="org.tukaani" name="xz" rev="${/org.tukaani/xz}" conf="compile->*"/>
+    <dependency org="com.adobe.xmp" name="xmpcore" rev="${/com.adobe.xmp/xmpcore}" conf="compile->*"/>
+    <dependency org="asm" name="asm" rev="${/asm/asm}" conf="compile->*"/>
 
-      <!-- Other ExtracingRequestHandler dependencies -->
-      <dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" transitive="false"/>
-      <dependency org="xerces" name="xercesImpl" rev="${/xerces/xercesImpl}" transitive="false"/>
-      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
-    </dependencies>
+    <!-- Other ExtractingRequestHandler dependencies -->
+    <dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" conf="compile->*"/>
+    <dependency org="xerces" name="xercesImpl" rev="${/xerces/xercesImpl}" conf="compile->*"/>
+
+    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
+
+    <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+  </dependencies>
 </ivy-module>

Modified: lucene/dev/trunk/solr/contrib/langid/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/langid/build.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/langid/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/langid/build.xml Fri Apr 25 08:55:05 2014
@@ -31,7 +31,12 @@
     <path refid="solr.base.classpath"/>   
   </path>
 
-    <!-- we don't actually need to compile this thing, we just want its libs -->
+  <path id="test.classpath">
+    <path refid="solr.test.base.classpath"/>
+    <fileset dir="${test.lib.dir}" includes="*.jar"/>
+  </path>
+
+  <!-- we don't actually need to compile this thing, we just want its libs -->
   <target name="resolve-extraction-libs">
     <ant dir="${common-solr.dir}/contrib/extraction" target="resolve" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>

Modified: lucene/dev/trunk/solr/contrib/langid/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/langid/ivy.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/langid/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/langid/ivy.xml Fri Apr 25 08:55:05 2014
@@ -17,10 +17,17 @@
    under the License.    
 -->
 <ivy-module version="2.0">
-    <info organisation="org.apache.solr" module="langid"/>
-    <dependencies>
-      <dependency org="com.cybozu.labs" name="langdetect" rev="${/com.cybozu.labs/langdetect}" transitive="false"/>
-      <dependency org="net.arnx" name="jsonic" rev="${/net.arnx/jsonic}" transitive="false"/>
-      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
-    </dependencies>
+  <info organisation="org.apache.solr" module="langid"/>
+  <configurations>
+    <conf name="compile" transitive="false"/>
+    <conf name="test" transitive="false"/>
+  </configurations>
+  <dependencies>
+    <dependency org="com.cybozu.labs" name="langdetect" rev="${/com.cybozu.labs/langdetect}" conf="compile->*"/>
+    <dependency org="net.arnx" name="jsonic" rev="${/net.arnx/jsonic}" conf="compile->*"/>
+
+    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
+
+    <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+  </dependencies>
 </ivy-module>

Modified: lucene/dev/trunk/solr/contrib/map-reduce/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/map-reduce/build.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/map-reduce/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/map-reduce/build.xml Fri Apr 25 08:55:05 2014
@@ -93,6 +93,7 @@
     <pathelement location="${common-solr.dir}/build/contrib/solr-morphlines-core/classes/test"/>
     <pathelement location="${common-solr.dir}/contrib/morphlines-core/src/test-files"/>
     <fileset dir="${common-solr.dir}/contrib/morphlines-core/test-lib" excludes="${common.classpath.excludes}"/>
+    <fileset dir="${test.lib.dir}" includes="*.jar"/>
   </path>
 
   <path id="javadoc.classpath">

Modified: lucene/dev/trunk/solr/contrib/map-reduce/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/map-reduce/ivy.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/map-reduce/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/map-reduce/ivy.xml Fri Apr 25 08:55:05 2014
@@ -16,7 +16,7 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
+<ivy-module version="2.0">
   <info organisation="org.apache.solr" module="map-reduce" />
   <configurations>
     <conf name="compile" transitive="false" />
@@ -31,7 +31,9 @@
     <dependency org="net.sf.saxon" name="Saxon-HE" rev="${/net.sf.saxon/Saxon-HE}" conf="compile->*" />
     
     <dependency org="org.kitesdk" name="kite-morphlines-hadoop-sequencefile" rev="${/org.kitesdk/kite-morphlines-hadoop-sequencefile}" conf="compile->*" />
-    
+
+    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
+
     <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}" />
   </dependencies>
 </ivy-module>

Modified: lucene/dev/trunk/solr/contrib/morphlines-cell/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/morphlines-cell/build.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/morphlines-cell/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/morphlines-cell/build.xml Fri Apr 25 08:55:05 2014
@@ -95,6 +95,7 @@
     <pathelement location="${common-solr.dir}/build/contrib/solr-morphlines-core/classes/test"/>
     <pathelement location="${common-solr.dir}/contrib/morphlines-core/src/test-files"/>
     <fileset dir="${common-solr.dir}/contrib/morphlines-core/test-lib" excludes="${common.classpath.excludes}"/>
+    <fileset dir="${test.lib.dir}" includes="*.jar"/>
   </path>
 
   <path id="javadoc.classpath">

Modified: lucene/dev/trunk/solr/contrib/morphlines-cell/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/morphlines-cell/ivy.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/morphlines-cell/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/morphlines-cell/ivy.xml Fri Apr 25 08:55:05 2014
@@ -16,7 +16,7 @@
    specific language governing permissions and limitations
    under the License.    
 -->
-<ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
+<ivy-module version="2.0">
   <info organisation="org.apache.solr" module="morphlines-cell" />
   <configurations>
     <conf name="compile" transitive="false" />
@@ -29,7 +29,9 @@
     <dependency org="org.kitesdk" name="kite-morphlines-tika-decompress" rev="${/org.kitesdk/kite-morphlines-tika-decompress}" conf="compile->*" />
     <dependency org="org.kitesdk" name="kite-morphlines-json" rev="${/org.kitesdk/kite-morphlines-json}" conf="compile->*" />
     <dependency org="org.kitesdk" name="kite-morphlines-twitter" rev="${/org.kitesdk/kite-morphlines-twitter}" conf="compile->*" />
-    
+
+    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
+
     <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}" />
 
   </dependencies>

Modified: lucene/dev/trunk/solr/contrib/morphlines-core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/morphlines-core/build.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/morphlines-core/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/morphlines-core/build.xml Fri Apr 25 08:55:05 2014
@@ -23,8 +23,6 @@
     Solr Morphlines commands.
   </description>
 
-  <property name="test.lib.dir" location="test-lib"/>
-
   <import file="../contrib-build.xml"/>
   
   <solr-contrib-uptodate name="extraction" 
@@ -93,14 +91,6 @@
     </ant>
   </target>
 
-  <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,test.DfsMiniCluster" type="jar,bundle,test" sync="${ivy.sync}" log="download-only"
-                    pattern="${test.lib.dir}/[artifact]-[revision](-[classifier]).[ext]"/>
-    </sequential>
-  </target>
-
   <target name="compile-core" depends="resolve-extraction-libs, compile-solr-extraction, solr-contrib-build.compile-core"/>
   <target name="dist" depends="common-solr.dist"/>
 

Modified: lucene/dev/trunk/solr/contrib/morphlines-core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/morphlines-core/ivy.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/morphlines-core/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/morphlines-core/ivy.xml Fri Apr 25 08:55:05 2014
@@ -114,6 +114,8 @@
     <dependency org="com.sun.jersey" name="jersey-core" rev="${/com.sun.jersey/jersey-core}" conf="test->*" />
 
     <dependency org="commons-collections" name="commons-collections" rev="${/commons-collections/commons-collections}" conf="test->*" />
+    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
+
     <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}" />
 
   </dependencies>

Modified: lucene/dev/trunk/solr/contrib/uima/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/build.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/build.xml Fri Apr 25 08:55:05 2014
@@ -35,6 +35,11 @@
     <path refid="solr.base.classpath"/>
   </path>
 
+  <path id="test.classpath">
+    <path refid="solr.test.base.classpath"/>
+    <fileset dir="${test.lib.dir}" includes="*.jar"/>
+  </path>
+
   <target name="module-jars-to-solr"
           depends="-module-jars-to-solr-not-for-package,-module-jars-to-solr-package"/>
   <target name="-module-jars-to-solr-not-for-package" unless="called.from.create-package">

Modified: lucene/dev/trunk/solr/contrib/uima/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/ivy.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/ivy.xml Fri Apr 25 08:55:05 2014
@@ -17,14 +17,21 @@
    under the License.    
 -->
 <ivy-module version="2.0">
-    <info organisation="org.apache.solr" module="uima"/>
-    <dependencies>
-      <dependency org="commons-digester" name="commons-digester" rev="${/commons-digester/commons-digester}" transitive="false"/>
-      <dependency org="org.apache.uima" name="AlchemyAPIAnnotator" rev="${/org.apache.uima/AlchemyAPIAnnotator}" transitive="false"/>
-      <dependency org="org.apache.uima" name="OpenCalaisAnnotator" rev="${/org.apache.uima/OpenCalaisAnnotator}" transitive="false"/>
-      <dependency org="org.apache.uima" name="Tagger" rev="${/org.apache.uima/Tagger}" transitive="false"/>
-      <dependency org="org.apache.uima" name="WhitespaceTokenizer" rev="${/org.apache.uima/WhitespaceTokenizer}" transitive="false"/>
-      <dependency org="org.apache.uima" name="uimaj-core" rev="${/org.apache.uima/uimaj-core}" transitive="false"/>
-      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
-    </dependencies>
+  <info organisation="org.apache.solr" module="uima"/>
+  <configurations>
+    <conf name="compile" transitive="false"/>
+    <conf name="test" transitive="false"/>
+  </configurations>
+  <dependencies>
+    <dependency org="commons-digester" name="commons-digester" rev="${/commons-digester/commons-digester}" conf="compile->*"/>
+    <dependency org="org.apache.uima" name="AlchemyAPIAnnotator" rev="${/org.apache.uima/AlchemyAPIAnnotator}" conf="compile->*"/>
+    <dependency org="org.apache.uima" name="OpenCalaisAnnotator" rev="${/org.apache.uima/OpenCalaisAnnotator}" conf="compile->*"/>
+    <dependency org="org.apache.uima" name="Tagger" rev="${/org.apache.uima/Tagger}" conf="compile->*"/>
+    <dependency org="org.apache.uima" name="WhitespaceTokenizer" rev="${/org.apache.uima/WhitespaceTokenizer}" conf="compile->*"/>
+    <dependency org="org.apache.uima" name="uimaj-core" rev="${/org.apache.uima/uimaj-core}" conf="compile->*"/>
+
+    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
+
+    <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+  </dependencies>
 </ivy-module>

Modified: lucene/dev/trunk/solr/contrib/velocity/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/velocity/build.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/velocity/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/velocity/build.xml Fri Apr 25 08:55:05 2014
@@ -25,4 +25,8 @@
 
   <import file="../contrib-build.xml"/>
 
+  <path id="test.classpath">
+    <path refid="solr.test.base.classpath"/>
+    <fileset dir="${test.lib.dir}" includes="*.jar"/>
+  </path>
 </project>

Modified: lucene/dev/trunk/solr/contrib/velocity/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/velocity/ivy.xml?rev=1589953&r1=1589952&r2=1589953&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/velocity/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/velocity/ivy.xml Fri Apr 25 08:55:05 2014
@@ -17,12 +17,19 @@
    under the License.    
 -->
 <ivy-module version="2.0">
-    <info organisation="org.apache.solr" module="velocity"/>
-    <dependencies>
-      <dependency org="commons-beanutils" name="commons-beanutils" rev="${/commons-beanutils/commons-beanutils}" transitive="false"/>
-      <dependency org="commons-collections" name="commons-collections" rev="${/commons-collections/commons-collections}" transitive="false"/>
-      <dependency org="org.apache.velocity" name="velocity" rev="${/org.apache.velocity/velocity}" transitive="false"/>
-      <dependency org="org.apache.velocity" name="velocity-tools" rev="${/org.apache.velocity/velocity-tools}" transitive="false"/>
-      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
-    </dependencies>
+  <info organisation="org.apache.solr" module="velocity"/>
+  <configurations>
+    <conf name="compile" transitive="false"/>
+    <conf name="test" transitive="false"/>
+  </configurations>
+  <dependencies>
+    <dependency org="commons-beanutils" name="commons-beanutils" rev="${/commons-beanutils/commons-beanutils}" conf="compile->*"/>
+    <dependency org="commons-collections" name="commons-collections" rev="${/commons-collections/commons-collections}" conf="compile->*"/>
+    <dependency org="org.apache.velocity" name="velocity" rev="${/org.apache.velocity/velocity}" conf="compile->*"/>
+    <dependency org="org.apache.velocity" name="velocity-tools" rev="${/org.apache.velocity/velocity-tools}" conf="compile->*"/>
+
+    <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
+
+    <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+  </dependencies>
 </ivy-module>



Mime
View raw message