You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/03/30 14:58:51 UTC
svn commit: r1307390 - in /lucene/dev/branches/lucene3930: lucene/
lucene/contrib/demo/ lucene/contrib/sandbox/ lucene/test-framework/
modules/analysis/icu/ modules/analysis/morfologik/
modules/analysis/phonetic/ modules/analysis/uima/ modules/benchmar...
Author: rmuir
Date: Fri Mar 30 12:58:50 2012
New Revision: 1307390
URL: http://svn.apache.org/viewvc?rev=1307390&view=rev
Log:
LUCENE-3930: commit Jan's patch to exclude src/javadocs in ivy downloads
Modified:
lucene/dev/branches/lucene3930/lucene/common-build.xml
lucene/dev/branches/lucene3930/lucene/contrib/demo/ivy.xml
lucene/dev/branches/lucene3930/lucene/contrib/sandbox/ivy.xml
lucene/dev/branches/lucene3930/lucene/test-framework/ivy.xml
lucene/dev/branches/lucene3930/modules/analysis/icu/ivy.xml
lucene/dev/branches/lucene3930/modules/analysis/morfologik/ivy.xml
lucene/dev/branches/lucene3930/modules/analysis/phonetic/ivy.xml
lucene/dev/branches/lucene3930/modules/analysis/uima/ivy.xml
lucene/dev/branches/lucene3930/modules/benchmark/ivy.xml
lucene/dev/branches/lucene3930/modules/spatial/ivy.xml
lucene/dev/branches/lucene3930/solr/contrib/analysis-extras/ivy.xml
lucene/dev/branches/lucene3930/solr/contrib/clustering/ivy.xml
lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler/ivy.xml
lucene/dev/branches/lucene3930/solr/contrib/extraction/ivy.xml
lucene/dev/branches/lucene3930/solr/contrib/uima/ivy.xml
lucene/dev/branches/lucene3930/solr/contrib/velocity/ivy.xml
lucene/dev/branches/lucene3930/solr/core/ivy.xml
lucene/dev/branches/lucene3930/solr/example/example-DIH/ivy.xml
lucene/dev/branches/lucene3930/solr/example/ivy.xml
lucene/dev/branches/lucene3930/solr/solrj/ivy.xml
Modified: lucene/dev/branches/lucene3930/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/common-build.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene3930/lucene/common-build.xml Fri Mar 30 12:58:50 2012
@@ -221,6 +221,13 @@
excludes="**/pom.xml,**/*.iml,site/build/"
/>
+ <!-- Default exclude sources and javadoc jars from Ivy fetch to save time and bandwidth -->
+ <condition property="ivy.exclude.types"
+ value=""
+ else="source|javadoc">
+ <isset property="fetch.sources.javadocs"/>
+ </condition>
+
<!-- Import custom ANT tasks. -->
<import file="${common.dir}/tools/custom-tasks.xml" />
Modified: lucene/dev/branches/lucene3930/lucene/contrib/demo/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/contrib/demo/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/contrib/demo/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/lucene/contrib/demo/ivy.xml Fri Mar 30 12:58:50 2012
@@ -20,5 +20,6 @@
<info organisation="org.apache.lucene" module="core-demo"/>
<dependencies>
<dependency org="javax.servlet" name="servlet-api" rev="2.4"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/lucene/contrib/sandbox/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/contrib/sandbox/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/contrib/sandbox/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/lucene/contrib/sandbox/ivy.xml Fri Mar 30 12:58:50 2012
@@ -20,5 +20,6 @@
<info organisation="org.apache.lucene" module="sandbox"/>
<dependencies>
<dependency org="jakarta-regexp" name="jakarta-regexp" rev="1.4" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/lucene/test-framework/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/test-framework/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/test-framework/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/lucene/test-framework/ivy.xml Fri Mar 30 12:58:50 2012
@@ -22,5 +22,6 @@
<dependency org="org.apache.ant" name="ant" rev="1.7.1" transitive="false"/>
<dependency org="org.apache.ant" name="ant-junit" rev="1.7.1" transitive="false"/>
<dependency org="junit" name="junit" rev="4.10" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/modules/analysis/icu/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/modules/analysis/icu/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/modules/analysis/icu/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/modules/analysis/icu/ivy.xml Fri Mar 30 12:58:50 2012
@@ -20,5 +20,6 @@
<info organisation="org.apache.lucene" module="analyzers-icu"/>
<dependencies>
<dependency org="com.ibm.icu" name="icu4j" rev="4.8.1.1" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/modules/analysis/morfologik/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/modules/analysis/morfologik/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/modules/analysis/morfologik/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/modules/analysis/morfologik/ivy.xml Fri Mar 30 12:58:50 2012
@@ -22,5 +22,6 @@
<dependency org="org.carrot2" name="morfologik-polish" rev="1.5.2" transitive="false"/>
<dependency org="org.carrot2" name="morfologik-fsa" rev="1.5.2" transitive="false"/>
<dependency org="org.carrot2" name="morfologik-stemming" rev="1.5.2" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/modules/analysis/phonetic/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/modules/analysis/phonetic/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/modules/analysis/phonetic/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/modules/analysis/phonetic/ivy.xml Fri Mar 30 12:58:50 2012
@@ -20,5 +20,6 @@
<info organisation="org.apache.lucene" module="analyzers-phonetic"/>
<dependencies>
<dependency org="commons-codec" name="commons-codec" rev="1.6" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/modules/analysis/uima/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/modules/analysis/uima/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/modules/analysis/uima/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/modules/analysis/uima/ivy.xml Fri Mar 30 12:58:50 2012
@@ -22,5 +22,6 @@
<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"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/modules/benchmark/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/modules/benchmark/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/modules/benchmark/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/modules/benchmark/ivy.xml Fri Mar 30 12:58:50 2012
@@ -21,5 +21,6 @@
<dependencies>
<dependency org="org.apache.commons" name="commons-compress" rev="1.2" transitive="false"/>
<dependency org="xerces" name="xercesImpl" rev="2.9.1" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/modules/spatial/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/modules/spatial/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/modules/spatial/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/modules/spatial/ivy.xml Fri Mar 30 12:58:50 2012
@@ -20,5 +20,6 @@
<info organisation="org.apache.lucene" module="spatial"/>
<dependencies>
<dependency org="com.spatial4j" name="spatial4j" rev="0.2" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/solr/contrib/analysis-extras/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/contrib/analysis-extras/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/contrib/analysis-extras/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/solr/contrib/analysis-extras/ivy.xml Fri Mar 30 12:58:50 2012
@@ -20,5 +20,6 @@
<info organisation="org.apache.solr" module="analysis-extras"/>
<dependencies>
<dependency org="com.ibm.icu" name="icu4j" rev="4.8.1.1" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/solr/contrib/clustering/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/contrib/clustering/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/contrib/clustering/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/solr/contrib/clustering/ivy.xml Fri Mar 30 12:58:50 2012
@@ -26,5 +26,6 @@
<dependency org="org.apache.mahout" name="mahout-collections" rev="0.3" transitive="false"/>
<dependency org="org.apache.mahout" name="mahout-math" rev="0.3" transitive="false"/>
<dependency org="org.simpleframework" name="simple-xml" rev="2.4.1" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler/ivy.xml Fri Mar 30 12:58:50 2012
@@ -21,5 +21,6 @@
<dependencies>
<dependency org="javax.activation" name="activation" rev="1.1" transitive="false"/>
<dependency org="javax.mail" name="mail" rev="1.4.1" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/contrib/extraction/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/solr/contrib/extraction/ivy.xml Fri Mar 30 12:58:50 2012
@@ -45,5 +45,6 @@
<dependency org="xerces" name="xercesImpl" rev="2.8.1" transitive="false"/>
<dependency org="xml-apis" name="xml-apis" rev="1.0.b2" transitive="false"/>
<dependency org="org.apache.xmlbeans" name="xmlbeans" rev="2.3.0" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/solr/contrib/uima/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/contrib/uima/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/contrib/uima/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/solr/contrib/uima/ivy.xml Fri Mar 30 12:58:50 2012
@@ -25,5 +25,6 @@
<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"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/solr/contrib/velocity/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/contrib/velocity/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/contrib/velocity/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/solr/contrib/velocity/ivy.xml Fri Mar 30 12:58:50 2012
@@ -23,5 +23,6 @@
<dependency org="commons-collections" name="commons-collections" rev="3.2.1" transitive="false"/>
<dependency org="org.apache.velocity" name="velocity" rev="1.6.4" transitive="false"/>
<dependency org="org.apache.velocity" name="velocity-tools" rev="2.0" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/core/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/core/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/solr/core/ivy.xml Fri Mar 30 12:58:50 2012
@@ -36,5 +36,6 @@
<dependency org="com.spatial4j" name="spatial4j" rev="0.2" transitive="false"/>
<dependency org="junit" name="junit" rev="4.10" transitive="false"/>
<dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/solr/example/example-DIH/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/example/example-DIH/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/example/example-DIH/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/solr/example/example-DIH/ivy.xml Fri Mar 30 12:58:50 2012
@@ -21,5 +21,6 @@
<dependencies>
<dependency org="hsqldb" name="hsqldb" rev="1.8.0.10" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/solr/example/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/example/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/example/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/solr/example/ivy.xml Fri Mar 30 12:58:50 2012
@@ -38,5 +38,6 @@
<dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016" transitive="false" conf="servlet->default">
<artifact name="javax.servlet" type="orbit" ext="jar"/>
</dependency>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3930/solr/solrj/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/solrj/ivy.xml?rev=1307390&r1=1307389&r2=1307390&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/solrj/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/solr/solrj/ivy.xml Fri Mar 30 12:58:50 2012
@@ -31,5 +31,6 @@
<dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" transitive="false"/>
<dependency org="org.slf4j" name="slf4j-jdk14" rev="1.6.1" transitive="false"/>
<dependency org="junit" name="junit" rev="4.10" transitive="false"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>