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/07/28 00:02:33 UTC
svn commit: r1366552 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/ lucene/analysis/icu/lib/ lucene/analysis/morfologik/lib/
lucene/analysis/phonetic/lib/ lucene/analysis/uima/lib/ lucene/benchmark/
lucene/benchmark/lib/ lucene/demo/ ...
Author: rmuir
Date: Fri Jul 27 22:02:24 2012
New Revision: 1366552
URL: http://svn.apache.org/viewvc?rev=1366552&view=rev
Log:
LUCENE-4262: add ivy sync=true, so when resolve runs, only jars that should be there are there
Added:
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
- copied from r1366509, lucene/dev/trunk/lucene/licenses/
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
- copied from r1366509, lucene/dev/trunk/solr/licenses/
Removed:
lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-49.1.jar.sha1
lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar.sha1
lucene/dev/branches/branch_4x/lucene/analysis/morfologik/lib/morfologik-fsa-LICENSE-BSD.txt
lucene/dev/branches/branch_4x/lucene/analysis/morfologik/lib/morfologik-fsa-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar.sha1
lucene/dev/branches/branch_4x/lucene/analysis/morfologik/lib/morfologik-polish-LICENSE-BSD.txt
lucene/dev/branches/branch_4x/lucene/analysis/morfologik/lib/morfologik-polish-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar.sha1
lucene/dev/branches/branch_4x/lucene/analysis/morfologik/lib/morfologik-stemming-LICENSE-BSD.txt
lucene/dev/branches/branch_4x/lucene/analysis/morfologik/lib/morfologik-stemming-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/analysis/phonetic/lib/commons-codec-1.6.jar.sha1
lucene/dev/branches/branch_4x/lucene/analysis/phonetic/lib/commons-codec-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/analysis/phonetic/lib/commons-codec-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/analysis/uima/lib/Tagger-2.3.1.jar.sha1
lucene/dev/branches/branch_4x/lucene/analysis/uima/lib/Tagger-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/analysis/uima/lib/Tagger-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/analysis/uima/lib/WhitespaceTokenizer-2.3.1.jar.sha1
lucene/dev/branches/branch_4x/lucene/analysis/uima/lib/WhitespaceTokenizer-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/analysis/uima/lib/WhitespaceTokenizer-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/analysis/uima/lib/uimaj-core-2.3.1.jar.sha1
lucene/dev/branches/branch_4x/lucene/analysis/uima/lib/uimaj-core-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/analysis/uima/lib/uimaj-core-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/benchmark/lib/commons-compress-1.3.jar.sha1
lucene/dev/branches/branch_4x/lucene/benchmark/lib/commons-compress-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/benchmark/lib/commons-compress-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/benchmark/lib/nekohtml-1.9.15.jar.sha1
lucene/dev/branches/branch_4x/lucene/benchmark/lib/nekohtml-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/benchmark/lib/nekohtml-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/benchmark/lib/xercesImpl-2.9.1.jar.sha1
lucene/dev/branches/branch_4x/lucene/benchmark/lib/xercesImpl-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/benchmark/lib/xercesImpl-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/demo/lib/servlet-api-2.4.jar.sha1
lucene/dev/branches/branch_4x/lucene/demo/lib/servlet-api-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/demo/lib/servlet-api-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/sandbox/lib/jakarta-regexp-1.4.jar.sha1
lucene/dev/branches/branch_4x/lucene/sandbox/lib/jakarta-regexp-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/sandbox/lib/jakarta-regexp-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/spatial/lib/spatial4j-0.2.jar.sha1
lucene/dev/branches/branch_4x/lucene/spatial/lib/spatial4j-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/spatial/lib/spatial4j-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/test-framework/lib/ant-1.8.2.jar.sha1
lucene/dev/branches/branch_4x/lucene/test-framework/lib/ant-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/test-framework/lib/ant-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/test-framework/lib/ant-junit-1.8.2.jar.sha1
lucene/dev/branches/branch_4x/lucene/test-framework/lib/ant-junit-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/test-framework/lib/ant-junit-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/test-framework/lib/junit-4.10.jar.sha1
lucene/dev/branches/branch_4x/lucene/test-framework/lib/junit-LICENSE-CPL.txt
lucene/dev/branches/branch_4x/lucene/test-framework/lib/junit-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/test-framework/lib/junit4-ant-1.6.0.jar.sha1
lucene/dev/branches/branch_4x/lucene/test-framework/lib/junit4-ant-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/test-framework/lib/junit4-ant-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/test-framework/lib/randomizedtesting-runner-1.6.0.jar.sha1
lucene/dev/branches/branch_4x/lucene/test-framework/lib/randomizedtesting-runner-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/test-framework/lib/randomizedtesting-runner-NOTICE.txt
lucene/dev/branches/branch_4x/lucene/tools/lib/asm-debug-all-4.0.jar.sha1
lucene/dev/branches/branch_4x/lucene/tools/lib/asm-debug-all-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/lucene/tools/lib/asm-debug-all-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/icu4j-49.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/icu4j-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/icu4j-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-fsa-1.5.3.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-fsa-LICENSE-BSD.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-fsa-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-polish-1.5.3.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-polish-LICENSE-BSD.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-polish-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-stemming-1.5.3.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-stemming-LICENSE-BSD.txt
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/morfologik-stemming-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/carrot2-core-3.5.0.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/carrot2-core-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/carrot2-core-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/hppc-0.3.3.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/hppc-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/hppc-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/jackson-core-asl-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/jackson-core-asl-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/jackson-mapper-asl-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/jackson-mapper-asl-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/mahout-collections-0.3.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/mahout-collections-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/mahout-collections-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/mahout-math-0.3.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/mahout-math-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/mahout-math-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/simple-xml-2.4.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/simple-xml-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/clustering/lib/simple-xml-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/lib/activation-1.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/lib/activation-LICENSE-CDDL.txt
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/lib/mail-1.4.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/lib/mail-LICENSE-CDDL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/apache-mime4j-core-0.7.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/apache-mime4j-core-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/apache-mime4j-core-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/apache-mime4j-dom-0.7.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/apache-mime4j-dom-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/apache-mime4j-dom-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/bcmail-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/bcmail-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/bcprov-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/bcprov-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/boilerpipe-1.1.0.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/boilerpipe-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/boilerpipe-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/commons-compress-1.3.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/commons-compress-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/commons-compress-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/dom4j-1.6.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/dom4j-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/dom4j-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/fontbox-1.6.0.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/fontbox-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/fontbox-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/icu4j-49.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/icu4j-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/icu4j-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/isoparser-1.0-beta-5.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/isoparser-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/isoparser-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/javassist-3.6.0.GA-LICENSE-MPL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/javassist-3.6.0.GA-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/javassist-3.6.0.GA.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/jdom-1.0.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/jdom-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/jdom-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/jempbox-1.6.0.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/jempbox-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/jempbox-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/metadata-extractor-LICENSE-PD.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/netcdf-4.2-min.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/netcdf-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/netcdf-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/pdfbox-1.6.0.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/pdfbox-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/pdfbox-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/poi-3.8-beta5.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/poi-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/poi-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/poi-ooxml-3.8-beta5.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/poi-ooxml-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/poi-ooxml-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta5.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/poi-ooxml-schemas-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/poi-ooxml-schemas-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/poi-scratchpad-3.8-beta5.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/poi-scratchpad-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/poi-scratchpad-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/rome-0.9.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/rome-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/rome-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/scannotation-1.0.2.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/scannotation-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/scannotation-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/tagsoup-1.2.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/tagsoup-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/tagsoup-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/tika-core-1.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/tika-core-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/tika-core-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/tika-parsers-1.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/tika-parsers-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/tika-parsers-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/vorbis-java-core-0.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/vorbis-java-core-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/vorbis-java-core-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/vorbis-java-tika-0.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/vorbis-java-tika-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/vorbis-java-tika-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/xercesImpl-2.9.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/xercesImpl-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/xercesImpl-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/xmlbeans-2.3.0.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/xmlbeans-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/xmlbeans-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/langid/lib/jsonic-1.2.7.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/langid/lib/jsonic-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/langid/lib/jsonic-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/langid/lib/langdetect-1.1-20120112.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/langid/lib/langdetect-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/langid/lib/langdetect-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/AlchemyAPIAnnotator-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/AlchemyAPIAnnotator-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/OpenCalaisAnnotator-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/OpenCalaisAnnotator-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/Tagger-2.3.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/Tagger-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/Tagger-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/WhitespaceTokenizer-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/WhitespaceTokenizer-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/commons-digester-2.0.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/commons-digester-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/commons-digester-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/uimaj-core-2.3.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/uimaj-core-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/uima/lib/uimaj-core-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/velocity/lib/commons-beanutils-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/velocity/lib/commons-beanutils-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/velocity/lib/commons-collections-3.2.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/velocity/lib/commons-collections-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/velocity/lib/commons-collections-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/velocity/lib/velocity-1.6.4.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/velocity/lib/velocity-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/velocity/lib/velocity-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/velocity/lib/velocity-tools-2.0.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/velocity/lib/velocity-tools-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/contrib/velocity/lib/velocity-tools-NOTICE.txt
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar.sha1
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/lib/hsqldb-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/lib/hsqldb-NOTICE.txt
lucene/dev/branches/branch_4x/solr/example/lib/jetty-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/example/lib/jetty-NOTICE.txt
lucene/dev/branches/branch_4x/solr/example/lib/jetty-continuation-8.1.2.v20120308.jar.sha1
lucene/dev/branches/branch_4x/solr/example/lib/jetty-deploy-8.1.2.v20120308.jar.sha1
lucene/dev/branches/branch_4x/solr/example/lib/jetty-http-8.1.2.v20120308.jar.sha1
lucene/dev/branches/branch_4x/solr/example/lib/jetty-io-8.1.2.v20120308.jar.sha1
lucene/dev/branches/branch_4x/solr/example/lib/jetty-jmx-8.1.2.v20120308.jar.sha1
lucene/dev/branches/branch_4x/solr/example/lib/jetty-security-8.1.2.v20120308.jar.sha1
lucene/dev/branches/branch_4x/solr/example/lib/jetty-server-8.1.2.v20120308.jar.sha1
lucene/dev/branches/branch_4x/solr/example/lib/jetty-servlet-8.1.2.v20120308.jar.sha1
lucene/dev/branches/branch_4x/solr/example/lib/jetty-util-8.1.2.v20120308.jar.sha1
lucene/dev/branches/branch_4x/solr/example/lib/jetty-webapp-8.1.2.v20120308.jar.sha1
lucene/dev/branches/branch_4x/solr/example/lib/jetty-xml-8.1.2.v20120308.jar.sha1
lucene/dev/branches/branch_4x/solr/example/lib/servlet-api-3.0.jar.sha1
lucene/dev/branches/branch_4x/solr/example/lib/servlet-api-LICENSE-CDDL.txt
lucene/dev/branches/branch_4x/solr/example/lib/servlet-api-NOTICE.txt
lucene/dev/branches/branch_4x/solr/example/start.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/README.committers.txt
lucene/dev/branches/branch_4x/solr/lib/commons-cli-1.2.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/commons-cli-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/commons-cli-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/commons-codec-1.6.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/commons-codec-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/commons-codec-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/commons-fileupload-1.2.1.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/commons-fileupload-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/commons-fileupload-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/commons-io-2.1.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/commons-io-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/commons-io-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/commons-lang-2.6.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/commons-lang-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/commons-lang-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/easymock-2.2.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/easymock-LICENSE-MIT.txt
lucene/dev/branches/branch_4x/solr/lib/guava-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/guava-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/guava-r05.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/httpclient-4.1.3.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/httpclient-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/httpclient-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/httpcore-4.1.4.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/httpcore-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/httpcore-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/httpmime-4.1.3.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/httpmime-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/httpmime-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/javax.servlet-api-3.0.1.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/javax.servlet-api-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/javax.servlet-api-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/jcl-over-slf4j-1.6.4.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/jcl-over-slf4j-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/lib/jcl-over-slf4j-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/log4j-over-slf4j-1.6.4.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/log4j-over-slf4j-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/lib/log4j-over-slf4j-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/slf4j-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/lib/slf4j-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/slf4j-api-1.6.4.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/slf4j-jdk14-1.6.4.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/spatial4j-0.2.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/spatial4j-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/spatial4j-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/wstx-asl-3.2.7.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/wstx-asl-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/wstx-asl-NOTICE.txt
lucene/dev/branches/branch_4x/solr/lib/zookeeper-3.3.5.jar.sha1
lucene/dev/branches/branch_4x/solr/lib/zookeeper-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/lib/zookeeper-NOTICE.txt
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (contents, props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/custom-tasks.xml
lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/build.xml
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/lib/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/build.xml
Modified: lucene/dev/branches/branch_4x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/build.xml?rev=1366552&r1=1366551&r2=1366552&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/build.xml Fri Jul 27 22:02:24 2012
@@ -167,7 +167,7 @@
<target name="validate" depends="check-licenses,rat-sources,check-forbidden-apis" description="Validate stuff." />
<target name="check-licenses" depends="compile-tools,resolve,load-custom-tasks" description="Validate license stuff.">
- <license-check-macro dir="${basedir}" />
+ <license-check-macro dir="${basedir}" licensedir="${common.dir}/licenses" />
</target>
<target name="check-forbidden-apis" depends="compile-tools,compile-test,load-custom-tasks,-check-forbidden-jdk-apis,-check-forbidden-test-apis,-check-system-out" description="Check forbidden API calls in compiled class files"/>
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1366552&r1=1366551&r2=1366552&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Fri Jul 27 22:02:24 2012
@@ -60,6 +60,7 @@
<property name="ivy.resource" value="org/apache/ivy/ant/antlib.xml" />
<available resource="${ivy.resource}" property="ivy.available" />
<property name="ivy.default.configuration" value="*"/>
+ <property name="ivy.sync" value="true"/>
<property name="junit.jar" value="junit-4.10.jar"/>
<property name="junit-location.jar" value="${common.dir}/test-framework/lib/${junit.jar}"/>
@@ -294,7 +295,7 @@
<!-- todo, make this a property or something.
only special cases need bundles -->
<ivy:retrieve type="jar,bundle" log="download-only"
- conf="${ivy.default.configuration}"/>
+ conf="${ivy.default.configuration}" sync="${ivy.sync}"/>
</target>
<property name="ivy_install_path" location="${user.home}/.ant/lib" />
Modified: lucene/dev/branches/branch_4x/lucene/tools/custom-tasks.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/tools/custom-tasks.xml?rev=1366552&r1=1366551&r2=1366552&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/tools/custom-tasks.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/tools/custom-tasks.xml Fri Jul 27 22:02:24 2012
@@ -18,12 +18,13 @@
<macrodef name="license-check-macro">
<attribute name="dir" />
+ <attribute name="licensedir" />
<element name="additional-excludes" optional="true" />
<element name="additional-filters" optional="true" />
<sequential>
<!-- LICENSE and NOTICE verification macro. -->
<echo>License check under: @{dir}</echo>
- <licenses>
+ <licenses licenseDirectory="@{licensedir}">
<fileset dir="@{dir}">
<include name="**/*.jar" />
<!-- Speed up scanning a bit. -->
Modified: lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java?rev=1366552&r1=1366551&r2=1366552&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java Fri Jul 27 22:02:24 2012
@@ -58,6 +58,11 @@ public class LicenseCheckTask extends Ta
* All JAR files to check.
*/
private Resources jarResources = new Resources();
+
+ /**
+ * Directory containing licenses
+ */
+ private File licenseDirectory;
/**
* License file mapper.
@@ -94,6 +99,10 @@ public class LicenseCheckTask extends Ta
public void setVerbose(boolean verbose) {
verboseLevel = (verbose ? Project.MSG_INFO : Project.MSG_VERBOSE);
}
+
+ public void setLicenseDirectory(File file) {
+ licenseDirectory = file;
+ }
/**
* Execute the task.
@@ -153,7 +162,7 @@ public class LicenseCheckTask extends Ta
log("Scanning: " + jarFile.getPath(), verboseLevel);
// validate the jar matches against our expected hash
- final File checksumFile = new File(jarFile.getParent(),
+ final File checksumFile = new File(licenseDirectory,
jarFile.getName() + "." + CHECKSUM_TYPE);
if (! (checksumFile.exists() && checksumFile.canRead()) ) {
log("MISSING " +CHECKSUM_TYPE+ " checksum file for: " + jarFile.getPath(), Project.MSG_ERR);
@@ -200,9 +209,9 @@ public class LicenseCheckTask extends Ta
Map<File, LicenseType> foundLicenses = new LinkedHashMap<File, LicenseType>();
List<File> expectedLocations = new ArrayList<File>();
outer:
- for (String mappedPath : licenseMapper.mapFileName(jarFile.getPath())) {
+ for (String mappedPath : licenseMapper.mapFileName(jarFile.getName())) {
for (LicenseType licenseType : LicenseType.values()) {
- File licensePath = new File(mappedPath + licenseType.licenseFileSuffix());
+ File licensePath = new File(licenseDirectory, mappedPath + licenseType.licenseFileSuffix());
if (licensePath.exists()) {
foundLicenses.put(licensePath, licenseType);
log(" FOUND " + licenseType.name() + " license at " + licensePath.getPath(),
@@ -218,10 +227,10 @@ outer:
// Check for NOTICE files.
for (Map.Entry<File, LicenseType> e : foundLicenses.entrySet()) {
LicenseType license = e.getValue();
- String licensePath = e.getKey().getAbsolutePath();
+ String licensePath = e.getKey().getName();
String baseName = licensePath.substring(
0, licensePath.length() - license.licenseFileSuffix().length());
- File noticeFile = new File(baseName + license.noticeFileSuffix());
+ File noticeFile = new File(licenseDirectory, baseName + license.noticeFileSuffix());
if (noticeFile.exists()) {
log(" FOUND NOTICE file at " + noticeFile.getAbsolutePath(), verboseLevel);
Modified: lucene/dev/branches/branch_4x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/build.xml?rev=1366552&r1=1366551&r2=1366552&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/build.xml Fri Jul 27 22:02:24 2012
@@ -174,7 +174,7 @@
<target name="validate" depends="check-licenses,rat-sources,check-forbidden-apis" description="Validate stuff." />
<target name="check-licenses" depends="compile-tools,resolve,load-custom-tasks" description="Validate license stuff.">
- <license-check-macro dir="${basedir}">
+ <license-check-macro dir="${basedir}" licensedir="${common-solr.dir}/licenses">
<additional-excludes>
<!-- Exclude start.jar only (it'd be weird to have a license file there?) -->
<exclude name="example/start.jar" />
@@ -182,10 +182,10 @@
<exclude name="example/solr-webapp/**" />
</additional-excludes>
<additional-filters>
- <replaceregex pattern="/jetty([^/]+)$" replace="/jetty" flags="gi" />
- <replaceregex pattern="/apache-solr-commons-csv-([^/]+)$" replace="/apache-solr-commons-csv" flags="gi" />
- <replaceregex pattern="/slf4j-([^/]+)$" replace="/slf4j" flags="gi" />
- <replaceregex pattern="/(bcmail|bcprov)-([^/]+)$" replace="/\1" flags="gi" />
+ <replaceregex pattern="jetty([^/]+)$" replace="jetty" flags="gi" />
+ <replaceregex pattern="apache-solr-commons-csv-([^/]+)$" replace="apache-solr-commons-csv" flags="gi" />
+ <replaceregex pattern="slf4j-([^/]+)$" replace="slf4j" flags="gi" />
+ <replaceregex pattern="(bcmail|bcprov)-([^/]+)$" replace="\1" flags="gi" />
</additional-filters>
</license-check-macro>
</target>
Modified: lucene/dev/branches/branch_4x/solr/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/build.xml?rev=1366552&r1=1366551&r2=1366552&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/core/build.xml Fri Jul 27 22:02:24 2012
@@ -21,6 +21,8 @@
<!-- hackidty-hack-hack -->
<property name="ivy.retrieve.pattern" value="${common-solr.dir}/lib/[artifact]-[revision].[ext]"/>
+ <!-- we cannot sync because solr/core and solr/solrj share the same lib/... clean this up! -->
+ <property name="ivy.sync" value="false"/>
<!-- html file for testing -->
<property name="rat.excludes" value="**/htmlStripReaderTest.html"/>
Modified: lucene/dev/branches/branch_4x/solr/solrj/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/build.xml?rev=1366552&r1=1366551&r2=1366552&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/build.xml Fri Jul 27 22:02:24 2012
@@ -20,6 +20,9 @@
<property name="ivy.retrieve.pattern" value="${common-solr.dir}/lib/[artifact]-[revision].[ext]"/>
+ <!-- we cannot sync because solr/core and solr/solrj share the same lib/... clean this up! -->
+ <property name="ivy.sync" value="false"/>
+
<import file="../common-build.xml"/>
<!-- Specialized common-solr.test.classpath, to remove the Solr core test output -->