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 20:04:50 UTC
svn commit: r1307563 - in /lucene/dev/trunk: ./ dev-tools/eclipse/
dev-tools/idea/.idea/libraries/ dev-tools/idea/lucene/ dev-tools/maven/
dev-tools/maven/solr/core/ lucene/ lucene/backwards/ lucene/contrib/
lucene/contrib/demo/ lucene/contrib/demo/lib...
Author: rmuir
Date: Fri Mar 30 18:04:43 2012
New Revision: 1307563
URL: http://svn.apache.org/viewvc?rev=1307563&view=rev
Log:
LUCENE-3930: nuke jars from source tree and use ivy
Added:
lucene/dev/trunk/lucene/contrib/demo/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/lucene/contrib/demo/ivy.xml
lucene/dev/trunk/lucene/contrib/highlighter/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/lucene/contrib/highlighter/ivy.xml
lucene/dev/trunk/lucene/contrib/memory/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/lucene/contrib/memory/ivy.xml
lucene/dev/trunk/lucene/contrib/misc/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/lucene/contrib/misc/ivy.xml
lucene/dev/trunk/lucene/contrib/sandbox/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/lucene/contrib/sandbox/ivy.xml
lucene/dev/trunk/lucene/core/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/lucene/core/ivy.xml
lucene/dev/trunk/lucene/test-framework/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/lucene/test-framework/ivy.xml
lucene/dev/trunk/lucene/test-framework/lib/ (props changed)
- copied from r1307554, lucene/dev/branches/lucene3930/lucene/test-framework/lib/
lucene/dev/trunk/lucene/tools/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/lucene/tools/ivy.xml
lucene/dev/trunk/modules/analysis/common/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/analysis/common/ivy.xml
lucene/dev/trunk/modules/analysis/icu/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/analysis/icu/ivy.xml
lucene/dev/trunk/modules/analysis/kuromoji/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/analysis/kuromoji/ivy.xml
lucene/dev/trunk/modules/analysis/morfologik/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/analysis/morfologik/ivy.xml
lucene/dev/trunk/modules/analysis/phonetic/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/analysis/phonetic/ivy.xml
lucene/dev/trunk/modules/analysis/smartcn/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/analysis/smartcn/ivy.xml
lucene/dev/trunk/modules/analysis/stempel/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/analysis/stempel/ivy.xml
lucene/dev/trunk/modules/analysis/uima/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/analysis/uima/ivy.xml
lucene/dev/trunk/modules/analysis/uima/lib/Tagger-LICENSE-ASL.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/analysis/uima/lib/Tagger-LICENSE-ASL.txt
lucene/dev/trunk/modules/analysis/uima/lib/Tagger-NOTICE.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/analysis/uima/lib/Tagger-NOTICE.txt
lucene/dev/trunk/modules/analysis/uima/lib/WhitespaceTokenizer-LICENSE-ASL.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/analysis/uima/lib/WhitespaceTokenizer-LICENSE-ASL.txt
lucene/dev/trunk/modules/analysis/uima/lib/WhitespaceTokenizer-NOTICE.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/analysis/uima/lib/WhitespaceTokenizer-NOTICE.txt
lucene/dev/trunk/modules/benchmark/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/benchmark/ivy.xml
lucene/dev/trunk/modules/facet/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/facet/ivy.xml
lucene/dev/trunk/modules/grouping/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/grouping/ivy.xml
lucene/dev/trunk/modules/join/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/join/ivy.xml
lucene/dev/trunk/modules/queries/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/queries/ivy.xml
lucene/dev/trunk/modules/queryparser/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/queryparser/ivy.xml
lucene/dev/trunk/modules/spatial/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/spatial/ivy.xml
lucene/dev/trunk/modules/suggest/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/modules/suggest/ivy.xml
lucene/dev/trunk/solr/contrib/analysis-extras/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/analysis-extras/ivy.xml
lucene/dev/trunk/solr/contrib/clustering/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/clustering/ivy.xml
lucene/dev/trunk/solr/contrib/dataimporthandler-extras/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler-extras/ivy.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler/ivy.xml
lucene/dev/trunk/solr/contrib/extraction/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/extraction/ivy.xml
lucene/dev/trunk/solr/contrib/langid/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/langid/ivy.xml
lucene/dev/trunk/solr/contrib/uima/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/uima/ivy.xml
lucene/dev/trunk/solr/contrib/uima/lib/AlchemyAPIAnnotator-LICENSE-ASL.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/uima/lib/AlchemyAPIAnnotator-LICENSE-ASL.txt
lucene/dev/trunk/solr/contrib/uima/lib/AlchemyAPIAnnotator-NOTICE.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/uima/lib/AlchemyAPIAnnotator-NOTICE.txt
lucene/dev/trunk/solr/contrib/uima/lib/OpenCalaisAnnotator-LICENSE-ASL.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/uima/lib/OpenCalaisAnnotator-LICENSE-ASL.txt
lucene/dev/trunk/solr/contrib/uima/lib/OpenCalaisAnnotator-NOTICE.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/uima/lib/OpenCalaisAnnotator-NOTICE.txt
lucene/dev/trunk/solr/contrib/uima/lib/Tagger-LICENSE-ASL.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/uima/lib/Tagger-LICENSE-ASL.txt
lucene/dev/trunk/solr/contrib/uima/lib/Tagger-NOTICE.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/uima/lib/Tagger-NOTICE.txt
lucene/dev/trunk/solr/contrib/uima/lib/WhitespaceTokenizer-LICENSE-ASL.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/uima/lib/WhitespaceTokenizer-LICENSE-ASL.txt
lucene/dev/trunk/solr/contrib/uima/lib/WhitespaceTokenizer-NOTICE.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/uima/lib/WhitespaceTokenizer-NOTICE.txt
lucene/dev/trunk/solr/contrib/velocity/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/contrib/velocity/ivy.xml
lucene/dev/trunk/solr/core/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/core/ivy.xml
lucene/dev/trunk/solr/core/src/java/org/apache/solr/internal/
- copied from r1307554, lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/internal/
lucene/dev/trunk/solr/example/build.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/example/build.xml
lucene/dev/trunk/solr/example/example-DIH/build.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/example/example-DIH/build.xml
lucene/dev/trunk/solr/example/example-DIH/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/example/example-DIH/ivy.xml
lucene/dev/trunk/solr/example/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/example/ivy.xml
lucene/dev/trunk/solr/lib/javax.servlet-api-LICENSE-ASL.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/lib/javax.servlet-api-LICENSE-ASL.txt
lucene/dev/trunk/solr/lib/javax.servlet-api-NOTICE.txt
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/lib/javax.servlet-api-NOTICE.txt
lucene/dev/trunk/solr/solrj/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/solrj/ivy.xml
lucene/dev/trunk/solr/solrj/src/java/org/apache/noggit/
- copied from r1307554, lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/noggit/
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/internal/
- copied from r1307554, lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/internal/
lucene/dev/trunk/solr/test-framework/ivy.xml
- copied unchanged from r1307554, lucene/dev/branches/lucene3930/solr/test-framework/ivy.xml
Removed:
lucene/dev/trunk/lucene/contrib/demo/lib/servlet-api-2.4.jar
lucene/dev/trunk/lucene/contrib/misc/ant_lib/
lucene/dev/trunk/lucene/contrib/sandbox/lib/jakarta-regexp-1.4.jar
lucene/dev/trunk/lucene/lib/
lucene/dev/trunk/modules/analysis/icu/lib/icu4j-4_8_1_1.jar
lucene/dev/trunk/modules/analysis/morfologik/lib/morfologik-fsa-1.5.2.jar
lucene/dev/trunk/modules/analysis/morfologik/lib/morfologik-polish-1.5.2.jar
lucene/dev/trunk/modules/analysis/morfologik/lib/morfologik-stemming-1.5.2.jar
lucene/dev/trunk/modules/analysis/phonetic/lib/commons-codec-1.6.jar
lucene/dev/trunk/modules/analysis/uima/lib/uima-an-tagger-2.3.1.jar
lucene/dev/trunk/modules/analysis/uima/lib/uima-an-tagger-LICENSE-ASL.txt
lucene/dev/trunk/modules/analysis/uima/lib/uima-an-tagger-NOTICE.txt
lucene/dev/trunk/modules/analysis/uima/lib/uima-an-wst-2.3.1.jar
lucene/dev/trunk/modules/analysis/uima/lib/uima-an-wst-LICENSE-ASL.txt
lucene/dev/trunk/modules/analysis/uima/lib/uima-an-wst-NOTICE.txt
lucene/dev/trunk/modules/analysis/uima/lib/uimaj-core-2.3.1.jar
lucene/dev/trunk/modules/benchmark/lib/commons-compress-1.2.jar
lucene/dev/trunk/modules/benchmark/lib/xercesImpl-2.9.1.jar
lucene/dev/trunk/modules/spatial/lib/spatial4j-0.2.jar
lucene/dev/trunk/solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar
lucene/dev/trunk/solr/contrib/clustering/lib/carrot2-core-3.5.0.jar
lucene/dev/trunk/solr/contrib/clustering/lib/hppc-0.3.3.jar
lucene/dev/trunk/solr/contrib/clustering/lib/jackson-core-asl-1.5.2.jar
lucene/dev/trunk/solr/contrib/clustering/lib/jackson-mapper-asl-1.5.2.jar
lucene/dev/trunk/solr/contrib/clustering/lib/mahout-collections-0.3.jar
lucene/dev/trunk/solr/contrib/clustering/lib/mahout-math-0.3.jar
lucene/dev/trunk/solr/contrib/clustering/lib/simple-xml-2.4.1.jar
lucene/dev/trunk/solr/contrib/dataimporthandler/lib/activation-1.1.jar
lucene/dev/trunk/solr/contrib/dataimporthandler/lib/mail-1.4.1.jar
lucene/dev/trunk/solr/contrib/extraction/lib/apache-mime4j-core-0.7.jar
lucene/dev/trunk/solr/contrib/extraction/lib/apache-mime4j-dom-0.7.jar
lucene/dev/trunk/solr/contrib/extraction/lib/asm-3.1.jar
lucene/dev/trunk/solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar
lucene/dev/trunk/solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar
lucene/dev/trunk/solr/contrib/extraction/lib/boilerpipe-1.1.0.jar
lucene/dev/trunk/solr/contrib/extraction/lib/commons-compress-1.3.jar
lucene/dev/trunk/solr/contrib/extraction/lib/dom4j-1.6.1.jar
lucene/dev/trunk/solr/contrib/extraction/lib/fontbox-1.6.0.jar
lucene/dev/trunk/solr/contrib/extraction/lib/icu4j-4_8_1_1.jar
lucene/dev/trunk/solr/contrib/extraction/lib/jdom-1.0.jar
lucene/dev/trunk/solr/contrib/extraction/lib/jempbox-1.6.0.jar
lucene/dev/trunk/solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar
lucene/dev/trunk/solr/contrib/extraction/lib/netcdf-4.2-min.jar
lucene/dev/trunk/solr/contrib/extraction/lib/pdfbox-1.6.0.jar
lucene/dev/trunk/solr/contrib/extraction/lib/poi-3.8-beta4.jar
lucene/dev/trunk/solr/contrib/extraction/lib/poi-ooxml-3.8-beta4.jar
lucene/dev/trunk/solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta4.jar
lucene/dev/trunk/solr/contrib/extraction/lib/poi-scratchpad-3.8-beta4.jar
lucene/dev/trunk/solr/contrib/extraction/lib/rome-0.9.jar
lucene/dev/trunk/solr/contrib/extraction/lib/tagsoup-1.2.1.jar
lucene/dev/trunk/solr/contrib/extraction/lib/tika-core-1.0.jar
lucene/dev/trunk/solr/contrib/extraction/lib/tika-parsers-1.0.jar
lucene/dev/trunk/solr/contrib/extraction/lib/xercesImpl-2.8.1.jar
lucene/dev/trunk/solr/contrib/extraction/lib/xml-apis-1.0.b2.jar
lucene/dev/trunk/solr/contrib/extraction/lib/xmlbeans-2.3.0.jar
lucene/dev/trunk/solr/contrib/langid/lib/jsonic-1.2.0.jar
lucene/dev/trunk/solr/contrib/langid/lib/langdetect-r111.jar
lucene/dev/trunk/solr/contrib/uima/lib/commons-digester-2.0.jar
lucene/dev/trunk/solr/contrib/uima/lib/uima-an-alchemy-2.3.1.jar
lucene/dev/trunk/solr/contrib/uima/lib/uima-an-alchemy-LICENSE-ASL.txt
lucene/dev/trunk/solr/contrib/uima/lib/uima-an-alchemy-NOTICE.txt
lucene/dev/trunk/solr/contrib/uima/lib/uima-an-calais-2.3.1.jar
lucene/dev/trunk/solr/contrib/uima/lib/uima-an-calais-LICENSE-ASL.txt
lucene/dev/trunk/solr/contrib/uima/lib/uima-an-calais-NOTICE.txt
lucene/dev/trunk/solr/contrib/uima/lib/uima-an-tagger-2.3.1.jar
lucene/dev/trunk/solr/contrib/uima/lib/uima-an-tagger-LICENSE-ASL.txt
lucene/dev/trunk/solr/contrib/uima/lib/uima-an-tagger-NOTICE.txt
lucene/dev/trunk/solr/contrib/uima/lib/uima-an-wst-2.3.1.jar
lucene/dev/trunk/solr/contrib/uima/lib/uima-an-wst-LICENSE-ASL.txt
lucene/dev/trunk/solr/contrib/uima/lib/uima-an-wst-NOTICE.txt
lucene/dev/trunk/solr/contrib/uima/lib/uimaj-core-2.3.1.jar
lucene/dev/trunk/solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar
lucene/dev/trunk/solr/contrib/velocity/lib/commons-collections-3.2.1.jar
lucene/dev/trunk/solr/contrib/velocity/lib/velocity-1.6.4.jar
lucene/dev/trunk/solr/contrib/velocity/lib/velocity-tools-2.0.jar
lucene/dev/trunk/solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar
lucene/dev/trunk/solr/example/lib/jetty-continuation-8.1.2.v20120308.jar
lucene/dev/trunk/solr/example/lib/jetty-deploy-8.1.2.v20120308.jar
lucene/dev/trunk/solr/example/lib/jetty-http-8.1.2.v20120308.jar
lucene/dev/trunk/solr/example/lib/jetty-io-8.1.2.v20120308.jar
lucene/dev/trunk/solr/example/lib/jetty-jmx-8.1.2.v20120308.jar
lucene/dev/trunk/solr/example/lib/jetty-security-8.1.2.v20120308.jar
lucene/dev/trunk/solr/example/lib/jetty-server-8.1.2.v20120308.jar
lucene/dev/trunk/solr/example/lib/jetty-servlet-8.1.2.v20120308.jar
lucene/dev/trunk/solr/example/lib/jetty-util-8.1.2.v20120308.jar
lucene/dev/trunk/solr/example/lib/jetty-webapp-8.1.2.v20120308.jar
lucene/dev/trunk/solr/example/lib/jetty-xml-8.1.2.v20120308.jar
lucene/dev/trunk/solr/example/lib/servlet-api-3.0.jar
lucene/dev/trunk/solr/example/start.jar
lucene/dev/trunk/solr/lib/apache-solr-commons-csv-1.0-SNAPSHOT-r966014.jar
lucene/dev/trunk/solr/lib/apache-solr-commons-csv-LICENSE-ASL.txt
lucene/dev/trunk/solr/lib/apache-solr-commons-csv-NOTICE.txt
lucene/dev/trunk/solr/lib/apache-solr-commons-csv-pom.xml.template
lucene/dev/trunk/solr/lib/apache-solr-noggit-LICENSE-ASL.txt
lucene/dev/trunk/solr/lib/apache-solr-noggit-NOTICE.txt
lucene/dev/trunk/solr/lib/apache-solr-noggit-pom.xml.template
lucene/dev/trunk/solr/lib/apache-solr-noggit-r1211150.jar
lucene/dev/trunk/solr/lib/commons-codec-1.6.jar
lucene/dev/trunk/solr/lib/commons-fileupload-1.2.1.jar
lucene/dev/trunk/solr/lib/commons-io-2.1.jar
lucene/dev/trunk/solr/lib/commons-lang-2.6.jar
lucene/dev/trunk/solr/lib/easymock-2.2.jar
lucene/dev/trunk/solr/lib/guava-r05.jar
lucene/dev/trunk/solr/lib/httpclient-4.1.3.jar
lucene/dev/trunk/solr/lib/httpcore-4.1.4.jar
lucene/dev/trunk/solr/lib/httpmime-4.1.3.jar
lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.6.1.jar
lucene/dev/trunk/solr/lib/junit-4.10.jar
lucene/dev/trunk/solr/lib/log4j-over-slf4j-1.6.1.jar
lucene/dev/trunk/solr/lib/servlet-api-3.0.jar
lucene/dev/trunk/solr/lib/servlet-api-LICENSE-ASL.txt
lucene/dev/trunk/solr/lib/servlet-api-NOTICE.txt
lucene/dev/trunk/solr/lib/slf4j-api-1.6.1.jar
lucene/dev/trunk/solr/lib/slf4j-jdk14-1.6.1.jar
lucene/dev/trunk/solr/lib/spatial4j-0.2.jar
lucene/dev/trunk/solr/lib/wstx-asl-3.2.7.jar
lucene/dev/trunk/solr/lib/zookeeper-3.3.4.jar
Modified:
lucene/dev/trunk/build.xml
lucene/dev/trunk/dev-tools/eclipse/dot.classpath
lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml
lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/BUILD.txt
lucene/dev/trunk/lucene/CHANGES.txt (props changed)
lucene/dev/trunk/lucene/LICENSE.txt (props changed)
lucene/dev/trunk/lucene/NOTICE.txt (props changed)
lucene/dev/trunk/lucene/backwards/ (props changed)
lucene/dev/trunk/lucene/build.xml (contents, props changed)
lucene/dev/trunk/lucene/common-build.xml (contents, props changed)
lucene/dev/trunk/lucene/contrib/ (props changed)
lucene/dev/trunk/lucene/contrib/contrib-build.xml
lucene/dev/trunk/lucene/contrib/demo/lib/ (props changed)
lucene/dev/trunk/lucene/contrib/misc/build.xml
lucene/dev/trunk/lucene/contrib/sandbox/build.xml
lucene/dev/trunk/lucene/contrib/sandbox/lib/ (props changed)
lucene/dev/trunk/lucene/core/ (props changed)
lucene/dev/trunk/lucene/site/ (props changed)
lucene/dev/trunk/lucene/test-framework/ (props changed)
lucene/dev/trunk/lucene/test-framework/build.xml
lucene/dev/trunk/lucene/tools/ (props changed)
lucene/dev/trunk/lucene/tools/custom-tasks.xml
lucene/dev/trunk/modules/analysis/build.xml
lucene/dev/trunk/modules/analysis/icu/build.xml
lucene/dev/trunk/modules/analysis/icu/lib/ (props changed)
lucene/dev/trunk/modules/analysis/morfologik/build.xml
lucene/dev/trunk/modules/analysis/morfologik/lib/ (props changed)
lucene/dev/trunk/modules/analysis/phonetic/build.xml
lucene/dev/trunk/modules/analysis/phonetic/lib/ (props changed)
lucene/dev/trunk/modules/analysis/uima/build.xml
lucene/dev/trunk/modules/analysis/uima/lib/ (props changed)
lucene/dev/trunk/modules/benchmark/build.xml
lucene/dev/trunk/modules/benchmark/lib/ (props changed)
lucene/dev/trunk/modules/build.xml
lucene/dev/trunk/modules/spatial/build.xml
lucene/dev/trunk/modules/spatial/lib/ (props changed)
lucene/dev/trunk/solr/CHANGES.txt (props changed)
lucene/dev/trunk/solr/NOTICE.txt (props changed)
lucene/dev/trunk/solr/README.txt
lucene/dev/trunk/solr/build.xml
lucene/dev/trunk/solr/common-build.xml (contents, props changed)
lucene/dev/trunk/solr/contrib/ (props changed)
lucene/dev/trunk/solr/contrib/analysis-extras/build.xml
lucene/dev/trunk/solr/contrib/analysis-extras/lib/ (props changed)
lucene/dev/trunk/solr/contrib/clustering/lib/ (props changed)
lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/lib/ (props changed)
lucene/dev/trunk/solr/contrib/extraction/lib/ (props changed)
lucene/dev/trunk/solr/contrib/langid/build.xml
lucene/dev/trunk/solr/contrib/langid/lib/ (props changed)
lucene/dev/trunk/solr/contrib/uima/lib/ (props changed)
lucene/dev/trunk/solr/contrib/velocity/lib/ (props changed)
lucene/dev/trunk/solr/core/ (props changed)
lucene/dev/trunk/solr/core/build.xml
lucene/dev/trunk/solr/example/ (props changed)
lucene/dev/trunk/solr/example/example-DIH/solr/db/lib/ (props changed)
lucene/dev/trunk/solr/example/lib/ (props changed)
lucene/dev/trunk/solr/lib/ (props changed)
lucene/dev/trunk/solr/solrj/ (props changed)
lucene/dev/trunk/solr/solrj/build.xml
lucene/dev/trunk/solr/test-framework/ (props changed)
lucene/dev/trunk/solr/test-framework/build.xml
lucene/dev/trunk/solr/testlogging.properties (props changed)
lucene/dev/trunk/solr/webapp/build.xml
Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Fri Mar 30 18:04:43 2012
@@ -46,6 +46,14 @@
</subant></sequential>
</target>
+ <target name="resolve" description="Resolves all dependencies">
+ <sequential><subant target="resolve" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ <fileset dir="modules" includes="build.xml" />
+ <fileset dir="solr" includes="build.xml" />
+ </subant></sequential>
+ </target>
+
<target name="compile" description="Compile Lucene and Solr">
<sequential>
@@ -83,7 +91,7 @@
</sequential>
</target>
- <target name="eclipse" description="Setup Eclipse configuration">
+ <target name="eclipse" description="Setup Eclipse configuration" depends="resolve">
<copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false"/>
<copy file="dev-tools/eclipse/dot.classpath" tofile=".classpath" overwrite="true"/>
<mkdir dir=".settings"/>
@@ -96,13 +104,13 @@
</echo>
</target>
- <target name="idea" description="Setup IntelliJ IDEA configuration">
+ <target name="idea" description="Setup IntelliJ IDEA configuration" depends="resolve">
<copy todir=".">
<fileset dir="dev-tools/idea"/>
</copy>
<echo>
To complete IntelliJ IDEA setup, you must manually configure
- Project Structure | Project | Project SDK.
+ File | Project Structure | Project | Project SDK.
</echo>
</target>
<target name="clean-idea"
@@ -128,8 +136,20 @@
</sequential>
</target>
- <!-- temporarily added before LUCENE-3930, to avoid
- any broken builds from timing issues: so hudson
- won't invoke ant target that does not exist -->
- <target name="clean-jars"/>
+ <!-- TODO: in the future, we don't need to actually put
+ jars in the lib/ folders, but can just put in classpath.
+ only packaging tasks really need that (and could do it
+ under build/ directories) -->
+ <target name="clean-jars" description="Clean local jars">
+ <delete>
+ <fileset dir="." includes="**/*.jar"/>
+ </delete>
+ </target>
+
+ <target name="ivy-bootstrap">
+ <subant target="ivy-bootstrap" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ </subant>
+ </target>
+
</project>
Modified: lucene/dev/trunk/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.classpath?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Fri Mar 30 18:04:43 2012
@@ -90,19 +90,17 @@
<classpathentry kind="src" path="solr/contrib/velocity/src/java"/>
<classpathentry kind="src" path="solr/contrib/velocity/src/test"/>
<classpathentry kind="src" path="solr/contrib/velocity/src/test-files"/>
- <classpathentry kind="lib" path="lucene/lib/ant-1.7.1.jar"/>
- <classpathentry kind="lib" path="lucene/lib/ant-junit-1.7.1.jar"/>
- <classpathentry kind="lib" path="lucene/lib/junit-4.10.jar"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/ant-1.7.1.jar"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/ant-junit-1.7.1.jar"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/junit-4.10.jar"/>
<classpathentry kind="lib" path="lucene/contrib/sandbox/lib/jakarta-regexp-1.4.jar"/>
- <classpathentry kind="lib" path="modules/analysis/icu/lib/icu4j-4_8_1_1.jar"/>
+ <classpathentry kind="lib" path="modules/analysis/icu/lib/icu4j-4.8.1.1.jar"/>
<classpathentry kind="lib" path="modules/analysis/phonetic/lib/commons-codec-1.6.jar"/>
<classpathentry kind="lib" path="modules/analysis/morfologik/lib/morfologik-fsa-1.5.2.jar"/>
<classpathentry kind="lib" path="modules/analysis/morfologik/lib/morfologik-polish-1.5.2.jar"/>
<classpathentry kind="lib" path="modules/analysis/morfologik/lib/morfologik-stemming-1.5.2.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-compress-1.2.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1211150.jar"/>
- <classpathentry kind="lib" path="solr/lib/apache-solr-commons-csv-1.0-SNAPSHOT-r966014.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-fileupload-1.2.1.jar"/>
<classpathentry kind="lib" path="solr/lib/httpclient-4.1.3.jar"/>
<classpathentry kind="lib" path="solr/lib/httpcore-4.1.4.jar"/>
@@ -159,13 +157,13 @@
<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-core-1.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-1.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-r111.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-c51112119be53a81e59706ce57bacaa90c052284.jar"/>
<classpathentry kind="lib" path="solr/contrib/langid/lib/jsonic-1.2.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-alchemy-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-calais-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-tagger-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-wst-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/Tagger-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/uima/lib/uimaj-core-2.3.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-tools-2.0.jar"/>
Modified: lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/trunk/dev-tools/idea/.idea/libraries/JUnit.xml Fri Mar 30 18:04:43 2012
@@ -1,7 +1,7 @@
<component name="libraryTable">
<library name="JUnit">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lucene/lib/junit-4.10.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/lucene.iml Fri Mar 30 18:04:43 2012
@@ -19,11 +19,11 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="file://$MODULE_DIR$/lib" />
+ <root url="file://$MODULE_DIR$/test-framework/lib" />
</CLASSES>
<JAVADOC />
<SOURCES />
- <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
+ <jarDirectory url="file://$MODULE_DIR$/test-framework/lib" recursive="false" />
</library>
</orderEntry>
</component>
Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Fri Mar 30 18:04:43 2012
@@ -212,11 +212,6 @@
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>solr-commons-csv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
<artifactId>solr-jsonic</artifactId>
<version>${project.version}</version>
</dependency>
@@ -226,11 +221,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-noggit</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>${tika.version}</version>
@@ -637,34 +627,6 @@
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
- <id>install-solr-commons-csv</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-commons-csv</artifactId>
- <version>${project.version}</version>
- <packaging>jar</packaging>
- <file>solr/lib/apache-solr-commons-csv-1.0-SNAPSHOT-r966014.jar</file>
- </configuration>
- </execution>
- <execution>
- <id>install-solr-noggit</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-noggit</artifactId>
- <version>${project.version}</version>
- <packaging>jar</packaging>
- <file>solr/lib/apache-solr-noggit-r1211150.jar</file>
- </configuration>
- </execution>
- <execution>
<id>install-jsonic</id>
<phase>install</phase>
<goals>
Modified: lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template Fri Mar 30 18:04:43 2012
@@ -62,16 +62,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-commons-csv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-noggit</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>${project.version}</version>
Modified: lucene/dev/trunk/lucene/BUILD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/BUILD.txt?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/BUILD.txt (original)
+++ lucene/dev/trunk/lucene/BUILD.txt Fri Mar 30 18:04:43 2012
@@ -1,14 +1,14 @@
Lucene Build Instructions
Basic steps:
- 0) Install JDK 1.6 (or greater), Ant 1.7.1+ (not 1.6.x, not 1.8.x)
+ 0) Install JDK 1.6 (or greater), Ant 1.7.1+ (not 1.6.x, not 1.8.x), Ivy 2.2.0
1) Download Lucene from Apache and unpack it
2) Connect to the top-level of your Lucene installation
3) Install JavaCC (optional)
4) Run ant
Step 0) Set up your development environment (JDK 1.6 or greater,
-Ant 1.7.1+)
+Ant 1.7.1+, Ivy 2.2.0)
We'll assume that you know how to get and set up the JDK - if you
don't, then we suggest starting at http://java.sun.com and learning
@@ -29,6 +29,9 @@ according to the instructions at:
http://ant.apache.org/manual
+Finally, you'll need to install ivy into your ant lib folder
+(~/.ant/lib). You can get it from http://ant.apache.org/ivy/.
+
Step 1) Download Lucene from Apache
We'll assume you already did this, or you wouldn't be reading this
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Fri Mar 30 18:04:43 2012
@@ -174,7 +174,7 @@
</target>
<!-- Validate once from top-level. -->
- <target name="validate" depends="compile-tools" description="Validate legal stuff.">
+ <target name="validate" depends="compile-tools,resolve" description="Validate legal stuff.">
<license-check-macro dir="${basedir}" />
</target>
@@ -190,6 +190,15 @@
</copy>
</target>
+ <target name="resolve">
+ <sequential>
+ <ant dir="test-framework" target="resolve" inheritall="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <contrib-crawl target="resolve" failonerror="true"/>
+ </sequential>
+ </target>
+
<target name="javadoc" depends="javadocs"/>
<target name="javadocs" description="Generate javadoc"
depends="javadocs-all, javadocs-core, javadocs-contrib, javadocs-test-framework">
@@ -226,8 +235,9 @@
<contrib-crawl target="javadocs"
failonerror="false"/>
</target>
-
- <target name="javadocs-all" depends="jar-analyzers-common,jar-queryparser,jar-queries"
+
+ <!-- call resolve to force dependencies to be in lib/ for javadocs -->
+ <target name="javadocs-all" depends="resolve,jar-analyzers-common,jar-queryparser,jar-queries"
description="Generate javadoc for core and contrib classes">
<sequential>
<mkdir dir="${javadoc.dir}/all"/>
@@ -235,10 +245,7 @@
<path id="javadoc.classpath">
<path refid="classpath"/>
<pathelement location="${ant.home}/lib/ant.jar"/>
- <fileset dir=".">
- <exclude name="build/**/*.jar"/>
- <include name="**/lib/*.jar"/>
- </fileset>
+ <fileset dir="." includes="test-framework/lib/,contrib/demo/lib/,contrib/sandbox/lib/" excludes="**/lib/*.txt"/>
<pathelement location="${analyzers-common.jar}"/>
<pathelement location="${queryparser.jar}"/>
<pathelement location="${queries.jar}"/>
@@ -382,7 +389,7 @@
<!-- ================================================================== -->
<!-- Packages the sources from "svn export" with tar-gzip -->
<!-- ================================================================== -->
- <target name="package-tgz-src" depends="init, init-dist"
+ <target name="package-tgz-src" depends="init-dist"
description="--> Generates the Lucene source distribution from 'svn export' as .tgz">
<property name="source.package.file"
value="${dist.dir}/lucene-${version}-src.tgz"/>
@@ -403,7 +410,7 @@
<!-- ================================================================== -->
<!-- Packages the sources from local working copy with tar-gzip -->
<!-- ================================================================== -->
- <target name="package-local-src-tgz" depends="init, init-dist"
+ <target name="package-local-src-tgz" depends="init-dist"
description="--> Packages the Lucene source from the local working copy">
<mkdir dir="${common.dir}/build"/>
<property name="source.package.file"
@@ -433,10 +440,7 @@
</target>
- <target name="generate-maven-artifacts" depends="package, javadocs">
- <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="maven-ant-tasks.classpath"/>
+ <target name="generate-maven-artifacts" depends="install-maven-tasks, package, javadocs">
<sequential>
<ant target="get-maven-poms" dir=".."/>
@@ -464,9 +468,9 @@
<!-- Build the JavaCC files into the source tree -->
<!-- ================================================================== -->
- <target name="javacc" depends="init,javacc-check,javacc-contrib-demo"/>
+ <target name="javacc" depends="javacc-check,javacc-contrib-demo"/>
- <target name="javacc-contrib-demo" depends="init,javacc-check" if="javacc.present">
+ <target name="javacc-contrib-demo" depends="javacc-check" if="javacc.present">
<ant target="javacc"
dir="contrib/demo"
antfile="build.xml"
@@ -541,8 +545,13 @@
<property name="lucene-core.uptodate" value="true"/>
</target>
- <!-- temporarily added before LUCENE-3930, to avoid
- any broken builds from timing issues: so hudson
- won't invoke ant target that does not exist -->
- <target name="clean-jars"/>
+ <!-- TODO: in the future, we don't need to actually put
+ jars in the lib/ folders, but can just put in classpath.
+ only packaging tasks really need that (and could do it
+ under build/ directories) -->
+ <target name="clean-jars" description="Clean local jars">
+ <delete>
+ <fileset dir="." includes="**/*.jar"/>
+ </delete>
+ </target>
</project>
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Fri Mar 30 18:04:43 2012
@@ -17,7 +17,8 @@
limitations under the License.
-->
-<project name="common" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="common" xmlns:artifact="antlib:org.apache.maven.artifact.ant"
+ xmlns:ivy="antlib:org.apache.ivy.ant">
<description>
This file is designed for importing into a main build file, and not intended
for standalone use.
@@ -52,20 +53,18 @@
<property name="year" value="2000-${current.year}"/>
<property name="final.name" value="lucene-${name}-${version}"/>
+ <property name="ivy.bootstrap.version" value="2.2.0" />
+ <property name="ivy.resource" value="org/apache/ivy/ant/antlib.xml" />
+ <available resource="${ivy.resource}" property="ivy.available" />
+
<property name="junit.jar" value="junit-4.10.jar"/>
- <property name="junit-location.jar" value="${common.dir}/lib/${junit.jar}"/>
+ <property name="junit-location.jar" value="${common.dir}/test-framework/lib/${junit.jar}"/>
<path id="junit-path">
<pathelement location="${junit-location.jar}"/>
</path>
<path id="ant-path">
- <fileset dir="${common.dir}/lib" includes="ant-*.jar"/>
- </path>
-
- <path id="maven-ant-tasks.classpath">
- <fileset dir="${common.dir}/lib">
- <include name="maven-ant-tasks-*.jar"/>
- </fileset>
+ <fileset dir="${common.dir}/test-framework/lib" includes="ant-*.jar"/>
</path>
<!-- default arguments to pass to JVM executing tests -->
@@ -222,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" />
@@ -249,10 +255,56 @@
</echo>
</target>
- <target name="init">
+ <target name="init" depends="resolve">
<!-- currently empty -->
</target>
+ <target name="resolve" depends="ivy-availability-check,ivy-fail">
+ <!-- todo, make this a property or something.
+ only special cases need bundles -->
+ <ivy:retrieve type="jar,bundle" log="download-only"/>
+ </target>
+ <target name="ivy-availability-check" unless="ivy.available">
+ <echo>
+ This build requires Ivy and Ivy could not be found in your ant classpath
+
+ (Due to classpath issues and the recursive nature of the Lucene/Solr
+ build system, a local copy of Ivy can not be used an loaded dynamically
+ by the build.xml)
+
+ You can either manually install a copy of Ivy ${ivy.bootstrap.version} in your ant classpath:
+ http://ant.apache.org/manual/install.html#optionalTasks
+
+ Or this build file can do it for you by running the Ivy Bootstrap target:
+ ant ivy-bootstrap
+
+ Either way you will only have to install Ivy one time.
+
+ 'ant ivy-bootstrap' will install a copy of Ivy into your Ant User Library:
+ ${user.home}/.ant/lib
+
+ If you would prefer, you can have it installed into an alternative
+ directory using the "-Divy_install_path=/some/path/you/choose" option,
+ but you will have to specify this path every time you build Lucene/Solr
+ in the future...
+ ant ivy-bootstrap -Divy_install_path=/some/path/you/choose
+ ...
+ ant -lib /some/path/you/choose clean compile
+ ...
+ ant -lib /some/path/you/choose clean compile
+ </echo>
+ </target>
+ <target name="ivy-fail" unless="ivy.available">
+ <fail>Ivy is not available</fail>
+ </target>
+ <target name="ivy-bootstrap">
+ <property name="ivy_install_path" location="${user.home}/.ant/lib" />
+ <mkdir dir="${ivy_install_path}"/>
+ <echo message="installing ivy ${ivy.bootstrap.version} to ${ivy_install_path}"/>
+ <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.bootstrap.version}/ivy-${ivy.bootstrap.version}.jar"
+ dest="${ivy_install_path}/ivy-${ivy.bootstrap.version}.jar" usetimestamp="true"/>
+ </target>
+
<target name="jflex-uptodate-check">
<uptodate property="jflex.files.uptodate">
<srcfiles dir="${src.dir}" includes="**/*.jflex" />
@@ -783,11 +835,17 @@
<target name="javadocs">
<fail message="You must redefine the javadocs task to do something!!!!!"/>
</target>
-
- <target name="dist-maven" if="pom.xml.present" depends="jar-core, jar-src, javadocs">
+
+ <target name="install-maven-tasks" unless="maven-tasks.uptodate">
+ <property name="maven-tasks.uptodate" value="true"/>
+ <ivy:cachepath organisation="org.apache.maven" module="maven-ant-tasks" revision="2.1.3"
+ inline="true" conf="master" type="jar" pathid="maven-ant-tasks.classpath"/>
<taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="antlib:org.apache.maven.artifact.ant"
classpathref="maven-ant-tasks.classpath"/>
+ </target>
+
+ <target name="dist-maven" if="pom.xml.present" depends="jar-core, jar-src, javadocs, install-maven-tasks">
<sequential>
<m2-deploy>
<artifact-attachments>
Modified: lucene/dev/trunk/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/contrib-build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/contrib-build.xml Fri Mar 30 18:04:43 2012
@@ -176,7 +176,9 @@
<property name="analyzers-morfologik.jar" value="${common.dir}/../modules/analysis/build/morfologik/lucene-analyzers-morfologik-${version}.jar"/>
<fileset id="analyzers-morfologik.fileset" dir="${common.dir}/../modules/analysis">
<include name="build/morfologik/lucene-analyzers-morfologik-${version}.jar" />
- <include name="morfologik/lib/*.jar" />
+ <include name="morfologik/lib/morfologik-fsa-1.5.2.jar" />
+ <include name="morfologik/lib/morfologik-polish-1.5.2.jar" />
+ <include name="morfologik/lib/morfologik-stemming-1.5.2.jar" />
</fileset>
<target name="check-analyzers-morfologik-uptodate" unless="analyzers-morfologik.uptodate">
<module-uptodate name="analysis/morfologik" jarfile="${analyzers-morfologik.jar}" property="analyzers-morfologik.uptodate"/>
Modified: lucene/dev/trunk/lucene/contrib/misc/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/misc/build.xml Fri Mar 30 18:04:43 2012
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<project name="misc" default="default">
+<project name="misc" default="default" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- TODO: add javacc capability for PrecedenceQueryParser -->
@@ -27,14 +27,15 @@
<import file="../contrib-build.xml"/>
- <target name="build-native-unix" >
- <mkdir dir="${common.build.dir}/native"/>
+ <target name="install-cpptasks" unless="cpptasks.uptodate">
+ <property name="cpptasks.uptodate" value="true"/>
+ <ivy:cachepath organisation="ant-contrib" module="cpptasks" revision="1.0b5"
+ inline="true" conf="master" type="jar" pathid="cpptasks.classpath"/>
+ <taskdef resource="cpptasks.tasks" classpathref="cpptasks.classpath"/>
+ </target>
- <taskdef resource="cpptasks.tasks">
- <classpath>
- <pathelement location="ant_lib/cpptasks-1.0b5.jar"/>
- </classpath>
- </taskdef>
+ <target name="build-native-unix" depends="install-cpptasks">
+ <mkdir dir="${common.build.dir}/native"/>
<cc outtype="shared" subsystem="console" outfile="${common.build.dir}/native/NativePosixUtil" >
<fileset file="${src.dir}/org/apache/lucene/store/NativePosixUtil.cpp" />
Modified: lucene/dev/trunk/lucene/contrib/sandbox/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/sandbox/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/sandbox/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/sandbox/build.xml Fri Mar 30 18:04:43 2012
@@ -21,15 +21,11 @@
Sandbox for odd contrib code
</description>
- <path id="additional.dependencies">
- <fileset dir="lib" includes="*-regexp-*.jar"/>
- </path>
-
- <pathconvert property="project.classpath"
- targetos="unix"
- refid="additional.dependencies"
- />
-
<import file="../contrib-build.xml"/>
+ <path id="classpath">
+ <pathelement path="lib/jakarta-regexp-1.4.jar"/>
+ <path refid="base.classpath"/>
+ </path>
+
</project>
Modified: lucene/dev/trunk/lucene/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/build.xml (original)
+++ lucene/dev/trunk/lucene/test-framework/build.xml Fri Mar 30 18:04:43 2012
@@ -46,7 +46,7 @@
</target>
<target name="javadocs-core" depends="javadocs"/>
- <target name="javadocs">
+ <target name="javadocs" depends="init">
<sequential>
<mkdir dir="${javadoc.dir}/test-framework"/>
<invoke-javadoc overview="${src.dir}/overview.html"
Modified: lucene/dev/trunk/lucene/tools/custom-tasks.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/tools/custom-tasks.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/tools/custom-tasks.xml (original)
+++ lucene/dev/trunk/lucene/tools/custom-tasks.xml Fri Mar 30 18:04:43 2012
@@ -47,9 +47,12 @@
<!-- Typical version patterns. -->
<replaceregex pattern="\-(r)?([0-9\-\_\.])+(b(eta)?([0-9\-\.])*)?$" replace="" flags="gi" />
+
+ <!-- git hashcode pattern: its always 40 chars right? -->
+ <replaceregex pattern="\-[a-z0-9]{40,40}$" replace="" flags="gi" />
</filtermapper>
</licenseMapper>
</licenses>
</sequential>
</macrodef>
-</project>
\ No newline at end of file
+</project>
Modified: lucene/dev/trunk/modules/analysis/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/build.xml (original)
+++ lucene/dev/trunk/modules/analysis/build.xml Fri Mar 30 18:04:43 2012
@@ -30,6 +30,23 @@
- uima: UIMA Analysis module
</description>
+ <dirname file="${ant.file.analyzers}" property="analyzers.dir"/>
+
+ <macrodef name="forall-analyzers">
+ <attribute name="target" />
+ <sequential>
+ <subant target="@{target}" inheritall="false" failonerror="true">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ <fileset dir="${analyzers.dir}" includes="*/build.xml" />
+ </subant>
+ </sequential>
+ </macrodef>
+
+ <propertyset id="uptodate.and.compiled.properties" dynamic="true">
+ <propertyref regex=".*\.uptodate$$"/>
+ <propertyref regex=".*\.compiled$$"/>
+ </propertyset>
+
<target name="common">
<ant dir="common" />
</target>
@@ -65,90 +82,39 @@
<target name="default" depends="compile"/>
<target name="compile" depends="common,icu,kuromoji,morfologik,phonetic,smartcn,stempel,uima" />
+ <!-- FIXME: these should crawl like contrib-crawl/modules-crawl, passing the
+ propset so we dont install maven-ant-tasks over and over -->
<target name="clean">
- <ant dir="common" target="clean" />
- <ant dir="icu" target="clean" />
- <ant dir="kuromoji" target="clean"/>
- <ant dir="morfologik" target="clean" />
- <ant dir="phonetic" target="clean" />
- <ant dir="smartcn" target="clean" />
- <ant dir="stempel" target="clean" />
- <ant dir="uima" target="clean" />
+ <forall-analyzers target="clean"/>
+ </target>
+ <target name="resolve">
+ <forall-analyzers target="resolve"/>
</target>
<target name="validate">
- <ant dir="common" target="validate" />
- <ant dir="icu" target="validate" />
- <ant dir="kuromoji" target="validate" />
- <ant dir="morfologik" target="validate" />
- <ant dir="phonetic" target="validate" />
- <ant dir="smartcn" target="validate" />
- <ant dir="stempel" target="validate" />
- <ant dir="uima" target="validate" />
+ <forall-analyzers target="validate"/>
</target>
<target name="compile-core">
- <ant dir="common" target="compile-core" />
- <ant dir="icu" target="compile-core" />
- <ant dir="kuromoji" target="compile-core" />
- <ant dir="morfologik" target="compile-core" />
- <ant dir="phonetic" target="compile-core" />
- <ant dir="smartcn" target="compile-core" />
- <ant dir="stempel" target="compile-core" />
- <ant dir="uima" target="compile-core" />
+ <forall-analyzers target="compile-core"/>
</target>
<target name="compile-test">
- <ant dir="common" target="compile-test" />
- <ant dir="icu" target="compile-test" />
- <ant dir="kuromoji" target="compile-test" />
- <ant dir="morfologik" target="compile-test" />
- <ant dir="phonetic" target="compile-test" />
- <ant dir="smartcn" target="compile-test" />
- <ant dir="stempel" target="compile-test" />
- <ant dir="uima" target="compile-test" />
+ <forall-analyzers target="compile-test"/>
</target>
<target name="test">
- <ant dir="common" target="test" />
- <ant dir="icu" target="test" />
- <ant dir="kuromoji" target="test" />
- <ant dir="morfologik" target="test" />
- <ant dir="phonetic" target="test" />
- <ant dir="smartcn" target="test" />
- <ant dir="stempel" target="test" />
- <ant dir="uima" target="test" />
+ <forall-analyzers target="test"/>
</target>
<target name="build-artifacts-and-tests" depends="default,compile-test" />
<target name="dist-maven" depends="default,javadocs">
- <ant dir="common" target="dist-maven" />
- <ant dir="icu" target="dist-maven" />
- <ant dir="kuromoji" target="dist-maven" />
- <ant dir="morfologik" target="dist-maven" />
- <ant dir="phonetic" target="dist-maven" />
- <ant dir="smartcn" target="dist-maven" />
- <ant dir="stempel" target="dist-maven" />
- <ant dir="uima" target="dist-maven" />
+ <forall-analyzers target="dist-maven"/>
</target>
<target name="javadocs">
- <ant dir="common" target="javadocs" />
- <ant dir="icu" target="javadocs" />
- <ant dir="kuromoji" target="javadocs" />
- <ant dir="morfologik" target="javadocs" />
- <ant dir="phonetic" target="javadocs" />
- <ant dir="smartcn" target="javadocs" />
- <ant dir="stempel" target="javadocs" />
- <ant dir="uima" target="javadocs" />
+ <forall-analyzers target="javadocs"/>
</target>
<target name="javadocs-index.html">
- <ant dir="common" target="javadocs-index.html" />
- <ant dir="icu" target="javadocs-index.html" />
- <ant dir="kuromoji" target="javadocs-index.html" />
- <ant dir="morfologik" target="javadocs-index.html" />
- <ant dir="phonetic" target="javadocs-index.html" />
- <ant dir="smartcn" target="javadocs-index.html" />
- <ant dir="stempel" target="javadocs-index.html" />
- <ant dir="uima" target="javadocs-index.html" />
+ <forall-analyzers target="javadocs-index.html"/>
</target>
</project>
Modified: lucene/dev/trunk/modules/analysis/icu/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/icu/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/icu/build.xml (original)
+++ lucene/dev/trunk/modules/analysis/icu/build.xml Fri Mar 30 18:04:43 2012
@@ -27,19 +27,15 @@
<property name="build.dir" location="../build/icu" />
<property name="dist.dir" location="../dist/icu" />
- <path id="additional.dependencies">
- <fileset dir="lib" includes="icu4j-*.jar"/>
- </path>
-
- <pathconvert property="project.classpath"
- targetos="unix"
- refid="additional.dependencies"
- />
-
<import file="../../../lucene/contrib/contrib-build.xml"/>
+ <path id="icujar">
+ <pathelement location="lib/icu4j-4.8.1.1.jar"/>
+ </path>
+
<path id="classpath">
<pathelement path="${analyzers-common.jar}"/>
+ <path refid="icujar"/>
<path refid="base.classpath"/>
</path>
@@ -82,7 +78,7 @@ are part of the ICU4C package. See http:
fork="true"
failonerror="true">
<classpath>
- <path refid="additional.dependencies"/>
+ <path refid="icujar"/>
<pathelement location="${build.dir}/classes/tools"/>
</classpath>
<assertions>
@@ -104,7 +100,7 @@ are part of the ICU4C package. See http:
failonerror="true"
output="${uax29.supp.macros.output.file}">
<classpath>
- <path refid="additional.dependencies"/>
+ <path refid="icujar"/>
<pathelement location="${build.dir}/classes/tools"/>
</classpath>
<assertions>
@@ -124,13 +120,13 @@ are part of the ICU4C package. See http:
failonerror="true"
output="${html.strip.charfilter.supp.macros.output.file}">
<classpath>
- <path refid="additional.dependencies"/>
+ <path refid="icujar"/>
<pathelement location="${build.dir}/classes/tools"/>
</classpath>
</java>
</target>
- <target name="compile-tools" depends="common.compile-tools">
+ <target name="compile-tools" depends="init,common.compile-tools">
<compile
srcdir="src/tools/java"
destdir="${build.dir}/classes/tools">
Modified: lucene/dev/trunk/modules/analysis/morfologik/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/morfologik/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/morfologik/build.xml (original)
+++ lucene/dev/trunk/modules/analysis/morfologik/build.xml Fri Mar 30 18:04:43 2012
@@ -26,18 +26,13 @@
<property name="build.dir" location="../build/morfologik" />
<property name="dist.dir" location="../dist/morfologik" />
- <path id="additional.dependencies">
- <fileset dir="lib" includes="morfologik-fsa-*.jar"/>
- <fileset dir="lib" includes="morfologik-polish-*.jar"/>
- <fileset dir="lib" includes="morfologik-stemming-*.jar"/>
- </path>
-
- <pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />
-
<import file="../../../lucene/contrib/contrib-build.xml"/>
<path id="classpath">
<pathelement path="${analyzers-common.jar}"/>
+ <pathelement path="lib/morfologik-fsa-1.5.2.jar"/>
+ <pathelement path="lib/morfologik-polish-1.5.2.jar"/>
+ <pathelement path="lib/morfologik-stemming-1.5.2.jar"/>
<path refid="base.classpath"/>
</path>
Modified: lucene/dev/trunk/modules/analysis/phonetic/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/phonetic/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/phonetic/build.xml (original)
+++ lucene/dev/trunk/modules/analysis/phonetic/build.xml Fri Mar 30 18:04:43 2012
@@ -26,19 +26,11 @@
<property name="build.dir" location="../build/phonetic" />
<property name="dist.dir" location="../dist/phonetic" />
- <path id="additional.dependencies">
- <fileset dir="lib" includes="commons-codec-*.jar"/>
- </path>
-
- <pathconvert property="project.classpath"
- targetos="unix"
- refid="additional.dependencies"
- />
-
<import file="../../../lucene/contrib/contrib-build.xml"/>
<path id="classpath">
<pathelement path="${analyzers-common.jar}"/>
+ <pathelement path="lib/commons-codec-1.6.jar"/>
<path refid="base.classpath"/>
</path>
Modified: lucene/dev/trunk/modules/analysis/uima/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/uima/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/uima/build.xml (original)
+++ lucene/dev/trunk/modules/analysis/uima/build.xml Fri Mar 30 18:04:43 2012
@@ -28,17 +28,18 @@
<property name="tests.userdir" value="src/test-files"/>
<property name="tests.threadspercpu" value="0" />
- <path id="additional.dependencies">
- <fileset dir="lib" includes="*.jar"/>
+ <path id="uimajars">
+ <pathelement path="lib/uimaj-core-2.3.1.jar"/>
+ <pathelement path="lib/Tagger-2.3.1.jar"/>
+ <pathelement path="lib/WhitespaceTokenizer-2.3.1.jar"/>
</path>
- <pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />
-
<import file="../../../lucene/contrib/contrib-build.xml"/>
<path id="classpath">
<pathelement path="${analyzers-common.jar}"/>
<pathelement path="${tests.userdir}"/>
+ <path refid="uimajars"/>
<path refid="base.classpath"/>
</path>
Modified: lucene/dev/trunk/modules/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/build.xml (original)
+++ lucene/dev/trunk/modules/benchmark/build.xml Fri Mar 30 18:04:43 2012
@@ -154,10 +154,11 @@
<pathelement path="${analyzers-common.jar}"/>
<pathelement path="${queryparser.jar}"/>
<pathelement path="${facet.jar}"/>
- <fileset dir="${common.dir}/../modules/analysis/icu/lib" includes="icu4j*.jar"/>
+ <fileset dir="${common.dir}/../modules/analysis/icu/lib" includes="icu4j-4.8.1.1.jar"/>
<path refid="base.classpath"/>
<fileset dir="lib">
- <include name="**/*.jar"/>
+ <include name="commons-compress-1.2.jar"/>
+ <include name="xercesImpl-2.9.1.jar"/>
</fileset>
</path>
<path id="run.classpath">
@@ -198,7 +199,7 @@
<path id="collation.runtime.classpath">
<path refid="run.classpath"/>
<pathelement path="${analyzers-icu.jar}"/>
- <fileset dir="${common.dir}/../modules/analysis/icu/lib" includes="icu4j*.jar"/>
+ <fileset dir="${common.dir}/../modules/analysis/icu/lib" includes="icu4j-4.8.1.1.jar"/>
</path>
<target name="collation" depends="compile,jar-analyzers-icu,top-100k-wiki-word-files">
@@ -243,7 +244,14 @@
<echo>Benchmark output in JIRA table format is in file: ${shingle.jira.output.file}</echo>
</target>
- <target name="init" depends="contrib-build.init,jar-memory,jar-highlighter,jar-analyzers-common,jar-queryparser,jar-facet"/>
+ <!-- we don't actually need to compile this thing, we just want its lib -->
+ <target name="resolve-icu">
+ <ant dir="${common.dir}/../modules/analysis/icu/" target="resolve" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ </target>
+
+ <target name="init" depends="contrib-build.init,resolve-icu,jar-memory,jar-highlighter,jar-analyzers-common,jar-queryparser,jar-facet"/>
<target name="clean-javacc">
<fileset dir="src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml" includes="*.java">
Modified: lucene/dev/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/modules/build.xml (original)
+++ lucene/dev/trunk/modules/build.xml Fri Mar 30 18:04:43 2012
@@ -25,11 +25,18 @@
<attribute name="target" />
<sequential>
<subant target="@{target}" inheritall="false" failonerror="true">
+ <propertyset refid="uptodate.and.compiled.properties"/>
<fileset dir="${modules.dir}" includes="*/build.xml" />
</subant>
</sequential>
</macrodef>
+ <propertyset id="uptodate.and.compiled.properties" dynamic="true">
+ <propertyref regex=".*\.uptodate$$"/>
+ <propertyref regex=".*\.compiled$$"/>
+ </propertyset>
+
+
<target name="test" description="Test all modules">
<forall-modules target="test" />
</target>
@@ -38,6 +45,10 @@
<forall-modules target="compile" />
</target>
+ <target name="resolve">
+ <forall-modules target="resolve"/>
+ </target>
+
<target name="compile-test" description="Compile all tests">
<forall-modules target="compile-test" />
</target>
@@ -51,7 +62,7 @@
<forall-modules target="dist-maven" />
</target>
- <target name="validate" description="Validate legal stuff.">
+ <target name="validate" depends="resolve" description="Validate legal stuff.">
<!-- The order here is important because forall compiles tools. -->
<forall-modules target="validate" />
<license-check-macro dir="${basedir}" />
@@ -61,4 +72,14 @@
<delete dir="dist"/>
<forall-modules target="clean" />
</target>
+
+ <!-- TODO: in the future, we don't need to actually put
+ jars in the lib/ folders, but can just put in classpath.
+ only packaging tasks really need that (and could do it
+ under build/ directories) -->
+ <target name="clean-jars" description="Clean local jars">
+ <delete>
+ <fileset dir="." includes="**/*.jar"/>
+ </delete>
+ </target>
</project>
Modified: lucene/dev/trunk/modules/spatial/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/spatial/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/modules/spatial/build.xml (original)
+++ lucene/dev/trunk/modules/spatial/build.xml Fri Mar 30 18:04:43 2012
@@ -8,24 +8,21 @@
<property name="dist.dir" location="dist/" />
<property name="maven.dist.dir" location="../dist/maven" />
- <path id="additional.dependencies">
- <fileset dir="lib" includes="*.jar"/>
- </path>
-
- <pathconvert property="project.classpath"
- targetos="unix"
- refid="additional.dependencies"
- />
-
<import file="../../lucene/contrib/contrib-build.xml"/>
+ <path id="spatialjar">
+ <pathelement path="lib/spatial4j-0.2.jar"/>
+ </path>
+
<path id="classpath">
<path refid="base.classpath"/>
+ <path refid="spatialjar"/>
<pathelement path="${queries.jar}" />
</path>
<path id="test.classpath">
<path refid="test.base.classpath" />
+ <path refid="spatialjar"/>
<pathelement path="src/test-files" />
</path>
Modified: lucene/dev/trunk/solr/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/README.txt?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/solr/README.txt (original)
+++ lucene/dev/trunk/solr/README.txt Fri Mar 30 18:04:43 2012
@@ -71,6 +71,9 @@ Instructions for Building Apache Solr fr
included on your command path. To test this, issue a "ant -version" command from your
shell (command prompt) and verify that Ant is available.
+ Install Apache Ivy binary distribution (2.2.0) from http://ant.apache.org/ivy/
+ You will need to place ivy-2.2.0.jar file in ~/.ant/lib.
+
3. Download the Apache Solr distribution, linked from the above web site.
Unzip the distribution to a folder of your choice, e.g. C:\solr or ~/solr
Alternately, you can obtain a copy of the latest Apache Solr source code
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Fri Mar 30 18:04:43 2012
@@ -40,7 +40,7 @@
<!-- ========================================================================= -->
<target name="example" description="Creates a runnable example configuration."
- depends="dist-contrib,dist-war">
+ depends="resolve-example,dist-contrib,dist-war">
<copy file="${dist}/${fullnamever}.war"
tofile="${example}/webapps/${ant.project.name}.war"/>
<jar destfile="${example}/exampledocs/post.jar"
@@ -55,6 +55,14 @@
</delete>
<echo>See ${example}/README.txt for how to run the Solr example configuration.</echo>
</target>
+
+ <!-- example-DIH needs hsqldb. don't put anything here needed by *tests* -->
+ <target name="resolve-example" unless="example.libs.uptodate">
+ <ant dir="${common-solr.dir}/example/example-DIH" target="resolve" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="example.libs.uptodate" value="true"/>
+ </target>
<target name="run-example" depends="example"
description="Run Solr interactively, via Jetty. -Dexample.debug=true to enable JVM debugger">
@@ -171,7 +179,7 @@
</target>
<!-- Validation (license/ notice checks). -->
- <target name="validate" depends="compile-tools" description="Validate legal stuff.">
+ <target name="validate" depends="compile-tools,resolve" description="Validate legal stuff.">
<license-check-macro dir="${basedir}">
<additional-excludes>
<!-- Exclude start.jar only (it'd be weird to have a license file there?) -->
@@ -454,8 +462,25 @@
<!-- NOOP -->
</target>
+ <target name="resolve" depends="resolve-example,resolve-jetty">
+ <sequential>
+ <ant dir="core" target="resolve" inheritall="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <ant dir="solrj" target="resolve" inheritall="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <ant dir="test-framework" target="resolve" inheritall="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <contrib-crawl target="resolve"/>
+ </sequential>
+ </target>
+
+ <!-- since we build across all contribs, we must ensure all deps
+ are resolved -->
<target name="javadocs-all"
- depends="prep-lucene-jars,javadocs-dep,lucene-javadocs-all,define-lucene-javadoc-url"
+ depends="resolve,prep-lucene-jars,javadocs-dep,define-lucene-javadoc-url"
description="Generate javadoc for core, java client and contrib">
<sequential>
<mkdir dir="${dest}/docs/api"/>
@@ -508,10 +533,7 @@
</sequential>
</target>
- <target name="generate-maven-artifacts">
- <taskdef uri="antlib:org.apache.maven.artifact.ant"
- resource="org/apache/maven/artifact/ant/antlib.xml"
- classpathref="maven-ant-tasks.classpath" />
+ <target name="generate-maven-artifacts" depends="install-maven-tasks">
<sequential>
<ant target="get-maven-poms" dir=".." inheritall="false"/>
<m2-deploy pom.xml="pom.xml"/> <!-- Solr parent POM -->
@@ -725,8 +747,14 @@
tofile="${analysis.conf.dest}/stopwords_tr.txt"/>
</target>
- <!-- temporarily added before LUCENE-3930, to avoid
- any broken builds from timing issues: so hudson
- won't invoke ant target that does not exist -->
- <target name="clean-jars"/>
+ <!-- TODO: in the future, we don't need to actually put
+ jars in the lib/ folders, but can just put in classpath.
+ only packaging tasks really need that (and could do it
+ under build/ directories) -->
+ <target name="clean-jars" description="Clean local jars">
+ <delete>
+ <fileset dir="." includes="**/*.jar"/>
+ </delete>
+ </target>
+
</project>
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Fri Mar 30 18:04:43 2012
@@ -60,13 +60,11 @@
</condition>
<path id="additional.dependencies">
- <fileset dir="${common-solr.dir}/lib" includes="**/*.jar"/>
- <fileset dir="${common-solr.dir}/example/lib" includes="**/*.jar"/>
- <fileset dir="lib" includes="**/*.jar" erroronmissingdir="false"/>
+ <fileset dir="${common-solr.dir}/lib" excludes="*.txt,*.template"/>
+ <fileset dir="${common-solr.dir}/example/lib" excludes="*.txt,*.template"/>
+ <fileset dir="lib" excludes="*.txt,*.template" erroronmissingdir="false"/>
</path>
- <pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies"/>
-
<import file="${common-solr.dir}/../lucene/contrib/contrib-build.xml"/>
<!-- Solr Specification Version
@@ -94,6 +92,7 @@
<pathelement path="${queryparser.jar}"/>
<pathelement location="${common-solr.dir}/build/solr-solrj/classes/java"/>
<pathelement location="${common-solr.dir}/build/solr-core/classes/java"/>
+ <path refid="additional.dependencies"/>
<path refid="base.classpath"/>
</path>
@@ -190,18 +189,14 @@
<solr-jarify/>
</target>
- <target name="compile-core" depends="prep-lucene-jars,common.compile-core"/>
+ <target name="compile-core" depends="prep-lucene-jars,resolve-jetty,common.compile-core"/>
<target name="compile-test" depends="sync-resources,compile-solr-test-framework,common.compile-test"/>
<target name="dist" depends="jar-core">
<copy file="${build.dir}/${fullnamever}.jar" todir="${dist}"/>
</target>
- <target name="lucene-javadocs-all">
- <ant dir="${common.dir}" target="javadocs-all" inheritall="false"/>
- </target>
-
- <target name="javadocs" depends="compile-core,lucene-javadocs-all,define-lucene-javadoc-url">
+ <target name="javadocs" depends="compile-core,define-lucene-javadoc-url">
<sequential>
<mkdir dir="${javadoc.dir}"/>
<mkdir dir="${dest}/META-INF/"/>
@@ -300,6 +295,14 @@
<property name="solr.test.framework.compiled" value="true"/>
</target>
+ <!-- resolve jetty dependencies in the example (relied upon by compile!) -->
+ <target name="resolve-jetty" unless="jetty.libs.uptodate">
+ <ant dir="${common-solr.dir}/example" target="resolve" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="jetty.libs.uptodate" value="true"/>
+ </target>
+
<!-- Solr contrib targets -->
<target name="compile-contrib" description="Compile contrib modules">
<contrib-crawl target="compile-core"/>
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/build.xml Fri Mar 30 18:04:43 2012
@@ -26,6 +26,7 @@
<import file="../contrib-build.xml"/>
<path id="classpath">
+ <fileset dir="lib" excludes="*.txt"/>
<pathelement path="${analyzers-icu.jar}"/>
<pathelement path="${analyzers-smartcn.jar}"/>
<pathelement path="${analyzers-stempel.jar}"/>
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler-extras/build.xml Fri Mar 30 18:04:43 2012
@@ -45,14 +45,21 @@
</ant>
</target>
+ <!-- we don't actually need to compile this thing, we just want its libs -->
+ <target name="resolve-extraction-libs">
+ <ant dir="${common-solr.dir}/contrib/extraction" target="resolve" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ </target>
+
<path id="classpath">
<pathelement location="${common-solr.dir}/build/contrib/solr-dataimporthandler/classes/java"/>
<pathelement location="${common-solr.dir}/build/contrib/solr-dataimporthandler/classes/test"/>
- <fileset dir="${common-solr.dir}/contrib/dataimporthandler/lib" includes="**/*.jar"/>
- <fileset dir="${common-solr.dir}/contrib/extraction/lib" includes="**/*.jar"/>
+ <fileset dir="${common-solr.dir}/contrib/dataimporthandler/lib" excludes="*.txt"/>
+ <fileset dir="${common-solr.dir}/contrib/extraction/lib" excludes="*.txt"/>
<path refid="solr.base.classpath"/>
</path>
- <target name="compile-core" depends="compile-solr-dataimporthandler, solr-contrib-build.compile-core"/>
+ <target name="compile-core" depends="compile-solr-dataimporthandler,resolve-extraction-libs,solr-contrib-build.compile-core"/>
<target name="compile-test" depends="compile-solr-dataimporthandler-tests, common-solr.compile-test"/>
</project>
Modified: lucene/dev/trunk/solr/contrib/langid/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/langid/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/langid/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/langid/build.xml Fri Mar 30 18:04:43 2012
@@ -26,8 +26,8 @@
<import file="../contrib-build.xml"/>
<path id="classpath">
- <fileset dir="../extraction/lib" includes="*.jar"/>
- <fileset dir="lib" includes="*.jar"/>
+ <fileset dir="../extraction/lib" excludes="*.txt,*.template"/>
+ <fileset dir="lib" excludes="*.txt,*.template"/>
<path refid="solr.base.classpath"/>
</path>
@@ -37,6 +37,15 @@
jar.file="${solr-langid.dir}/lib/jsonic-1.2.0.jar" />
<m2-deploy-with-pom-template pom.xml="${solr-langid.dir}/lib/langdetect-pom.xml.template"
- jar.file="${solr-langid.dir}/lib/langdetect-r111.jar" />
+ jar.file="${solr-langid.dir}/lib/langdetect-c51112119be53a81e59706ce57bacaa90c052284.jar" />
</target>
+
+ <!-- we don't actually need to compile this thing, we just want its libs -->
+ <target name="resolve-extraction-libs">
+ <ant dir="${common-solr.dir}/contrib/extraction" target="resolve" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ </target>
+
+ <target name="compile-core" depends="resolve-extraction-libs,solr-contrib-build.compile-core"/>
</project>
Modified: lucene/dev/trunk/solr/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/build.xml (original)
+++ lucene/dev/trunk/solr/core/build.xml Fri Mar 30 18:04:43 2012
@@ -18,15 +18,12 @@
<project name="solr-core" default="default">
<description>Solr Core</description>
+ <!-- hackidty-hack-hack -->
+
+ <property name="ivy.retrieve.pattern" value="${common-solr.dir}/lib/[artifact]-[revision].[ext]"/>
+
<import file="../common-build.xml"/>
<target name="compile-core" depends="compile-solrj,common-solr.compile-core"/>
- <target name="dist-maven" depends="jar-core,javadocs,jar-src,common.dist-maven">
- <m2-deploy-with-pom-template pom.xml="${common-solr.dir}/lib/apache-solr-commons-csv-pom.xml.template"
- jar.file="${common-solr.dir}/lib/apache-solr-commons-csv-1.0-SNAPSHOT-r966014.jar" />
-
- <m2-deploy-with-pom-template pom.xml="${common-solr.dir}/lib/apache-solr-noggit-pom.xml.template"
- jar.file="${common-solr.dir}/lib/apache-solr-noggit-r1211150.jar" />
- </target>
</project>
Modified: lucene/dev/trunk/solr/solrj/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/build.xml (original)
+++ lucene/dev/trunk/solr/solrj/build.xml Fri Mar 30 18:04:43 2012
@@ -18,6 +18,8 @@
<project name="solr-solrj" default="default">
<description>Solrj - Solr Java Client</description>
+ <property name="ivy.retrieve.pattern" value="${common-solr.dir}/lib/[artifact]-[revision].[ext]"/>
+
<import file="../common-build.xml"/>
<!-- Specialized common-solr.test.classpath, to remove the Solr core test output -->
Modified: lucene/dev/trunk/solr/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/build.xml (original)
+++ lucene/dev/trunk/solr/test-framework/build.xml Fri Mar 30 18:04:43 2012
@@ -42,7 +42,7 @@
<!-- Override common-solr.javadocs to include a JUnit javadoc link -->
<!-- and to copy the built javadocs to ${dest}/docs/api/test-framework -->
<target name="javadocs"
- depends="compile-core,lucene-javadocs-all,define-lucene-javadoc-url">
+ depends="compile-core,define-lucene-javadoc-url">
<sequential>
<mkdir dir="${javadoc.dir}"/>
<mkdir dir="${dest}/META-INF/"/>
Modified: lucene/dev/trunk/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/build.xml?rev=1307563&r1=1307562&r2=1307563&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/build.xml (original)
+++ lucene/dev/trunk/solr/webapp/build.xml Fri Mar 30 18:04:43 2012
@@ -27,6 +27,16 @@
<!-- no more JSP -->
</target>
+ <!-- this module has no javadocs -->
+ <target name="javadocs"/>
+
+ <!-- this module has no jar either -->
+ <target name="jar-core"/>
+
+ <!-- nothing to compile -->
+ <target name="compile-core"/>
+ <target name="compile-test"/>
+
<target name="dist"
description="Creates the Solr WAR Distribution file."
depends="test, init-dist, dist-core, dist-solrj, lucene-jars-to-solr">