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 2011/11/02 18:11:06 UTC
svn commit: r1196701 [1/3] - in /lucene/dev/branches/lucene2621: ./
dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/.idea/libraries/
dev-tools/idea/lucene/contrib/ dev-tools/idea/solr/contrib/velocity/
dev-tools/maven/ dev-tools/maven/lucene/co...
Author: rmuir
Date: Wed Nov 2 17:11:00 2011
New Revision: 1196701
URL: http://svn.apache.org/viewvc?rev=1196701&view=rev
Log:
LUCENE-3490: merge trunk (1188713:1196665)
Added:
lucene/dev/branches/lucene2621/dev-tools/idea/.idea/libraries/Solr_velocity_library.xml
- copied unchanged from r1196665, lucene/dev/trunk/dev-tools/idea/.idea/libraries/Solr_velocity_library.xml
lucene/dev/branches/lucene2621/dev-tools/idea/solr/contrib/velocity/
- copied from r1196665, lucene/dev/trunk/dev-tools/idea/solr/contrib/velocity/
lucene/dev/branches/lucene2621/dev-tools/idea/solr/contrib/velocity/velocity.iml
- copied unchanged from r1196665, lucene/dev/trunk/dev-tools/idea/solr/contrib/velocity/velocity.iml
lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/velocity/
- copied from r1196665, lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/
lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/velocity/pom.xml.template
- copied unchanged from r1196665, lucene/dev/trunk/dev-tools/maven/solr/contrib/velocity/pom.xml.template
lucene/dev/branches/lucene2621/lucene/lib/maven-ant-tasks-2.1.3.jar
- copied unchanged from r1196665, lucene/dev/trunk/lucene/lib/maven-ant-tasks-2.1.3.jar
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermInfosReaderIndex.java (contents, props changed)
- copied, changed from r1196682, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/preflex/TermInfosReaderIndex.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/
- copied from r1196591, lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestSurrogates.java
- copied, changed from r1196601, lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestTermInfosReaderIndex.java
- copied, changed from r1196665, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestTermInfosReaderIndex.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/util/TestPagedBytes.java
- copied unchanged from r1196665, lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestPagedBytes.java
lucene/dev/branches/lucene2621/modules/analysis/phonetic/lib/commons-codec-1.5.jar
- copied unchanged from r1196665, lucene/dev/trunk/modules/analysis/phonetic/lib/commons-codec-1.5.jar
lucene/dev/branches/lucene2621/modules/suggest/src/java/org/apache/lucene/search/spell/LuceneLevenshteinDistance.java
- copied unchanged from r1196665, lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/spell/LuceneLevenshteinDistance.java
lucene/dev/branches/lucene2621/solr/contrib/velocity/ (props changed)
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/
lucene/dev/branches/lucene2621/solr/contrib/velocity/build.xml
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/build.xml
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/commons-beanutils-LICENSE-ASL.txt
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/commons-beanutils-LICENSE-ASL.txt
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/commons-beanutils-NOTICE.txt
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/commons-beanutils-NOTICE.txt
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/commons-collections-3.2.1.jar
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/commons-collections-3.2.1.jar
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/commons-collections-LICENSE-ASL.txt
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/commons-collections-LICENSE-ASL.txt
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/commons-collections-NOTICE.txt
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/commons-collections-NOTICE.txt
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/velocity-1.6.4.jar
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/velocity-1.6.4.jar
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/velocity-LICENSE-ASL.txt
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/velocity-LICENSE-ASL.txt
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/velocity-NOTICE.txt
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/velocity-NOTICE.txt
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/velocity-tools-2.0.jar
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/velocity-tools-2.0.jar
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/velocity-tools-LICENSE-ASL.txt
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/velocity-tools-LICENSE-ASL.txt
lucene/dev/branches/lucene2621/solr/contrib/velocity/lib/velocity-tools-NOTICE.txt
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/lib/velocity-tools-NOTICE.txt
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/java/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/java/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/java/org/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/java/org/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/java/org/apache/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/java/org/apache/solr/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/java/org/apache/solr/response/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/java/org/apache/solr/response/SolrParamResourceLoader.java
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/SolrParamResourceLoader.java
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/java/overview.html
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/java/overview.html
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test-files/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test-files/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test-files/velocity/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test-files/velocity/solr/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test-files/velocity/solr/conf/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/conf/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test-files/velocity/solr/conf/schema.xml
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/conf/schema.xml
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test-files/velocity/solr/conf/solrconfig.xml
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/conf/solrconfig.xml
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test-files/velocity/solr/conf/velocity/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/conf/velocity/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test-files/velocity/solr/conf/velocity/VM_global_library.vm
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/conf/velocity/VM_global_library.vm
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test/org/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test/org/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test/org/apache/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test/org/apache/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test/org/apache/solr/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test/org/apache/solr/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test/org/apache/solr/velocity/
- copied from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test/org/apache/solr/velocity/
lucene/dev/branches/lucene2621/solr/contrib/velocity/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java
- copied unchanged from r1196665, lucene/dev/trunk/solr/contrib/velocity/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/conf/solrconfig-lazywriter.xml
- copied unchanged from r1196665, lucene/dev/trunk/solr/core/src/test-files/solr/conf/solrconfig-lazywriter.xml
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
- copied unchanged from r1196665, lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
- copied unchanged from r1196665, lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java
lucene/dev/branches/lucene2621/solr/lib/commons-codec-1.5.jar
- copied unchanged from r1196665, lucene/dev/trunk/solr/lib/commons-codec-1.5.jar
Removed:
lucene/dev/branches/lucene2621/lucene/lib/maven-ant-tasks-2.1.1.jar
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/
lucene/dev/branches/lucene2621/modules/analysis/phonetic/lib/commons-codec-1.4.jar
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/response/PageTool.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/response/SolrParamResourceLoader.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/response/VelocityResponseWriter.java
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/conf/velocity/
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/velocity/
lucene/dev/branches/lucene2621/solr/lib/commons-beanutils-1.7.0.jar
lucene/dev/branches/lucene2621/solr/lib/commons-beanutils-LICENSE-ASL.txt
lucene/dev/branches/lucene2621/solr/lib/commons-beanutils-NOTICE.txt
lucene/dev/branches/lucene2621/solr/lib/commons-codec-1.4.jar
lucene/dev/branches/lucene2621/solr/lib/commons-collections-3.2.1.jar
lucene/dev/branches/lucene2621/solr/lib/commons-collections-LICENSE-ASL.txt
lucene/dev/branches/lucene2621/solr/lib/commons-collections-NOTICE.txt
lucene/dev/branches/lucene2621/solr/lib/velocity-1.6.4.jar
lucene/dev/branches/lucene2621/solr/lib/velocity-LICENSE-ASL.txt
lucene/dev/branches/lucene2621/solr/lib/velocity-NOTICE.txt
lucene/dev/branches/lucene2621/solr/lib/velocity-tools-2.0.jar
lucene/dev/branches/lucene2621/solr/lib/velocity-tools-LICENSE-ASL.txt
lucene/dev/branches/lucene2621/solr/lib/velocity-tools-NOTICE.txt
Modified:
lucene/dev/branches/lucene2621/ (props changed)
lucene/dev/branches/lucene2621/dev-tools/eclipse/dot.classpath
lucene/dev/branches/lucene2621/dev-tools/idea/.idea/ant.xml
lucene/dev/branches/lucene2621/dev-tools/idea/.idea/modules.xml
lucene/dev/branches/lucene2621/dev-tools/idea/.idea/workspace.xml
lucene/dev/branches/lucene2621/dev-tools/idea/lucene/contrib/ (props changed)
lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/demo/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/memory/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/misc/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/lucene/src/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/common/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/icu/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/morfologik/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/stempel/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/benchmark/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/facet/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/grouping/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/join/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/queries/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/queryparser/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/modules/suggest/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/extraction/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/langid/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/uima/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/solrj/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/test-framework/pom.xml.template
lucene/dev/branches/lucene2621/dev-tools/maven/solr/webapp/pom.xml.template
lucene/dev/branches/lucene2621/lucene/ (props changed)
lucene/dev/branches/lucene2621/lucene/CHANGES.txt
lucene/dev/branches/lucene2621/lucene/common-build.xml
lucene/dev/branches/lucene2621/lucene/contrib/CHANGES.txt
lucene/dev/branches/lucene2621/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (props changed)
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermInfosReader.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/values/Bytes.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/store/ByteArrayDataInput.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/store/IndexInput.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/CharsRef.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/FixedBitSet.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/PagedBytes.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/util/mutable/MutableValue.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/java/org/apache/lucene/store/MockIndexInputWrapper.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestAssertions.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestImpersonation.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/store/TestCopyBytes.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/util/TestCharsRef.java
lucene/dev/branches/lucene2621/modules/facet/build.xml
lucene/dev/branches/lucene2621/modules/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java
lucene/dev/branches/lucene2621/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java
lucene/dev/branches/lucene2621/modules/facet/src/java/org/apache/lucene/DocumentBuilder.java
lucene/dev/branches/lucene2621/modules/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java
lucene/dev/branches/lucene2621/modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
lucene/dev/branches/lucene2621/modules/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java
lucene/dev/branches/lucene2621/modules/join/build.xml
lucene/dev/branches/lucene2621/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AnalyzerQueryNodeProcessor.java
lucene/dev/branches/lucene2621/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
lucene/dev/branches/lucene2621/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java (props changed)
lucene/dev/branches/lucene2621/modules/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java
lucene/dev/branches/lucene2621/modules/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java
lucene/dev/branches/lucene2621/solr/ (props changed)
lucene/dev/branches/lucene2621/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene2621/solr/LICENSE.txt (props changed)
lucene/dev/branches/lucene2621/solr/NOTICE.txt (props changed)
lucene/dev/branches/lucene2621/solr/README.txt (props changed)
lucene/dev/branches/lucene2621/solr/build.xml (props changed)
lucene/dev/branches/lucene2621/solr/client/ (props changed)
lucene/dev/branches/lucene2621/solr/common-build.xml (contents, props changed)
lucene/dev/branches/lucene2621/solr/contrib/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
lucene/dev/branches/lucene2621/solr/contrib/clustering/src/test-files/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/dataimporthandler-extras/src/java/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/dataimporthandler/src/java/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/dataimporthandler/src/test-files/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/dataimporthandler/src/test/org/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
lucene/dev/branches/lucene2621/solr/contrib/uima/src/java/ (props changed)
lucene/dev/branches/lucene2621/solr/contrib/uima/src/test-files/ (props changed)
lucene/dev/branches/lucene2621/solr/core/ (props changed)
lucene/dev/branches/lucene2621/solr/core/src/java/ (props changed)
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
lucene/dev/branches/lucene2621/solr/core/src/test/ (props changed)
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/conf/solrconfig.xml
lucene/dev/branches/lucene2621/solr/core/src/test-files/solr/crazy-path-to-config.xml
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/OutputWriterTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java
lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java
lucene/dev/branches/lucene2621/solr/dev-tools/ (props changed)
lucene/dev/branches/lucene2621/solr/example/ (props changed)
lucene/dev/branches/lucene2621/solr/example/solr/conf/solrconfig.xml
lucene/dev/branches/lucene2621/solr/lib/ (props changed)
lucene/dev/branches/lucene2621/solr/scripts/ (props changed)
lucene/dev/branches/lucene2621/solr/site/ (props changed)
lucene/dev/branches/lucene2621/solr/site-src/ (props changed)
lucene/dev/branches/lucene2621/solr/site-src/src/documentation/content/xdocs/index.xml
lucene/dev/branches/lucene2621/solr/site/features.pdf
lucene/dev/branches/lucene2621/solr/site/index.html
lucene/dev/branches/lucene2621/solr/site/index.pdf
lucene/dev/branches/lucene2621/solr/site/issue_tracking.pdf
lucene/dev/branches/lucene2621/solr/site/linkmap.pdf
lucene/dev/branches/lucene2621/solr/site/mailing_lists.pdf
lucene/dev/branches/lucene2621/solr/site/skin/print.css
lucene/dev/branches/lucene2621/solr/site/skin/profile.css
lucene/dev/branches/lucene2621/solr/site/tutorial.pdf
lucene/dev/branches/lucene2621/solr/site/version_control.pdf
lucene/dev/branches/lucene2621/solr/solrj/ (props changed)
lucene/dev/branches/lucene2621/solr/solrj/src/java/ (props changed)
lucene/dev/branches/lucene2621/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
lucene/dev/branches/lucene2621/solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java
lucene/dev/branches/lucene2621/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
lucene/dev/branches/lucene2621/solr/solrj/src/test/org/apache/solr/client/ (props changed)
lucene/dev/branches/lucene2621/solr/solrj/src/test/org/apache/solr/client/solrj/ (props changed)
lucene/dev/branches/lucene2621/solr/solrj/src/test/org/apache/solr/common/ (props changed)
lucene/dev/branches/lucene2621/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java
lucene/dev/branches/lucene2621/solr/test-framework/ (props changed)
lucene/dev/branches/lucene2621/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/lucene2621/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
lucene/dev/branches/lucene2621/solr/testlogging.properties (props changed)
lucene/dev/branches/lucene2621/solr/webapp/ (props changed)
Modified: lucene/dev/branches/lucene2621/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/eclipse/dot.classpath?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/lucene2621/dev-tools/eclipse/dot.classpath Wed Nov 2 17:11:00 2011
@@ -75,19 +75,22 @@
<classpathentry kind="src" path="solr/contrib/extraction/src/test"/>
<classpathentry kind="src" path="solr/contrib/extraction/src/test-files"/>
<classpathentry kind="src" path="solr/contrib/langid/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/langid/src/resources"/>
<classpathentry kind="src" path="solr/contrib/langid/src/test"/>
<classpathentry kind="src" path="solr/contrib/langid/src/test-files"/>
<classpathentry kind="src" path="solr/contrib/uima/src/java"/>
<classpathentry kind="src" path="solr/contrib/uima/src/resources"/>
<classpathentry kind="src" path="solr/contrib/uima/src/test"/>
<classpathentry kind="src" path="solr/contrib/uima/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/langid/src/resources"/>
+ <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.7.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/phonetic/lib/commons-codec-1.4.jar"/>
+ <classpathentry kind="lib" path="modules/analysis/phonetic/lib/commons-codec-1.5.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"/>
@@ -98,9 +101,7 @@
<classpathentry kind="lib" path="modules/benchmark/lib/commons-logging-1.0.4.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1099557.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-beanutils-1.7.0.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-codec-1.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-collections-3.2.1.jar"/>
+ <classpathentry kind="lib" path="solr/lib/commons-codec-1.5.jar"/>
<classpathentry kind="lib" path="solr/lib/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/commons-httpclient-3.1.jar"/>
@@ -114,8 +115,6 @@
<classpathentry kind="lib" path="solr/lib/servlet-api-2.4.jar"/>
<classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.1.jar"/>
<classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/velocity-1.6.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/velocity-tools-2.0.jar"/>
<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
<classpathentry kind="lib" path="solr/lib/zookeeper-3.3.3.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar"/>
@@ -154,14 +153,16 @@
<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-core-0.10.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-0.10.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/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/uimaj-core-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-r111.jar"/>
- <classpathentry kind="lib" path="solr/contrib/langid/lib/jsonic-1.2.0.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"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: lucene/dev/branches/lucene2621/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/idea/.idea/ant.xml?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/lucene2621/dev-tools/idea/.idea/ant.xml Wed Nov 2 17:11:00 2011
@@ -32,6 +32,7 @@
<buildFile url="file://$PROJECT_DIR$/solr/contrib/extraction/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/langid/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/uima/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/solr/contrib/velocity/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/solrj/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/test-framework/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/webapp/build.xml" />
Modified: lucene/dev/branches/lucene2621/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/idea/.idea/modules.xml?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/lucene2621/dev-tools/idea/.idea/modules.xml Wed Nov 2 17:11:00 2011
@@ -32,6 +32,7 @@
<module filepath="$PROJECT_DIR$/solr/contrib/extraction/extraction.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/langid/langid.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/uima/uima.iml" />
+ <module filepath="$PROJECT_DIR$/solr/contrib/velocity/velocity.iml" />
</modules>
</component>
</project>
Modified: lucene/dev/branches/lucene2621/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/idea/.idea/workspace.xml?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/lucene2621/dev-tools/idea/.idea/workspace.xml Wed Nov 2 17:11:00 2011
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunManager" selected="JUnit.lucene">
+ <configuration default="true" type="JUnit" factoryName="JUnit">
+ <option name="VM_PARAMETERS" value="-ea" />
+ </configuration>
<configuration default="false" name="analysis-extras contrib" type="JUnit" factoryName="JUnit">
<module name="analysis-extras" />
<option name="TEST_OBJECT" value="package" />
@@ -197,7 +200,14 @@
<option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <list size="28">
+ <configuration default="false" name="velocity contrib" type="JUnit" factoryName="JUnit">
+ <module name="velocity" />
+ <option name="TEST_OBJECT" value="package" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-velocity" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ </configuration>
+ <list size="29">
<item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
<item index="1" class="java.lang.String" itemvalue="JUnit.benchmark module" />
<item index="2" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
@@ -226,6 +236,7 @@
<item index="25" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
<item index="26" class="java.lang.String" itemvalue="JUnit.suggest module" />
<item index="27" class="java.lang.String" itemvalue="JUnit.uima contrib" />
+ <item index="28" class="java.lang.String" itemvalue="JUnit.velocity contrib" />
</list>
</component>
</project>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/demo/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/demo/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/demo/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -62,11 +62,6 @@
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -54,11 +54,6 @@
<artifactId>lucene-memory</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/instantiated/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -47,11 +47,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/memory/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/memory/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/memory/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/memory/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -55,11 +55,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/misc/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/misc/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/misc/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -47,11 +47,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -51,11 +51,6 @@
<groupId>jakarta-regexp</groupId>
<artifactId>jakarta-regexp</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/spatial/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/spatial/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/lucene/contrib/spatial/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -52,11 +52,6 @@
<artifactId>lucene-queries</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/lucene/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/lucene/src/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/lucene/src/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/lucene/src/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -107,7 +107,7 @@
</program>
<program>
<mainClass>org.apache.lucene.store.LockVerifyServer</mainClass>
- <name>IndexReader</name>
+ <name>LockVerifyServer</name>
</program>
<program>
<mainClass>org.apache.lucene.util.English</mainClass>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/common/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/common/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/common/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/common/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -47,11 +47,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/icu/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/icu/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/icu/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -59,11 +59,6 @@
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/morfologik/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/morfologik/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/morfologik/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/morfologik/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -58,11 +58,6 @@
<groupId>org.carrot2</groupId>
<artifactId>morfologik-polish</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/phonetic/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/phonetic/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/phonetic/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -58,11 +58,6 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/smartcn/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/smartcn/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/smartcn/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -52,11 +52,6 @@
<artifactId>lucene-analyzers-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/stempel/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/analysis/stempel/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -52,11 +52,6 @@
<artifactId>lucene-analyzers-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/benchmark/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/benchmark/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -73,6 +73,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lucene-xercesImpl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
@@ -92,15 +97,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/facet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/facet/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/facet/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/facet/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -54,11 +54,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/grouping/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/grouping/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/grouping/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/grouping/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -52,11 +52,6 @@
<artifactId>lucene-queries</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/join/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/join/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/join/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/join/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -52,11 +52,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/queries/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/queries/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/queries/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/queries/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -47,11 +47,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/queryparser/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/queryparser/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/queryparser/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -57,11 +57,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/modules/suggest/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/modules/suggest/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/modules/suggest/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/modules/suggest/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -52,11 +52,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>8</version>
+ <version>10</version>
<relativePath/>
</parent>
<groupId>org.apache.lucene</groupId>
@@ -138,7 +138,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -356,11 +356,6 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -393,12 +388,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -408,7 +403,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
<configuration>
<archive>
<!-- This section should be *exactly* the same under -->
@@ -434,15 +429,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.7.1</version>
+ <version>2.10</version>
<configuration>
<reportFormat>plain</reportFormat>
<workingDirectory>${project.build.directory}/test</workingDirectory>
+ <argLine>-Xmx512M</argLine>
<systemPropertyVariables>
<tempDir>.</tempDir>
<jetty.testMode>1</jetty.testMode>
@@ -487,17 +483,17 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.7</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-4</version>
+ <version>1.0</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -624,7 +620,7 @@
<goal>install-file</goal>
</goals>
<configuration>
- <groupId>org.apache.lucene</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>lucene-xercesImpl</artifactId>
<version>${project.version}</version>
<packaging>jar</packaging>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -49,11 +49,6 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-icu</artifactId>
<version>${project.version}</version>
</dependency>
@@ -67,27 +62,6 @@
<artifactId>lucene-analyzers-stempel</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/clustering/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -48,31 +48,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.carrot2</groupId>
<artifactId>carrot2-core</artifactId>
<exclusions>
@@ -99,11 +74,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<scope>test</scope>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -60,21 +60,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
@@ -86,19 +71,6 @@
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -42,46 +42,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/extraction/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -51,42 +51,17 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/langid/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/langid/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/langid/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/langid/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -1,114 +1,98 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-parent</artifactId>
- <version>@version@</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-langid</artifactId>
- <packaging>jar</packaging>
- <name>Apache Solr Language Identifier</name>
- <description>
- This module is intended to be used while indexing documents.
- It is implemented as an UpdateProcessor to be placed in an UpdateChain.
- Its purpose is to identify language from documents and tag the document with language code.
- </description>
- <properties>
- <module-directory>solr/contrib/solr-langid</module-directory>
- <build-directory>../../build/contrib/solr-langid</build-directory>
- </properties>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-jsonic</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-langdetect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <directory>${build-directory}</directory>
- <outputDirectory>${build-directory}/classes/java</outputDirectory>
- <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test-files</directory>
- </testResource>
- <testResource>
- <directory>../../core/src/test-files</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <java.util.logging.config.file>../../../../testlogging.properties</java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-parent</artifactId>
+ <version>@version@</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-langid</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Solr Language Identifier</name>
+ <description>
+ This module is intended to be used while indexing documents.
+ It is implemented as an UpdateProcessor to be placed in an UpdateChain.
+ Its purpose is to identify language from documents and tag the document with language code.
+ </description>
+ <properties>
+ <module-directory>solr/contrib/solr-langid</module-directory>
+ <build-directory>../../build/contrib/solr-langid</build-directory>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-jsonic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-langdetect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <directory>${build-directory}</directory>
+ <outputDirectory>${build-directory}/classes/java</outputDirectory>
+ <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test-files</directory>
+ </testResource>
+ <testResource>
+ <directory>../../core/src/test-files</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.util.logging.config.file>../../../../testlogging.properties</java.util.logging.config.file>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -38,6 +38,7 @@
<module>extraction</module>
<module>langid</module>
<module>uima</module>
+ <module>velocity</module>
</modules>
<build>
<directory>../build/solr-contrib-aggregator</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/solr/contrib/uima/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -48,17 +48,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</dependency>
@@ -67,11 +56,6 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.uima</groupId>
<artifactId>AlchemyAPIAnnotator</artifactId>
</dependency>
@@ -91,15 +75,6 @@
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/solr/core/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/solr/core/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -47,9 +47,8 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -80,6 +79,12 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-sandbox</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -116,6 +121,16 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -126,12 +141,8 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -146,17 +157,9 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-jetty</artifactId>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<scope>runtime</scope>
@@ -170,12 +173,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <!-- compile scope; solr-core is a jar not a war -->
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/solr/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/solr/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -76,6 +76,23 @@
</mailingList>
</mailingLists>
<inceptionYear>2006</inceptionYear>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-test-framework</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<directory>build/solr-parent</directory>
<pluginManagement>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/solr/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/solr/solrj/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/solr/solrj/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/solr/solrj/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -37,12 +37,6 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<exclusions>
@@ -58,19 +52,50 @@
<groupId>com.sun.jdmk</groupId>
<artifactId>jmxtools</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <!-- Need log4j api so long as Zookeeper does; see https://issues.apache.org/jira/browse/ZOOKEEPER-850 -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <!-- Technically, this is optional in SolrJ; but it's fast. SOLR-2852 -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/branches/lucene2621/dev-tools/maven/solr/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/dev-tools/maven/solr/test-framework/pom.xml.template?rev=1196701&r1=1196700&r2=1196701&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/dev-tools/maven/solr/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/lucene2621/dev-tools/maven/solr/test-framework/pom.xml.template Wed Nov 2 17:11:00 2011
@@ -36,6 +36,7 @@
<build-directory>../build/solr-test-framework</build-directory>
</properties>
<dependencies>
+ <!-- These dependencies are compile scope because this is a test framework. -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>solr-core</artifactId>