You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/10/16 23:14:38 UTC
svn commit: r1632436 [1/2] - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/analysis/ lucene/analysis/common/ lucene/analysis/icu/
lucene/analysis/kuromoji/ lucene/analysis/morfologik/
lucene/analysis/phonetic/ lucene/analysis/smartcn/ lucene/ana...
Author: sarowe
Date: Thu Oct 16 21:14:37 2014
New Revision: 1632436
URL: http://svn.apache.org/r1632436
Log:
LUCENE-6007: Regularize ivy.xml files to use configurations that map to remote master configurations, so that Ivy won't try to download extraneous crap (merged trunk r1632430)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_5x/lucene/analysis/common/ivy.xml
lucene/dev/branches/branch_5x/lucene/analysis/icu/ivy.xml
lucene/dev/branches/branch_5x/lucene/analysis/kuromoji/ivy.xml
lucene/dev/branches/branch_5x/lucene/analysis/morfologik/ivy.xml
lucene/dev/branches/branch_5x/lucene/analysis/phonetic/ivy.xml
lucene/dev/branches/branch_5x/lucene/analysis/smartcn/ivy.xml
lucene/dev/branches/branch_5x/lucene/analysis/stempel/ivy.xml
lucene/dev/branches/branch_5x/lucene/analysis/uima/ivy.xml
lucene/dev/branches/branch_5x/lucene/backward-codecs/ (props changed)
lucene/dev/branches/branch_5x/lucene/backward-codecs/ivy.xml
lucene/dev/branches/branch_5x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_5x/lucene/benchmark/ivy.xml
lucene/dev/branches/branch_5x/lucene/classification/ (props changed)
lucene/dev/branches/branch_5x/lucene/classification/ivy.xml (contents, props changed)
lucene/dev/branches/branch_5x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_5x/lucene/codecs/ivy.xml
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/ivy.xml
lucene/dev/branches/branch_5x/lucene/demo/ (props changed)
lucene/dev/branches/branch_5x/lucene/demo/ivy.xml
lucene/dev/branches/branch_5x/lucene/expressions/ (props changed)
lucene/dev/branches/branch_5x/lucene/expressions/ivy.xml
lucene/dev/branches/branch_5x/lucene/facet/ (props changed)
lucene/dev/branches/branch_5x/lucene/facet/ivy.xml
lucene/dev/branches/branch_5x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_5x/lucene/grouping/ivy.xml
lucene/dev/branches/branch_5x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_5x/lucene/highlighter/ivy.xml
lucene/dev/branches/branch_5x/lucene/join/ (props changed)
lucene/dev/branches/branch_5x/lucene/join/ivy.xml
lucene/dev/branches/branch_5x/lucene/memory/ (props changed)
lucene/dev/branches/branch_5x/lucene/memory/ivy.xml
lucene/dev/branches/branch_5x/lucene/misc/ (props changed)
lucene/dev/branches/branch_5x/lucene/misc/ivy.xml
lucene/dev/branches/branch_5x/lucene/queries/ (props changed)
lucene/dev/branches/branch_5x/lucene/queries/ivy.xml
lucene/dev/branches/branch_5x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_5x/lucene/queryparser/ivy.xml
lucene/dev/branches/branch_5x/lucene/replicator/ (props changed)
lucene/dev/branches/branch_5x/lucene/replicator/ivy.xml
lucene/dev/branches/branch_5x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_5x/lucene/sandbox/ivy.xml
lucene/dev/branches/branch_5x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_5x/lucene/spatial/ivy.xml
lucene/dev/branches/branch_5x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_5x/lucene/suggest/ivy.xml
lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/ivy.xml
lucene/dev/branches/branch_5x/lucene/tools/ (props changed)
lucene/dev/branches/branch_5x/lucene/tools/ivy.xml
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/ivy.xml
lucene/dev/branches/branch_5x/solr/contrib/analytics/ivy.xml
lucene/dev/branches/branch_5x/solr/contrib/clustering/ivy.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/ivy.xml
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/ivy.xml
lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml
lucene/dev/branches/branch_5x/solr/contrib/langid/ivy.xml
lucene/dev/branches/branch_5x/solr/contrib/map-reduce/ivy.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/ivy.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/build.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/ivy.xml
lucene/dev/branches/branch_5x/solr/contrib/uima/ivy.xml
lucene/dev/branches/branch_5x/solr/contrib/velocity/ivy.xml
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ivy.xml
lucene/dev/branches/branch_5x/solr/example/ (props changed)
lucene/dev/branches/branch_5x/solr/example/example-DIH/ivy.xml
lucene/dev/branches/branch_5x/solr/example/ivy.xml
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/ivy.xml
lucene/dev/branches/branch_5x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_5x/solr/test-framework/ivy.xml
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="analyzers-common"/>
+ <info organisation="org.apache.lucene" module="analyzers-common"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/analysis/icu/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/icu/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/icu/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/icu/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,9 +17,12 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="analyzers-icu"/>
- <dependencies>
- <dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" transitive="false"/>
- <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
- </dependencies>
+ <info organisation="org.apache.lucene" module="analyzers-icu"/>
+ <configurations defaultconfmapping="compile->master">
+ <conf name="compile" transitive="false"/>
+ </configurations>
+ <dependencies>
+ <dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" conf="compile"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/analysis/kuromoji/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/kuromoji/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/kuromoji/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/kuromoji/ivy.xml Thu Oct 16 21:14:37 2014
@@ -18,18 +18,20 @@
-->
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="analyzers-kuromoji"/>
- <configurations>
- <conf name="default" description="compile dependencies"/>
- <conf name="ipadic" description="ipadic dictionary"/>
- <conf name="naist" description="naist-jdic dictionary"/>
- </configurations>
+
+ <configurations defaultconfmapping="ipadic->default;naist->default"> <!-- 'master' conf not available to map to -->
+ <conf name="default" description="explicitly declare this configuration in order to not download dictionaries unless explicitly called for"/>
+ <conf name="ipadic" description="ipadic dictionary" transitive="false"/>
+ <conf name="naist" description="naist-jdic dictionary" transitive="false"/>
+ </configurations>
<dependencies>
- <dependency org="mecab" name="mecab-ipadic" rev="${/mecab/mecab-ipadic}" conf="ipadic->default">
- <artifact name="ipadic" type=".tar.gz" url="http://mecab.googlecode.com/files/mecab-ipadic-2.7.0-20070801.tar.gz"/>
- </dependency>
- <dependency org="mecab" name="mecab-naist-jdic" rev="${/mecab/mecab-naist-jdic}" conf="naist->default">
- <artifact name="mecab-naist-jdic" type=".tar.gz" url="http://sourceforge.jp/frs/redir.php?m=iij&f=/naist-jdic/53500/mecab-naist-jdic-0.6.3b-20111013.tar.gz"/>
- </dependency>
- </dependencies>
+ <dependency org="mecab" name="mecab-ipadic" rev="${/mecab/mecab-ipadic}" conf="ipadic">
+ <artifact name="ipadic" type=".tar.gz" url="http://mecab.googlecode.com/files/mecab-ipadic-2.7.0-20070801.tar.gz"/>
+ </dependency>
+ <dependency org="mecab" name="mecab-naist-jdic" rev="${/mecab/mecab-naist-jdic}" conf="naist">
+ <artifact name="mecab-naist-jdic" type=".tar.gz" url="http://sourceforge.jp/frs/redir.php?m=iij&f=/naist-jdic/53500/mecab-naist-jdic-0.6.3b-20111013.tar.gz"/>
+ </dependency>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/analysis/morfologik/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/morfologik/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/morfologik/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/morfologik/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,11 +17,14 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="analyzers-morfologik"/>
- <dependencies>
- <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.lucene" module="analyzers-morfologik"/>
+ <configurations defaultconfmapping="compile->master">
+ <conf name="compile" transitive="false"/>
+ </configurations>
+ <dependencies>
+ <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"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/analysis/phonetic/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/phonetic/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/phonetic/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/phonetic/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,9 +17,12 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="analyzers-phonetic"/>
- <dependencies>
- <dependency org="commons-codec" name="commons-codec" rev="${/commons-codec/commons-codec}" transitive="false"/>
- <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
- </dependencies>
+ <info organisation="org.apache.lucene" module="analyzers-phonetic"/>
+ <configurations defaultconfmapping="compile->master">
+ <conf name="compile" transitive="false"/>
+ </configurations>
+ <dependencies>
+ <dependency org="commons-codec" name="commons-codec" rev="${/commons-codec/commons-codec}" conf="compile"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/analysis/smartcn/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/smartcn/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/smartcn/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/smartcn/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="analyzers-smartcn"/>
+ <info organisation="org.apache.lucene" module="analyzers-smartcn"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/analysis/stempel/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/stempel/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/stempel/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/stempel/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="analyzers-stempel"/>
+ <info organisation="org.apache.lucene" module="analyzers-stempel"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/analysis/uima/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/uima/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/uima/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/uima/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,11 +17,14 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="analyzers-uima"/>
- <dependencies>
- <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.lucene" module="analyzers-uima"/>
+ <configurations defaultconfmapping="compile->master">
+ <conf name="compile" transitive="false"/>
+ </configurations>
+ <dependencies>
+ <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"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/backward-codecs/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/backward-codecs/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/backward-codecs/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/backward-codecs/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="backward-codecs"/>
+ <info organisation="org.apache.lucene" module="backward-codecs"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/benchmark/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/benchmark/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/benchmark/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/benchmark/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,13 +17,16 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="benchmark"/>
- <dependencies>
- <dependency org="org.apache.commons" name="commons-compress" rev="${/org.apache.commons/commons-compress}" transitive="false"/>
- <dependency org="xerces" name="xercesImpl" rev="${/xerces/xercesImpl}" transitive="false"/>
- <dependency org="net.sourceforge.nekohtml" name="nekohtml" rev="${/net.sourceforge.nekohtml/nekohtml}" transitive="false"/>
- <dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" transitive="false"/>
- <dependency org="com.spatial4j" name="spatial4j" rev="${/com.spatial4j/spatial4j}" transitive="false"/>
- <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
- </dependencies>
+ <info organisation="org.apache.lucene" module="benchmark"/>
+ <configurations defaultconfmapping="compile->master">
+ <conf name="compile" transitive="false"/>
+ </configurations>
+ <dependencies>
+ <dependency org="org.apache.commons" name="commons-compress" rev="${/org.apache.commons/commons-compress}" conf="compile"/>
+ <dependency org="xerces" name="xercesImpl" rev="${/xerces/xercesImpl}" conf="compile"/>
+ <dependency org="net.sourceforge.nekohtml" name="nekohtml" rev="${/net.sourceforge.nekohtml/nekohtml}" conf="compile"/>
+ <dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" conf="compile"/>
+ <dependency org="com.spatial4j" name="spatial4j" rev="${/com.spatial4j/spatial4j}" conf="compile"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/classification/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/classification/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/classification/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/classification/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="classification"/>
+ <info organisation="org.apache.lucene" module="classification"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/codecs/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/codecs/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/codecs/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/codecs/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="codecs"/>
+ <info organisation="org.apache.lucene" module="codecs"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/core/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="core"/>
+ <info organisation="org.apache.lucene" module="core"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/demo/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/demo/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/demo/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/demo/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,9 +17,12 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="core-demo"/>
- <dependencies>
- <dependency org="javax.servlet" name="servlet-api" rev="${/javax.servlet/servlet-api}"/>
- <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
- </dependencies>
+ <info organisation="org.apache.lucene" module="core-demo"/>
+ <configurations defaultconfmapping="compile->master">
+ <conf name="compile" transitive="false"/>
+ </configurations>
+ <dependencies>
+ <dependency org="javax.servlet" name="servlet-api" rev="${/javax.servlet/servlet-api}" conf="compile"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/expressions/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/expressions/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/expressions/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/expressions/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,11 +17,14 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="expressions"/>
- <dependencies>
- <dependency org="org.antlr" name="antlr-runtime" rev="${/org.antlr/antlr-runtime}" transitive="false"/>
- <dependency org="org.ow2.asm" name="asm" rev="${/org.ow2.asm/asm}" transitive="false"/>
- <dependency org="org.ow2.asm" name="asm-commons" rev="${/org.ow2.asm/asm-commons}" transitive="false"/>
- <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
- </dependencies>
+ <info organisation="org.apache.lucene" module="expressions"/>
+ <configurations defaultconfmapping="compile->master">
+ <conf name="compile" transitive="false"/>
+ </configurations>
+ <dependencies>
+ <dependency org="org.antlr" name="antlr-runtime" rev="${/org.antlr/antlr-runtime}" conf="compile"/>
+ <dependency org="org.ow2.asm" name="asm" rev="${/org.ow2.asm/asm}" conf="compile"/>
+ <dependency org="org.ow2.asm" name="asm-commons" rev="${/org.ow2.asm/asm-commons}" conf="compile"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/facet/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="facet"/>
+ <info organisation="org.apache.lucene" module="facet"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/grouping/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/grouping/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/grouping/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/grouping/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="grouping"/>
+ <info organisation="org.apache.lucene" module="grouping"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/highlighter/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/highlighter/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/highlighter/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/highlighter/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="highlighter"/>
+ <info organisation="org.apache.lucene" module="highlighter"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/join/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/join/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/join/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/join/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="join"/>
+ <info organisation="org.apache.lucene" module="join"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/memory/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/memory/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/memory/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/memory/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="memory"/>
+ <info organisation="org.apache.lucene" module="memory"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/misc/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="misc"/>
+ <info organisation="org.apache.lucene" module="misc"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/queries/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="queries"/>
+ <info organisation="org.apache.lucene" module="queries"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="queryparser"/>
+ <info organisation="org.apache.lucene" module="queryparser"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/replicator/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/replicator/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/replicator/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/replicator/ivy.xml Thu Oct 16 21:14:37 2014
@@ -19,27 +19,31 @@
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="replicator"/>
- <configurations>
- <conf name="http" description="httpclient jars"/>
- <conf name="jetty" description="jetty jars"/>
- <conf name="start" description="jetty start jar"/>
- <conf name="servlet" description="servlet-api jar"/>
- <conf name="logging" description="logging setup"/>
+ <configurations defaultconfmapping="http->master;jetty->master;start->master;servlet->master;logging->master">
+ <conf name="http" description="httpclient jars" transitive="false"/>
+ <conf name="jetty" description="jetty jars" transitive="false"/>
+ <conf name="start" description="jetty start jar" transitive="false"/>
+ <conf name="servlet" description="servlet-api jar" transitive="false"/>
+ <conf name="logging" description="logging setup" transitive="false"/>
</configurations>
<dependencies>
- <dependency org="org.apache.httpcomponents" name="httpclient" rev="${/org.apache.httpcomponents/httpclient}" transitive="false" conf="http->default"/>
- <dependency org="org.apache.httpcomponents" name="httpcore" rev="${/org.apache.httpcomponents/httpcore}" transitive="false" conf="http->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-server" rev="${/org.eclipse.jetty/jetty-server}" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="${/org.eclipse.jetty/jetty-servlet}" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-util" rev="${/org.eclipse.jetty/jetty-util}" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-io" rev="${/org.eclipse.jetty/jetty-io}" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="${/org.eclipse.jetty/jetty-continuation}" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-http" rev="${/org.eclipse.jetty/jetty-http}" transitive="false" conf="jetty->default"/>
- <dependency org="commons-logging" name="commons-logging" rev="${/commons-logging/commons-logging}" transitive="false" conf="logging->default"/>
- <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="${/org.eclipse.jetty.orbit/javax.servlet}" transitive="false" conf="servlet->default">
+ <dependency org="org.apache.httpcomponents" name="httpclient" rev="${/org.apache.httpcomponents/httpclient}" conf="http"/>
+ <dependency org="org.apache.httpcomponents" name="httpcore" rev="${/org.apache.httpcomponents/httpcore}" conf="http"/>
+
+ <dependency org="org.eclipse.jetty" name="jetty-server" rev="${/org.eclipse.jetty/jetty-server}" conf="jetty"/>
+ <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="${/org.eclipse.jetty/jetty-servlet}" conf="jetty"/>
+ <dependency org="org.eclipse.jetty" name="jetty-util" rev="${/org.eclipse.jetty/jetty-util}" conf="jetty"/>
+ <dependency org="org.eclipse.jetty" name="jetty-io" rev="${/org.eclipse.jetty/jetty-io}" conf="jetty"/>
+ <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="${/org.eclipse.jetty/jetty-continuation}" conf="jetty"/>
+ <dependency org="org.eclipse.jetty" name="jetty-http" rev="${/org.eclipse.jetty/jetty-http}" conf="jetty"/>
+
+ <dependency org="commons-logging" name="commons-logging" rev="${/commons-logging/commons-logging}" conf="logging"/>
+
+ <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="${/org.eclipse.jetty.orbit/javax.servlet}" conf="servlet">
<artifact name="javax.servlet" type="orbit" ext="jar"/>
</dependency>
+
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,9 +17,12 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="sandbox"/>
- <dependencies>
- <dependency org="jakarta-regexp" name="jakarta-regexp" rev="${/jakarta-regexp/jakarta-regexp}" transitive="false"/>
- <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
- </dependencies>
+ <info organisation="org.apache.lucene" module="sandbox"/>
+ <configurations defaultconfmapping="compile->master">
+ <conf name="compile" transitive="false"/>
+ </configurations>
+ <dependencies>
+ <dependency org="jakarta-regexp" name="jakarta-regexp" rev="${/jakarta-regexp/jakarta-regexp}" conf="compile"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/spatial/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,9 +17,12 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="spatial"/>
- <dependencies>
- <dependency org="com.spatial4j" name="spatial4j" rev="${/com.spatial4j/spatial4j}" transitive="false"/>
- <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
- </dependencies>
+ <info organisation="org.apache.lucene" module="spatial"/>
+ <configurations defaultconfmapping="compile->master">
+ <conf name="compile" transitive="false"/>
+ </configurations>
+ <dependencies>
+ <dependency org="com.spatial4j" name="spatial4j" rev="${/com.spatial4j/spatial4j}" conf="compile"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/suggest/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,5 +17,5 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="suggest"/>
+ <info organisation="org.apache.lucene" module="suggest"/>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,24 +17,24 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="core-test-framework"/>
+ <info organisation="org.apache.lucene" module="core-test-framework"/>
- <configurations>
- <conf name="default" />
- <!--
- JUnit4 ANT task only, no ANT.
- This is used from build scripts for taskdefs.
- -->
- <conf name="junit4-stdalone" />
- </configurations>
+ <configurations defaultconfmapping="compile->master;junit4-stdalone->master">
+ <conf name="compile" transitive="false"/>
+ <!--
+ JUnit4 ANT task only, no ANT.
+ This is used from build scripts for taskdefs.
+ -->
+ <conf name="junit4-stdalone" />
+ </configurations>
- <dependencies defaultconf="default">
- <dependency org="org.apache.ant" name="ant" rev="${/org.apache.ant/ant}" transitive="false" />
+ <dependencies>
+ <dependency org="org.apache.ant" name="ant" rev="${/org.apache.ant/ant}" conf="compile"/>
- <dependency org="junit" name="junit" rev="${/junit/junit}" transitive="false" conf="default->*;junit4-stdalone->*" />
- <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="${/com.carrotsearch.randomizedtesting/junit4-ant}" transitive="false" conf="default->*;junit4-stdalone->*" />
- <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="${/com.carrotsearch.randomizedtesting/randomizedtesting-runner}" transitive="false" conf="default->*;junit4-stdalone->*" />
+ <dependency org="junit" name="junit" rev="${/junit/junit}" transitive="false" conf="compile,junit4-stdalone"/>
+ <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="${/com.carrotsearch.randomizedtesting/junit4-ant}" transitive="false" conf="compile,junit4-stdalone"/>
+ <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="${/com.carrotsearch.randomizedtesting/randomizedtesting-runner}" transitive="false" conf="compile,junit4-stdalone"/>
- <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/branches/branch_5x/lucene/tools/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/tools/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/tools/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/tools/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,10 +17,13 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.lucene" module="core-tools"/>
- <dependencies>
- <dependency org="org.apache.ant" name="ant" rev="${/org.apache.ant/ant}" transitive="false" />
- <dependency org="org.apache.ivy" name="ivy" rev="${/org.apache.ivy/ivy}" transitive="false" />
- <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
- </dependencies>
+ <info organisation="org.apache.lucene" module="core-tools"/>
+ <configurations defaultconfmapping="compile->master">
+ <conf name="compile" transitive="false"/>
+ </configurations>
+ <dependencies>
+ <dependency org="org.apache.ant" name="ant" rev="${/org.apache.ant/ant}" conf="compile"/>
+ <dependency org="org.apache.ivy" name="ivy" rev="${/org.apache.ivy/ivy}" conf="compile"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/analysis-extras/ivy.xml Thu Oct 16 21:14:37 2014
@@ -18,22 +18,22 @@
-->
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="analysis-extras"/>
- <configurations>
+ <configurations defaultconfmapping="compile->master;test->master">
<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->*"/>
+ <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.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->*"/>
+ <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/branches/branch_5x/solr/contrib/analytics/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/analytics/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/analytics/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/analytics/ivy.xml Thu Oct 16 21:14:37 2014
@@ -17,14 +17,14 @@
under the License.
-->
<ivy-module version="2.0">
- <info organisation="org.apache.solr" module="analytics"/>
- <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>
+ <info organisation="org.apache.solr" module="analytics"/>
+ <configurations defaultconfmapping="compile->master;test->master">
+ <conf name="compile" transitive="false"/> <!-- keep unused 'compile' configuration to allow build to succeed -->
+ <conf name="test" transitive="false"/>
+ </configurations>
+ <dependencies>
+ <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/branches/branch_5x/solr/contrib/clustering/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/clustering/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/clustering/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/clustering/ivy.xml Thu Oct 16 21:14:37 2014
@@ -18,22 +18,22 @@
-->
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="clustering"/>
- <configurations>
+ <configurations defaultconfmapping="compile->master;test->master">
<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="org.carrot2" name="carrot2-mini" rev="${/org.carrot2/carrot2-mini}" conf="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="com.carrotsearch" name="hppc" rev="${/com.carrotsearch/hppc}" conf="compile"/>
+ <dependency org="org.carrot2.attributes" name="attributes-binder" rev="${/org.carrot2.attributes/attributes-binder}" conf="compile"/>
+ <dependency org="org.simpleframework" name="simple-xml" rev="${/org.simpleframework/simple-xml}" conf="compile"/>
- <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.apache.mahout" name="mahout-math" rev="${/org.apache.mahout/mahout-math}" conf="compile"/>
+ <dependency org="org.apache.mahout" name="mahout-collections" rev="${/org.apache.mahout/mahout-collections}" conf="compile"/>
- <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"/>
+ <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${/org.codehaus.jackson/jackson-core-asl}" conf="compile"/>
+ <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${/org.codehaus.jackson/jackson-mapper-asl}" conf="compile"/>
<!--
Included as part of Solr's environment.
@@ -42,7 +42,7 @@
commons-lang:commons-lang:jar:2.6:compile
-->
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" 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/branches/branch_5x/solr/contrib/dataimporthandler-extras/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/ivy.xml Thu Oct 16 21:14:37 2014
@@ -26,14 +26,17 @@
https://issues.apache.org/jira/browse/SOLR-3848
-->
- <configurations>
+ <configurations defaultconfmapping="compile->master;test->master">
<conf name="compile" transitive="false"/>
<conf name="test" transitive="false"/>
</configurations>
<dependencies>
- <dependency org="javax.activation" name="activation" rev="${/javax.activation/activation}" conf="compile->*"/>
- <dependency org="com.sun.mail" name="javax.mail" rev="${/com.sun.mail/javax.mail}" conf="compile->*"/>
- <dependency org="com.sun.mail" name="gimap" rev="${/com.sun.mail/gimap}" conf="compile->*"/>
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" conf="test->*"/>
+ <dependency org="javax.activation" name="activation" rev="${/javax.activation/activation}" conf="compile"/>
+ <dependency org="com.sun.mail" name="javax.mail" rev="${/com.sun.mail/javax.mail}" conf="compile"/>
+ <dependency org="com.sun.mail" name="gimap" rev="${/com.sun.mail/gimap}" 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/branches/branch_5x/solr/contrib/dataimporthandler/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/ivy.xml Thu Oct 16 21:14:37 2014
@@ -18,15 +18,15 @@
-->
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="dataimporthandler"/>
- <configurations>
- <conf name="compile" transitive="false"/>
+ <configurations defaultconfmapping="compile->master;test->master">
+ <conf name="compile" transitive="false"/> <!-- keep unused 'compile' configuration to allow build to succeed -->
<conf name="test" transitive="false"/>
</configurations>
<dependencies>
- <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->*"/>
+ <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/branches/branch_5x/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml Thu Oct 16 21:14:37 2014
@@ -18,53 +18,53 @@
-->
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="extraction"/>
- <configurations>
+ <configurations defaultconfmapping="compile->master;test->master">
<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->*"/>
+ <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, commons-httpclient, geronimo-stax-api_1.0_spec, jcip-annotations, xml-apis, asm)
WARNING: Don't add netcdf / unidataCommon (partially LGPL code) -->
- <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="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="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="com.uwyn" name="jhighlight" rev="${/com.uwyn/jhighlight}" conf="compile->*"/>
- <dependency org="com.pff" name="java-libpst" rev="${/com.pff/java-libpst}" conf="compile->*"/>
- <dependency org="net.sourceforge.jmatio" name="jmatio" rev="${/net.sourceforge.jmatio/jmatio}" conf="compile->*"/>
+ <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="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="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="com.uwyn" name="jhighlight" rev="${/com.uwyn/jhighlight}" conf="compile"/>
+ <dependency org="com.pff" name="java-libpst" rev="${/com.pff/java-libpst}" conf="compile"/>
+ <dependency org="net.sourceforge.jmatio" name="jmatio" rev="${/net.sourceforge.jmatio/jmatio}" conf="compile"/>
<!-- 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="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->*"/>
+ <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/branches/branch_5x/solr/contrib/langid/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/langid/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/langid/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/langid/ivy.xml Thu Oct 16 21:14:37 2014
@@ -18,15 +18,15 @@
-->
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="langid"/>
- <configurations>
+ <configurations defaultconfmapping="compile->master;test->master">
<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="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->*"/>
+ <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/branches/branch_5x/solr/contrib/map-reduce/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/map-reduce/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/map-reduce/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/map-reduce/ivy.xml Thu Oct 16 21:14:37 2014
@@ -18,21 +18,19 @@
-->
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="map-reduce" />
- <configurations>
+ <configurations defaultconfmapping="compile->master;test->master">
<conf name="compile" transitive="false" />
<conf name="test" transitive="false" />
- <conf name="test.DfsMiniCluster" transitive="false"/>
</configurations>
<dependencies>
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" rev="${/org.apache.hadoop/hadoop-mapreduce-client-core}" conf="compile->*" />
- <dependency org="net.sourceforge.argparse4j" name="argparse4j" rev="${/net.sourceforge.argparse4j/argparse4j}" conf="compile->*" />
- <dependency org="org.kitesdk" name="kite-morphlines-saxon" rev="${/org.kitesdk/kite-morphlines-saxon}" conf="compile->*" />
- <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.apache.hadoop" name="hadoop-mapreduce-client-core" rev="${/org.apache.hadoop/hadoop-mapreduce-client-core}" conf="compile" />
+ <dependency org="net.sourceforge.argparse4j" name="argparse4j" rev="${/net.sourceforge.argparse4j/argparse4j}" conf="compile" />
+ <dependency org="org.kitesdk" name="kite-morphlines-saxon" rev="${/org.kitesdk/kite-morphlines-saxon}" conf="compile" />
+ <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->*"/>
+ <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/branches/branch_5x/solr/contrib/morphlines-cell/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/ivy.xml Thu Oct 16 21:14:37 2014
@@ -18,19 +18,18 @@
-->
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="morphlines-cell" />
- <configurations>
+ <configurations defaultconfmapping="compile->master;test->master">
<conf name="compile" transitive="false" />
<conf name="test" transitive="false" />
- <conf name="test.DfsMiniCluster" transitive="false"/>
</configurations>
<dependencies>
- <dependency org="org.kitesdk" name="kite-morphlines-tika-core" rev="${/org.kitesdk/kite-morphlines-tika-core}" conf="compile->*" />
- <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.kitesdk" name="kite-morphlines-tika-core" rev="${/org.kitesdk/kite-morphlines-tika-core}" conf="compile" />
+ <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->*"/>
+ <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}" />
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/build.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/build.xml Thu Oct 16 21:14:37 2014
@@ -91,6 +91,14 @@
</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/branches/branch_5x/solr/contrib/morphlines-core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/ivy.xml Thu Oct 16 21:14:37 2014
@@ -18,103 +18,99 @@
-->
<ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.solr" module="morphlines-core" />
- <configurations>
+ <configurations defaultconfmapping="compile->master;test->master;test.DfsMiniCluster->master">
<!-- artifacts in the "compile" configuration will go into morphlines-core/lib/ -->
<conf name="compile" transitive="false" />
- <!-- artifacts in the "test" and "test.DfsMiniCluster" configuration will go into solr/core/test-lib/ -->
+ <!-- artifacts in the "test" and "test.DfsMiniCluster" configuration will go into morphlines-core/test-lib/ -->
<conf name="test" transitive="false" />
- <conf name="test.DfsMiniCluster" transitive="false"/>
+ <conf name="test.DfsMiniCluster" transitive="false" />
</configurations>
<dependencies>
- <dependency org="org.kitesdk" name="kite-morphlines-core" rev="${/org.kitesdk/kite-morphlines-core}" conf="compile->*;test->*" >
- <artifact name="kite-morphlines-core" ext="jar"/>
- <artifact name="kite-morphlines-core" type="test" ext="jar" maven:classifier="tests"/>
+ <dependency org="org.kitesdk" name="kite-morphlines-core" rev="${/org.kitesdk/kite-morphlines-core}" conf="compile;test">
+ <artifact name="kite-morphlines-core" ext="jar" />
+ <artifact name="kite-morphlines-core" type="test" ext="jar" maven:classifier="tests" />
</dependency>
- <dependency org="org.kitesdk" name="kite-morphlines-avro" rev="${/org.kitesdk/kite-morphlines-avro}" conf="compile->*" />
+ <dependency org="org.kitesdk" name="kite-morphlines-avro" rev="${/org.kitesdk/kite-morphlines-avro}" conf="compile" />
- <dependency org="com.codahale.metrics" name="metrics-core" rev="${/com.codahale.metrics/metrics-core}" conf="compile->*" />
- <dependency org="com.codahale.metrics" name="metrics-healthchecks" rev="${/com.codahale.metrics/metrics-healthchecks}" conf="compile->*" />
- <dependency org="com.typesafe" name="config" rev="${/com.typesafe/config}" conf="compile->*" />
+ <dependency org="com.codahale.metrics" name="metrics-core" rev="${/com.codahale.metrics/metrics-core}" conf="compile" />
+ <dependency org="com.codahale.metrics" name="metrics-healthchecks" rev="${/com.codahale.metrics/metrics-healthchecks}" conf="compile" />
+ <dependency org="com.typesafe" name="config" rev="${/com.typesafe/config}" conf="compile" />
<!-- Test Dependencies -->
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" rev="${/org.apache.hadoop/hadoop-mapreduce-client-core}" conf="test->*" />
-
- <dependency org="org.apache.hadoop" name="hadoop-yarn-common" rev="${/org.apache.hadoop/hadoop-yarn-common}" conf="test->*" />
- <dependency org="org.apache.hadoop" name="hadoop-yarn-api" rev="${/org.apache.hadoop/hadoop-yarn-api}" conf="test->*" />
- <dependency org="org.apache.hadoop" name="hadoop-yarn-client" rev="${/org.apache.hadoop/hadoop-yarn-client}" conf="test->*" />
- <dependency org="org.apache.hadoop" name="hadoop-yarn-server-tests" rev="${/org.apache.hadoop/hadoop-yarn-server-tests}" conf="test->*">
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" rev="${/org.apache.hadoop/hadoop-mapreduce-client-core}" conf="test" />
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common" rev="${/org.apache.hadoop/hadoop-yarn-common}" conf="test" />
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-api" rev="${/org.apache.hadoop/hadoop-yarn-api}" conf="test" />
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-client" rev="${/org.apache.hadoop/hadoop-yarn-client}" conf="test" />
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-server-tests" rev="${/org.apache.hadoop/hadoop-yarn-server-tests}" conf="test">
<artifact name="hadoop-yarn-server-tests" type="test" ext="jar" maven:classifier="tests" />
</dependency>
- <dependency org="org.apache.hadoop" name="hadoop-yarn-server-common" rev="${/org.apache.hadoop/hadoop-yarn-server-common}" conf="test->*" />
- <dependency org="org.apache.hadoop" name="hadoop-yarn-server-nodemanager" rev="${/org.apache.hadoop/hadoop-yarn-server-nodemanager}" conf="test->*" />
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-app" rev="${/org.apache.hadoop/hadoop-mapreduce-client-app}" conf="test->*" />
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-common" rev="${/org.apache.hadoop/hadoop-mapreduce-client-common}" conf="test->*" />
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-hs" rev="${/org.apache.hadoop/hadoop-mapreduce-client-hs}" conf="test->*" />
- <dependency org="org.apache.hadoop" name="hadoop-yarn-server-resourcemanager" rev="${/org.apache.hadoop/hadoop-yarn-server-resourcemanager}" conf="test->*" />
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-shuffle" rev="${/org.apache.hadoop/hadoop-mapreduce-client-shuffle}" conf="test->*" />
- <dependency org="org.apache.hadoop" name="hadoop-yarn-server-web-proxy" rev="${/org.apache.hadoop/hadoop-yarn-server-web-proxy}" conf="test->*" />
-
- <dependency org="aopalliance" name="aopalliance" rev="${/aopalliance/aopalliance}" conf="test->*" />
- <dependency org="com.sun.xml.bind" name="jaxb-impl" rev="${/com.sun.xml.bind/jaxb-impl}" conf="test->*" />
- <dependency org="org.objenesis" name="objenesis" rev="${/org.objenesis/objenesis}" conf="test->*"/>
- <dependency org="io.netty" name="netty" rev="${/io.netty/netty}" conf="test->*" />
-
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient" rev="${/org.apache.hadoop/hadoop-mapreduce-client-jobclient}" conf="test->*">
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-server-common" rev="${/org.apache.hadoop/hadoop-yarn-server-common}" conf="test" />
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-server-nodemanager" rev="${/org.apache.hadoop/hadoop-yarn-server-nodemanager}" conf="test" />
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-app" rev="${/org.apache.hadoop/hadoop-mapreduce-client-app}" conf="test" />
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-common" rev="${/org.apache.hadoop/hadoop-mapreduce-client-common}" conf="test" />
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-hs" rev="${/org.apache.hadoop/hadoop-mapreduce-client-hs}" conf="test" />
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-server-resourcemanager" rev="${/org.apache.hadoop/hadoop-yarn-server-resourcemanager}" conf="test" />
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-shuffle" rev="${/org.apache.hadoop/hadoop-mapreduce-client-shuffle}" conf="test" />
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-server-web-proxy" rev="${/org.apache.hadoop/hadoop-yarn-server-web-proxy}" conf="test" />
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient" rev="${/org.apache.hadoop/hadoop-mapreduce-client-jobclient}" conf="test">
<artifact name="hadoop-mapreduce-client-jobclient" type="jar" ext="jar" />
<artifact name="hadoop-mapreduce-client-jobclient" type="test" ext="jar" maven:classifier="tests" />
</dependency>
- <dependency org="org.apache.mrunit" name="mrunit" rev="${/org.apache.mrunit/mrunit}" conf="test->*">
+ <dependency org="aopalliance" name="aopalliance" rev="${/aopalliance/aopalliance}" conf="test" />
+ <dependency org="com.sun.xml.bind" name="jaxb-impl" rev="${/com.sun.xml.bind/jaxb-impl}" conf="test" />
+ <dependency org="org.objenesis" name="objenesis" rev="${/org.objenesis/objenesis}" conf="test" />
+ <dependency org="io.netty" name="netty" rev="${/io.netty/netty}" conf="test" />
+ <dependency org="org.apache.mrunit" name="mrunit" rev="${/org.apache.mrunit/mrunit}" conf="test">
<artifact name="mrunit" maven:classifier="hadoop2" />
<exclude org="log4j" module="log4j" />
</dependency>
-
- <dependency org="org.mockito" name="mockito-core" rev="${/org.mockito/mockito-core}" conf="test->*" />
+ <dependency org="org.mockito" name="mockito-core" rev="${/org.mockito/mockito-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" />
+
<!-- FasterXml Jackson Dependencies -->
- <dependency org="com.fasterxml.jackson.core" name="jackson-core" rev="${/com.fasterxml.jackson.core/jackson-core}" conf="test->*" />
- <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="${/com.fasterxml.jackson.core/jackson-databind}" conf="test->*" />
- <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="${/com.fasterxml.jackson.core/jackson-annotations}" conf="test->*" />
-
- <!-- CodeHause Jackson Dependencies -->
- <dependency org="org.codehaus.jackson" name="jackson-jaxrs" rev="${/org.codehaus.jackson/jackson-jaxrs}" conf="test->*" />
- <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${/org.codehaus.jackson/jackson-mapper-asl}" conf="test->*" />
- <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${/org.codehaus.jackson/jackson-core-asl}" conf="test->*" />
+ <dependency org="com.fasterxml.jackson.core" name="jackson-core" rev="${/com.fasterxml.jackson.core/jackson-core}" conf="test" />
+ <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="${/com.fasterxml.jackson.core/jackson-databind}" conf="test" />
+ <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="${/com.fasterxml.jackson.core/jackson-annotations}" conf="test" />
+
+ <!-- CodeHaus Jackson Dependencies -->
+ <dependency org="org.codehaus.jackson" name="jackson-jaxrs" rev="${/org.codehaus.jackson/jackson-jaxrs}" conf="test" />
+ <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${/org.codehaus.jackson/jackson-mapper-asl}" conf="test" />
+ <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${/org.codehaus.jackson/jackson-core-asl}" conf="test" />
<!-- Jersey Dependencies -->
- <dependency org="com.sun.jersey.contribs" name="jersey-guice" rev="${/com.sun.jersey.contribs/jersey-guice}" conf="test->*" />
- <dependency org="com.sun.jersey" name="jersey-core" rev="${/com.sun.jersey/jersey-core}" conf="test->*" />
- <dependency org="com.sun.jersey" name="jersey-json" rev="${/com.sun.jersey/jersey-json}" conf="test->*" />
- <dependency org="com.sun.jersey" name="jersey-server" rev="${/com.sun.jersey/jersey-server}" conf="test->*" />
- <dependency org="com.sun.jersey" name="jersey-bundle" rev="${/com.sun.jersey/jersey-bundle}" conf="test->*" />
+ <dependency org="com.sun.jersey.contribs" name="jersey-guice" rev="${/com.sun.jersey.contribs/jersey-guice}" conf="test" />
+ <dependency org="com.sun.jersey" name="jersey-core" rev="${/com.sun.jersey/jersey-core}" conf="test" />
+ <dependency org="com.sun.jersey" name="jersey-json" rev="${/com.sun.jersey/jersey-json}" conf="test" />
+ <dependency org="com.sun.jersey" name="jersey-server" rev="${/com.sun.jersey/jersey-server}" conf="test" />
+ <dependency org="com.sun.jersey" name="jersey-bundle" rev="${/com.sun.jersey/jersey-bundle}" conf="test" />
<!-- Guice Dependencies -->
- <dependency org="com.google.inject" name="guice" rev="${/com.google.inject/guice}" conf="test->*" />
- <dependency org="com.google.inject.extensions" name="guice-servlet" rev="${/com.google.inject.extensions/guice-servlet}" conf="test->*" />
- <dependency org="javax.inject" name="javax.inject" rev="${/javax.inject/javax.inject}" conf="test->*" />
+ <dependency org="com.google.inject" name="guice" rev="${/com.google.inject/guice}" conf="test" />
+ <dependency org="com.google.inject.extensions" name="guice-servlet" rev="${/com.google.inject.extensions/guice-servlet}" conf="test" />
+ <dependency org="javax.inject" name="javax.inject" rev="${/javax.inject/javax.inject}" conf="test" />
<!-- Avro Dependencies -->
- <dependency org="org.apache.avro" name="avro" rev="${/org.apache.avro/avro}" conf="test->*" />
- <dependency org="com.thoughtworks.paranamer" name="paranamer" rev="${/com.thoughtworks.paranamer/paranamer}" conf="test->*" />
- <dependency org="org.xerial.snappy" name="snappy-java" rev="${/org.xerial.snappy/snappy-java}" conf="test->*" />
+ <dependency org="org.apache.avro" name="avro" rev="${/org.apache.avro/avro}" conf="test" />
+ <dependency org="com.thoughtworks.paranamer" name="paranamer" rev="${/com.thoughtworks.paranamer/paranamer}" conf="test" />
+ <dependency org="org.xerial.snappy" name="snappy-java" rev="${/org.xerial.snappy/snappy-java}" conf="test" />
<!-- Hadoop DfsMiniCluster Dependencies -->
- <dependency org="org.apache.hadoop" name="hadoop-common" rev="${/org.apache.hadoop/hadoop-common}" conf="test->*">
+ <dependency org="org.apache.hadoop" name="hadoop-common" rev="${/org.apache.hadoop/hadoop-common}" conf="test.DfsMiniCluster">
<artifact name="hadoop-common" type="jar" ext="jar" />
<artifact name="hadoop-common" type="test" ext="jar" maven:classifier="tests" />
</dependency>
- <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${/org.apache.hadoop/hadoop-hdfs}" conf="test->*">
+ <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${/org.apache.hadoop/hadoop-hdfs}" conf="test.DfsMiniCluster">
<artifact name="hadoop-hdfs" type="test" ext="jar" maven:classifier="tests" />
</dependency>
- <dependency org="org.mortbay.jetty" name="jetty" rev="${/org.mortbay.jetty/jetty}" conf="test.DfsMiniCluster->*"/>
- <dependency org="org.mortbay.jetty" name="jetty-util" rev="${/org.mortbay.jetty/jetty-util}" conf="test.DfsMiniCluster->*"/>
- <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->*"/>
+ <dependency org="org.mortbay.jetty" name="jetty" rev="${/org.mortbay.jetty/jetty}" conf="test.DfsMiniCluster" />
+ <dependency org="org.mortbay.jetty" name="jetty-util" rev="${/org.mortbay.jetty/jetty-util}" conf="test.DfsMiniCluster" />
+ <dependency org="com.sun.jersey" name="jersey-core" rev="${/com.sun.jersey/jersey-core}" conf="test.DfsMiniCluster" />
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}" />
Modified: lucene/dev/branches/branch_5x/solr/contrib/uima/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/uima/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/uima/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/uima/ivy.xml Thu Oct 16 21:14:37 2014
@@ -18,19 +18,19 @@
-->
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="uima"/>
- <configurations>
+ <configurations defaultconfmapping="compile->master;test->master">
<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="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->*"/>
+ <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/branches/branch_5x/solr/contrib/velocity/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/velocity/ivy.xml?rev=1632436&r1=1632435&r2=1632436&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/velocity/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/velocity/ivy.xml Thu Oct 16 21:14:37 2014
@@ -18,17 +18,17 @@
-->
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="velocity"/>
- <configurations>
+ <configurations defaultconfmapping="compile->master;test->master">
<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="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->*"/>
+ <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>