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 2013/10/01 23:36:27 UTC
svn commit: r1528222 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/ lucene/analysis/icu/ lucene/analysis/kuromoji/
lucene/analysis/morfologik/ lucene/analysis/phonetic/ lucene/analysis/uima/
lucene/benchmark/ lucene/demo/ lucene/expre...
Author: sarowe
Date: Tue Oct 1 21:36:26 2013
New Revision: 1528222
URL: http://svn.apache.org/r1528222
Log:
LUCENE-5249: All Lucene/Solr modules should use the same dependency versions (merged trunk r1528215)
Added:
lucene/dev/branches/branch_4x/lucene/ivy-versions.properties (props changed)
- copied unchanged from r1528215, lucene/dev/trunk/lucene/ivy-versions.properties
lucene/dev/branches/branch_4x/lucene/licenses/httpclient-4.2.6.jar.sha1
- copied unchanged from r1528215, lucene/dev/trunk/lucene/licenses/httpclient-4.2.6.jar.sha1
lucene/dev/branches/branch_4x/lucene/licenses/httpcore-4.2.5.jar.sha1
- copied unchanged from r1528215, lucene/dev/trunk/lucene/licenses/httpcore-4.2.5.jar.sha1
Removed:
lucene/dev/branches/branch_4x/lucene/licenses/httpclient-4.2.3.jar.sha1
lucene/dev/branches/branch_4x/lucene/licenses/httpcore-4.2.2.jar.sha1
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/icu/ivy.xml
lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/ivy.xml
lucene/dev/branches/branch_4x/lucene/analysis/morfologik/ivy.xml
lucene/dev/branches/branch_4x/lucene/analysis/phonetic/ivy.xml
lucene/dev/branches/branch_4x/lucene/analysis/uima/ivy.xml
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/demo/ivy.xml
lucene/dev/branches/branch_4x/lucene/expressions/ (props changed)
lucene/dev/branches/branch_4x/lucene/expressions/ivy.xml
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (contents, props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_4x/lucene/replicator/ (props changed)
lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ivy.xml
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ivy.xml
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ivy.xml
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/ivy.xml
lucene/dev/branches/branch_4x/solr/contrib/clustering/ivy.xml
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/ivy.xml
lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml
lucene/dev/branches/branch_4x/solr/contrib/langid/ivy.xml
lucene/dev/branches/branch_4x/solr/contrib/uima/ivy.xml
lucene/dev/branches/branch_4x/solr/contrib/velocity/ivy.xml
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ivy.xml
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/example/example-DIH/ivy.xml
lucene/dev/branches/branch_4x/solr/example/ivy.xml
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ivy.xml
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Tue Oct 1 21:36:26 2013
@@ -76,6 +76,11 @@ Changes in backwards compatibility polic
had a custom Directory implementation that extended Directory, you need to
extend BaseDirectory instead. (Adrien Grand)
+Build
+
+* LUCENE-5249: All Lucene/Solr modules should use the same dependency versions
+ (Steve Rowe)
+
======================= Lucene 4.5.0 =======================
New features
Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,7 +19,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="analyzers-icu"/>
<dependencies>
- <dependency org="com.ibm.icu" name="icu4j" rev="49.1" transitive="false"/>
+ <dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/ivy.xml Tue Oct 1 21:36:26 2013
@@ -25,10 +25,10 @@
</configurations>
<dependencies>
- <dependency org="mecab" name="mecab-ipadic" rev="2.7.0-20070801" conf="ipadic->default">
+ <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="0.6.3b-20111013" conf="naist->default">
+ <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>
Modified: lucene/dev/branches/branch_4x/lucene/analysis/morfologik/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/morfologik/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/morfologik/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/morfologik/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,9 +19,9 @@
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="analyzers-morfologik"/>
<dependencies>
- <dependency org="org.carrot2" name="morfologik-polish" rev="1.7.1" transitive="false"/>
- <dependency org="org.carrot2" name="morfologik-fsa" rev="1.7.1" transitive="false"/>
- <dependency org="org.carrot2" name="morfologik-stemming" rev="1.7.1" transitive="false"/>
+ <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>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/lucene/analysis/phonetic/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/phonetic/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/phonetic/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/phonetic/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,7 +19,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="analyzers-phonetic"/>
<dependencies>
- <dependency org="commons-codec" name="commons-codec" rev="1.7" transitive="false"/>
+ <dependency org="commons-codec" name="commons-codec" rev="${/commons-codec/commons-codec}" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/lucene/analysis/uima/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/uima/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/uima/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/uima/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,9 +19,9 @@
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="analyzers-uima"/>
<dependencies>
- <dependency org="org.apache.uima" name="Tagger" rev="2.3.1" transitive="false"/>
- <dependency org="org.apache.uima" name="WhitespaceTokenizer" rev="2.3.1" transitive="false"/>
- <dependency org="org.apache.uima" name="uimaj-core" rev="2.3.1" 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>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,9 +19,9 @@
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="benchmark"/>
<dependencies>
- <dependency org="org.apache.commons" name="commons-compress" rev="1.4.1" transitive="false"/>
- <dependency org="xerces" name="xercesImpl" rev="2.9.1" transitive="false"/>
- <dependency org="net.sourceforge.nekohtml" name="nekohtml" rev="1.9.17" transitive="false"/>
+ <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"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/lucene/demo/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/demo/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/demo/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/demo/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,7 +19,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="core-demo"/>
<dependencies>
- <dependency org="javax.servlet" name="servlet-api" rev="2.4"/>
+ <dependency org="javax.servlet" name="servlet-api" rev="${/javax.servlet/servlet-api}"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/lucene/expressions/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/expressions/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/expressions/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/expressions/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,9 +19,9 @@
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="expressions"/>
<dependencies>
- <dependency org="org.antlr" name="antlr-runtime" rev="3.5" transitive="false"/>
- <dependency org="org.ow2.asm" name="asm" rev="4.1" transitive="false"/>
- <dependency org="org.ow2.asm" name="asm-commons" rev="4.1" transitive="false"/>
+ <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>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/lucene/ivy-settings.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/ivy-settings.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/ivy-settings.xml Tue Oct 1 21:36:26 2013
@@ -21,6 +21,8 @@
<property name="local-maven2-dir" value="${user.home}/.m2/repository/" />
+ <properties file="${ivy.settings.dir}/ivy-versions.properties" override="false"/>
+
<include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
Modified: lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml Tue Oct 1 21:36:26 2013
@@ -31,16 +31,16 @@
</configurations>
<dependencies>
- <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.2.3" transitive="false" conf="http->default"/>
- <dependency org="org.apache.httpcomponents" name="httpcore" rev="4.2.2" transitive="false" conf="http->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-server" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-util" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-io" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-http" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="commons-logging" name="commons-logging" rev="1.1.1" transitive="false" conf="logging->default"/>
- <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016" transitive="false" conf="servlet->default">
+ <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">
<artifact name="javax.servlet" type="orbit" ext="jar"/>
</dependency>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
Modified: lucene/dev/branches/branch_4x/lucene/sandbox/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/sandbox/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/sandbox/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/sandbox/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,7 +19,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="sandbox"/>
<dependencies>
- <dependency org="jakarta-regexp" name="jakarta-regexp" rev="1.4" transitive="false"/>
+ <dependency org="jakarta-regexp" name="jakarta-regexp" rev="${/jakarta-regexp/jakarta-regexp}" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/lucene/spatial/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/spatial/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/spatial/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/spatial/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,7 +19,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="spatial"/>
<dependencies>
- <dependency org="com.spatial4j" name="spatial4j" rev="0.3" transitive="false"/>
+ <dependency org="com.spatial4j" name="spatial4j" rev="${/com.spatial4j/spatial4j}" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/ivy.xml Tue Oct 1 21:36:26 2013
@@ -29,11 +29,11 @@
</configurations>
<dependencies defaultconf="default">
- <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />
+ <dependency org="org.apache.ant" name="ant" rev="${/org.apache.ant/ant}" transitive="false" />
- <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*" />
- <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.10" transitive="false" conf="default->*;junit4-stdalone->*" />
- <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.10" transitive="false" conf="default->*;junit4-stdalone->*" />
+ <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->*" />
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
Modified: lucene/dev/branches/branch_4x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/build.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/build.xml Tue Oct 1 21:36:26 2013
@@ -282,10 +282,11 @@
</target>
<target name="-check-forbidden-java-apis">
+ <property file="${common.dir}/ivy-versions.properties"/> <!-- for commons-io version -->
<forbidden-apis internalRuntimeForbidden="true" classpathref="forbidden-apis.classpath" failOnMissingClasses="false">
<bundledSignatures name="jdk-unsafe-${javac.target}"/>
<bundledSignatures name="jdk-deprecated-${javac.target}"/>
- <bundledSignatures name="commons-io-unsafe-${commons-io.version}"/>
+ <bundledSignatures name="commons-io-unsafe-${/commons-io/commons-io}"/>
<signaturesFileSet dir="${common.dir}/tools/forbiddenApis">
<include name="base.txt" />
<include name="servlet-api.txt" />
Modified: lucene/dev/branches/branch_4x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/common-build.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/common-build.xml Tue Oct 1 21:36:26 2013
@@ -57,10 +57,6 @@
<fileset dir="lib" excludes="${common.classpath.excludes}" erroronmissingdir="false"/>
</path>
- <!-- defined here to be able to make the forbidden-api checker correctly
- reference it. 'ivy.xml' is also referencing this property. -->
- <property name="commons-io.version" value="2.1" />
-
<path id="solr.lucene.libs">
<!-- List of jars that will be used as the foundation for both
the base classpath, as well as copied into the lucene-libs dir
Modified: lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,15 +19,15 @@
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="analysis-extras"/>
<dependencies>
- <dependency org="com.ibm.icu" name="icu4j" rev="49.1" transitive="false"/>
+ <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="1.7.1" transitive="false"/>
- <dependency org="org.carrot2" name="morfologik-fsa" rev="1.7.1" transitive="false"/>
- <dependency org="org.carrot2" name="morfologik-stemming" rev="1.7.1" transitive="false"/>
+ <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>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/solr/contrib/clustering/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/clustering/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/clustering/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/clustering/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,17 +19,17 @@
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="clustering"/>
<dependencies>
- <dependency org="org.carrot2" name="carrot2-mini" rev="3.8.0" transitive="false"/>
+ <dependency org="org.carrot2" name="carrot2-mini" rev="${/org.carrot2/carrot2-mini}" transitive="false"/>
- <dependency org="com.carrotsearch" name="hppc" rev="0.5.2" transitive="false"/>
- <dependency org="org.carrot2.attributes" name="attributes-binder" rev="1.2.0" transitive="false"/>
- <dependency org="org.simpleframework" name="simple-xml" rev="2.7" 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="0.6" transitive="false"/>
- <dependency org="org.apache.mahout" name="mahout-collections" rev="1.0" 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="1.7.4" transitive="false"/>
- <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.7.4" 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.
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/ivy.xml Tue Oct 1 21:36:26 2013
@@ -23,10 +23,10 @@
<conf name="test" transitive="false"/>
</configurations>
<dependencies>
- <dependency org="javax.activation" name="activation" rev="1.1" conf="compile->*"/>
- <dependency org="javax.mail" name="mail" rev="1.4.1" conf="compile->*"/>
+ <dependency org="javax.activation" name="activation" rev="${/javax.activation/activation}" conf="compile->*"/>
+ <dependency org="javax.mail" name="mail" rev="${/javax.mail/mail}" conf="compile->*"/>
- <dependency org="org.easymock" name="easymock" rev="3.0" conf="test->*"/>
+ <dependency org="org.easymock" name="easymock" rev="${/org.easymock/easymock}" conf="test->*"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
Modified: lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml Tue Oct 1 21:36:26 2013
@@ -20,39 +20,39 @@
<info organisation="org.apache.solr" module="extraction"/>
<dependencies>
<!-- Tika JARs -->
- <dependency org="org.apache.tika" name="tika-core" rev="1.4" transitive="false"/>
- <dependency org="org.apache.tika" name="tika-parsers" rev="1.4" transitive="false"/>
+ <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"/>
<!-- 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="0.1" transitive="false"/>
- <dependency org="org.gagravarr" name="vorbis-java-core" rev="0.1" transitive="false"/>
- <dependency org="edu.ucar" name="netcdf" rev="4.2-min" transitive="false"/>
- <dependency org="org.apache.james" name="apache-mime4j-core" rev="0.7.2" transitive="false"/>
- <dependency org="org.apache.james" name="apache-mime4j-dom" rev="0.7.2" transitive="false"/>
- <dependency org="org.apache.commons" name="commons-compress" rev="1.4.1" transitive="false"/>
- <dependency org="org.apache.pdfbox" name="pdfbox" rev="1.8.1" transitive="false"/>
- <dependency org="org.apache.pdfbox" name="fontbox" rev="1.8.1" transitive="false"/>
- <dependency org="org.apache.pdfbox" name="jempbox" rev="1.8.1" transitive="false"/>
- <dependency org="org.bouncycastle" name="bcmail-jdk15" rev="1.45" transitive="false"/>
- <dependency org="org.bouncycastle" name="bcprov-jdk15" rev="1.45" transitive="false"/>
- <dependency org="org.apache.poi" name="poi" rev="3.9" transitive="false"/>
- <dependency org="org.apache.poi" name="poi-scratchpad" rev="3.9" transitive="false"/>
- <dependency org="org.apache.poi" name="poi-ooxml" rev="3.9" transitive="false"/>
- <dependency org="org.apache.poi" name="poi-ooxml-schemas" rev="3.9" transitive="false"/>
- <dependency org="org.apache.xmlbeans" name="xmlbeans" rev="2.3.0" transitive="false"/>
- <dependency org="dom4j" name="dom4j" rev="1.6.1" transitive="false"/>
- <dependency org="org.ccil.cowan.tagsoup" name="tagsoup" rev="1.2.1" transitive="false"/>
- <dependency org="com.googlecode.mp4parser" name="isoparser" rev="1.0-RC-1" transitive="false"/>
- <dependency org="com.drewnoakes" name="metadata-extractor" rev="2.6.2" transitive="false"/>
- <dependency org="de.l3s.boilerpipe" name="boilerpipe" rev="1.1.0" transitive="false"/>
- <dependency org="rome" name="rome" rev="0.9" transitive="false"/>
- <dependency org="jdom" name="jdom" rev="1.0" transitive="false"/>
- <dependency org="com.googlecode.juniversalchardet" name="juniversalchardet" rev="1.0.3" transitive="false"/>
- <dependency org="org.tukaani" name="xz" rev="1.0" transitive="false"/>
+ <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="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"/>
<!-- Other ExtracingRequestHandler dependencies -->
- <dependency org="com.ibm.icu" name="icu4j" rev="49.1" transitive="false"/>
- <dependency org="xerces" name="xercesImpl" rev="2.9.1" transitive="false"/>
+ <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>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/solr/contrib/langid/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/langid/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/langid/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/langid/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,8 +19,8 @@
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="langid"/>
<dependencies>
- <dependency org="com.cybozu.labs" name="langdetect" rev="1.1-20120112" transitive="false"/>
- <dependency org="net.arnx" name="jsonic" rev="1.2.7" transitive="false"/>
+ <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>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/solr/contrib/uima/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/uima/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/uima/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/uima/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,12 +19,12 @@
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="uima"/>
<dependencies>
- <dependency org="commons-digester" name="commons-digester" rev="2.0" transitive="false"/>
- <dependency org="org.apache.uima" name="AlchemyAPIAnnotator" rev="2.3.1" transitive="false"/>
- <dependency org="org.apache.uima" name="OpenCalaisAnnotator" rev="2.3.1" transitive="false"/>
- <dependency org="org.apache.uima" name="Tagger" rev="2.3.1" transitive="false"/>
- <dependency org="org.apache.uima" name="WhitespaceTokenizer" rev="2.3.1" transitive="false"/>
- <dependency org="org.apache.uima" name="uimaj-core" rev="2.3.1" transitive="false"/>
+ <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>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/solr/contrib/velocity/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/velocity/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/velocity/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/velocity/ivy.xml Tue Oct 1 21:36:26 2013
@@ -19,10 +19,10 @@
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="velocity"/>
<dependencies>
- <dependency org="commons-beanutils" name="commons-beanutils" rev="1.7.0" transitive="false"/>
- <dependency org="commons-collections" name="commons-collections" rev="3.2.1" transitive="false"/>
- <dependency org="org.apache.velocity" name="velocity" rev="1.7" transitive="false"/>
- <dependency org="org.apache.velocity" name="velocity-tools" rev="2.0" transitive="false"/>
+ <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>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/core/ivy.xml Tue Oct 1 21:36:26 2013
@@ -16,9 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE ivy-module [
- <!ENTITY hadoop.version "2.0.5-alpha">
-]>
<ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.solr" module="core"/>
@@ -32,46 +29,46 @@
</configurations>
<dependencies>
- <dependency org="commons-codec" name="commons-codec" rev="1.7" conf="compile->*"/>
- <dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.1" conf="compile->*"/>
- <dependency org="commons-cli" name="commons-cli" rev="1.2" conf="compile->*"/>
- <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="compile->*"/>
- <dependency org="com.google.guava" name="guava" rev="14.0.1" conf="compile->*"/>
- <dependency org="com.spatial4j" name="spatial4j" rev="0.3" conf="compile->*"/>
- <dependency org="org.restlet.jee" name="org.restlet" rev="2.1.1" conf="compile->*"/>
- <dependency org="org.restlet.jee" name="org.restlet.ext.servlet" rev="2.1.1" conf="compile->*"/>
- <dependency org="joda-time" name="joda-time" rev="2.2" conf="compile->*"/>
- <dependency org="dom4j" name="dom4j" rev="1.6.1" transitive="false"/>
+ <dependency org="commons-codec" name="commons-codec" rev="${/commons-codec/commons-codec}" conf="compile->*"/>
+ <dependency org="commons-fileupload" name="commons-fileupload" rev="${/commons-fileupload/commons-fileupload}" conf="compile->*"/>
+ <dependency org="commons-cli" name="commons-cli" rev="${/commons-cli/commons-cli}" conf="compile->*"/>
+ <dependency org="commons-lang" name="commons-lang" rev="${/commons-lang/commons-lang}" conf="compile->*"/>
+ <dependency org="com.google.guava" name="guava" rev="${/com.google.guava/guava}" conf="compile->*"/>
+ <dependency org="com.spatial4j" name="spatial4j" rev="${/com.spatial4j/spatial4j}" conf="compile->*"/>
+ <dependency org="org.restlet.jee" name="org.restlet" rev="${/org.restlet.jee/org.restlet}" conf="compile->*"/>
+ <dependency org="org.restlet.jee" name="org.restlet.ext.servlet" rev="${/org.restlet.jee/org.restlet.ext.servlet}" conf="compile->*"/>
+ <dependency org="joda-time" name="joda-time" rev="${/joda-time/joda-time}" conf="compile->*"/>
+ <dependency org="dom4j" name="dom4j" rev="${/dom4j/dom4j}" transitive="false"/>
- <dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" conf="test->*"/>
- <dependency org="org.easymock" name="easymock" rev="3.0" conf="test->*"/>
- <dependency org="cglib" name="cglib-nodep" rev="2.2" conf="test->*"/>
- <dependency org="org.objenesis" name="objenesis" rev="1.2" conf="test->*"/>
+ <dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}" conf="test->*"/>
+ <dependency org="org.easymock" name="easymock" rev="${/org.easymock/easymock}" conf="test->*"/>
+ <dependency org="cglib" name="cglib-nodep" rev="${/cglib/cglib-nodep}" conf="test->*"/>
+ <dependency org="org.objenesis" name="objenesis" rev="${/org.objenesis/objenesis}" conf="test->*"/>
- <dependency org="org.apache.hadoop" name="hadoop-common" rev="&hadoop.version;" conf="compile.hadoop->*"/>
+ <dependency org="org.apache.hadoop" name="hadoop-common" rev="${/org.apache.hadoop/hadoop-common}" conf="compile.hadoop->*"/>
<!--
hadoop-hdfs, hadoop-annotations and hadoop-auth are runtime dependencies,
so even though they are not compile-time dependencies, they are included
here as such so that they are included in the runtime distribution.
-->
- <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="&hadoop.version;" conf="compile.hadoop->*"/>
- <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="&hadoop.version;" conf="compile.hadoop->*"/>
- <dependency org="org.apache.hadoop" name="hadoop-auth" rev="&hadoop.version;" conf="compile.hadoop->*"/>
- <dependency org="commons-configuration" name="commons-configuration" rev="1.6" conf="compile.hadoop->*"/>
- <dependency org="com.google.protobuf" name="protobuf-java" rev="2.4.0a" conf="compile.hadoop->*"/>
- <dependency org="com.googlecode.concurrentlinkedhashmap" name="concurrentlinkedhashmap-lru" rev="1.2" conf="compile.hadoop->*"/>
+ <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${/org.apache.hadoop/hadoop-hdfs}" conf="compile.hadoop->*"/>
+ <dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${/org.apache.hadoop/hadoop-annotations}" conf="compile.hadoop->*"/>
+ <dependency org="org.apache.hadoop" name="hadoop-auth" rev="${/org.apache.hadoop/hadoop-auth}" conf="compile.hadoop->*"/>
+ <dependency org="commons-configuration" name="commons-configuration" rev="${/commons-configuration/commons-configuration}" conf="compile.hadoop->*"/>
+ <dependency org="com.google.protobuf" name="protobuf-java" rev="${/com.google.protobuf/protobuf-java}" conf="compile.hadoop->*"/>
+ <dependency org="com.googlecode.concurrentlinkedhashmap" name="concurrentlinkedhashmap-lru" rev="${/com.googlecode.concurrentlinkedhashmap/concurrentlinkedhashmap-lru}" conf="compile.hadoop->*"/>
<!-- Hadoop DfsMiniCluster Dependencies-->
- <dependency org="org.apache.hadoop" name="hadoop-common" rev="&hadoop.version;" conf="test.DfsMiniCluster->*">
+ <dependency org="org.apache.hadoop" name="hadoop-common" rev="${/org.apache.hadoop/hadoop-common}" conf="test.DfsMiniCluster->*">
<artifact name="hadoop-common" type="test" ext="jar" maven:classifier="tests" />
</dependency>
- <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="&hadoop.version;" conf="test.DfsMiniCluster->*">
+ <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="6.1.26" conf="test.DfsMiniCluster->*"/>
- <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" conf="test.DfsMiniCluster->*"/>
- <dependency org="com.sun.jersey" name="jersey-core" rev="1.16" conf="test.DfsMiniCluster->*"/>
- <dependency org="commons-collections" name="commons-collections" rev="3.2.1" conf="test.DfsMiniCluster->*"/>
+ <dependency org="org.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->*"/>
+ <dependency org="commons-collections" name="commons-collections" rev="${/commons-collections/commons-collections}" conf="test.DfsMiniCluster->*"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/ivy.xml Tue Oct 1 21:36:26 2013
@@ -20,8 +20,8 @@
<info organisation="org.apache.solr" module="example-DIH"/>
<dependencies>
- <dependency org="hsqldb" name="hsqldb" rev="1.8.0.10" transitive="false"/>
- <dependency org="org.apache.derby" name="derby" rev="10.9.1.0" transitive="false"/>
+ <dependency org="hsqldb" name="hsqldb" rev="${/hsqldb/hsqldb}" transitive="false"/>
+ <dependency org="org.apache.derby" name="derby" rev="${/org.apache.derby/derby}" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/solr/example/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/ivy.xml Tue Oct 1 21:36:26 2013
@@ -16,9 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE ivy-module [
- <!ENTITY jetty.version "8.1.10.v20130312">
-]>
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="example"/>
<configurations>
@@ -30,24 +27,24 @@
<dependencies>
- <dependency org="log4j" name="log4j" rev="1.2.16" transitive="false" conf="logging->default"/>
- <dependency org="org.slf4j" name="slf4j-api" rev="1.6.6" transitive="false" conf="logging->default"/>
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.6.6" transitive="false" conf="logging->default"/>
- <dependency org="org.slf4j" name="jul-to-slf4j" rev="1.6.6" transitive="false" conf="logging->default"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.6" transitive="false" conf="logging->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-deploy" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-http" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-io" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-jmx" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-security" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-server" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-util" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-xml" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.eclipse.jetty" name="jetty-start" rev="&jetty.version;" transitive="false" conf="start->default"/>
- <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016" transitive="false" conf="servlet->default">
+ <dependency org="log4j" name="log4j" rev="${/log4j/log4j}" transitive="false" conf="logging->default"/>
+ <dependency org="org.slf4j" name="slf4j-api" rev="${/org.slf4j/slf4j-api}" transitive="false" conf="logging->default"/>
+ <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" transitive="false" conf="logging->default"/>
+ <dependency org="org.slf4j" name="jul-to-slf4j" rev="${/org.slf4j/jul-to-slf4j}" transitive="false" conf="logging->default"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="${/org.slf4j/slf4j-log4j12}" transitive="false" conf="logging->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-deploy" rev="${/org.eclipse.jetty/jetty-deploy}" 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="org.eclipse.jetty" name="jetty-io" rev="${/org.eclipse.jetty/jetty-io}" transitive="false" conf="jetty->default"/>
+ <dependency org="org.eclipse.jetty" name="jetty-jmx" rev="${/org.eclipse.jetty/jetty-jmx}" transitive="false" conf="jetty->default"/>
+ <dependency org="org.eclipse.jetty" name="jetty-security" rev="${/org.eclipse.jetty/jetty-security}" transitive="false" conf="jetty->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-webapp" rev="${/org.eclipse.jetty/jetty-webapp}" transitive="false" conf="jetty->default"/>
+ <dependency org="org.eclipse.jetty" name="jetty-xml" rev="${/org.eclipse.jetty/jetty-xml}" transitive="false" conf="jetty->default"/>
+ <dependency org="org.eclipse.jetty" name="jetty-start" rev="${/org.eclipse.jetty/jetty-start}" transitive="false" conf="start->default"/>
+ <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="${/org.eclipse.jetty.orbit/javax.servlet}" transitive="false" conf="servlet->default">
<artifact name="javax.servlet" type="orbit" ext="jar"/>
</dependency>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
Modified: lucene/dev/branches/branch_4x/solr/solrj/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/ivy.xml Tue Oct 1 21:36:26 2013
@@ -20,15 +20,15 @@
<info organisation="org.apache.solr" module="solrj"/>
<dependencies>
- <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.4.5" transitive="false"/>
- <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.2.6" transitive="false"/>
+ <dependency org="org.apache.zookeeper" name="zookeeper" rev="${/org.apache.zookeeper/zookeeper}" transitive="false"/>
+ <dependency org="org.apache.httpcomponents" name="httpclient" rev="${/org.apache.httpcomponents/httpclient}" transitive="false"/>
<!--
The httpmime rev should be kept in sync with the httpclient rev, since both the
httpclient and the httpmime modules are sub-modules of the httpcomponents-client
module, and both sub-modules draw their version from the httpcomponents-client
parent POM.
-->
- <dependency org="org.apache.httpcomponents" name="httpmime" rev="4.2.6" transitive="false"/>
+ <dependency org="org.apache.httpcomponents" name="httpmime" rev="${/org.apache.httpcomponents/httpmime}" transitive="false"/>
<!--
The httpcore rev should be drawn from the httpcomponents-client POM (the parent POM
of the httpclient POM - see the comment above) - the httpclient version and the httpcore
@@ -38,15 +38,15 @@
- look for <httpcore.version> under <properties>:
https://svn.apache.org/repos/asf/httpcomponents/httpclient/tags/4.2.3/pom.xml
-->
- <dependency org="org.apache.httpcomponents" name="httpcore" rev="4.2.5" transitive="false"/>
- <dependency org="commons-io" name="commons-io" rev="${commons-io.version}" transitive="false"/>
- <dependency org="org.codehaus.woodstox" name="wstx-asl" rev="3.2.7" transitive="false"/>
- <dependency org="org.noggit" name="noggit" rev="0.5" transitive="false"/>
- <dependency org="log4j" name="log4j" rev="1.2.16" transitive="false"/>
- <dependency org="org.slf4j" name="slf4j-api" rev="1.6.6" transitive="false"/>
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.6.6" transitive="false"/>
- <dependency org="org.slf4j" name="jul-to-slf4j" rev="1.6.6" transitive="false"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.6" transitive="false"/>
+ <dependency org="org.apache.httpcomponents" name="httpcore" rev="${/org.apache.httpcomponents/httpcore}" transitive="false"/>
+ <dependency org="commons-io" name="commons-io" rev="${/commons-io/commons-io}" transitive="false"/>
+ <dependency org="org.codehaus.woodstox" name="wstx-asl" rev="${/org.codehaus.woodstox/wstx-asl}" transitive="false"/>
+ <dependency org="org.noggit" name="noggit" rev="${/org.noggit/noggit}" transitive="false"/>
+ <dependency org="log4j" name="log4j" rev="${/log4j/log4j}" transitive="false"/>
+ <dependency org="org.slf4j" name="slf4j-api" rev="${/org.slf4j/slf4j-api}" transitive="false"/>
+ <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${/org.slf4j/jcl-over-slf4j}" transitive="false"/>
+ <dependency org="org.slf4j" name="jul-to-slf4j" rev="${/org.slf4j/jul-to-slf4j}" transitive="false"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="${/org.slf4j/slf4j-log4j12}" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml?rev=1528222&r1=1528221&r2=1528222&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml Tue Oct 1 21:36:26 2013
@@ -32,13 +32,13 @@
</configurations>
<dependencies defaultconf="default">
- <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />
+ <dependency org="org.apache.ant" name="ant" rev="${/org.apache.ant/ant}" transitive="false" />
- <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*">
+ <dependency org="junit" name="junit" rev="${/junit/junit}" transitive="false" conf="default->*;junit4-stdalone->*">
<exclude org="org.hamcrest" module="hamcrest-core"/>
</dependency>
- <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.10" transitive="false" conf="default->*;junit4-stdalone->*" />
- <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.10" transitive="false" conf="default->*;junit4-stdalone->*" />
+ <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->*" />
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>