You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/08/13 13:17:06 UTC
svn commit: r1372366 [1/8] - in /lucene/dev/branches/pforcodec_3892: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/libraries/
dev-tools/maven/ dev-tools/maven/lucene/
dev-tools/maven/lucene/analysis/common/
dev-tools/maven/lucene/analysis/icu/ ...
Author: mikemccand
Date: Mon Aug 13 11:16:57 2012
New Revision: 1372366
URL: http://svn.apache.org/viewvc?rev=1372366&view=rev
Log:
LUCENE-3892: merge trunk
Added:
lucene/dev/branches/pforcodec_3892/build-clover.xml
- copied unchanged from r1372357, lucene/dev/trunk/build-clover.xml
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/maven.testlogging.properties
- copied unchanged from r1372357, lucene/dev/trunk/dev-tools/maven/solr/maven.testlogging.properties
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/util/MergedIterator.java
- copied unchanged from r1372357, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/MergedIterator.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/util/UnmodifiableIterator.java
- copied unchanged from r1372357, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/UnmodifiableIterator.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/TestWorstCaseTestBehavior.java
- copied unchanged from r1372357, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestWorstCaseTestBehavior.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java
- copied unchanged from r1372357, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java
lucene/dev/branches/pforcodec_3892/lucene/licenses/junit4-ant-2.0.0.rc5.jar.sha1
- copied unchanged from r1372357, lucene/dev/trunk/lucene/licenses/junit4-ant-2.0.0.rc5.jar.sha1
lucene/dev/branches/pforcodec_3892/lucene/licenses/randomizedtesting-runner-2.0.0.rc5.jar.sha1
- copied unchanged from r1372357, lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.0.0.rc5.jar.sha1
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java
- copied unchanged from r1372357, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java
- copied unchanged from r1372357, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java
lucene/dev/branches/pforcodec_3892/lucene/tools/forbiddenApis/executors.txt
- copied unchanged from r1372357, lucene/dev/trunk/lucene/tools/forbiddenApis/executors.txt
lucene/dev/branches/pforcodec_3892/lucene/tools/junit4/logging.properties
- copied unchanged from r1372357, lucene/dev/trunk/lucene/tools/junit4/logging.properties
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
- copied unchanged from r1372357, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
- copied unchanged from r1372357, lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/velocity/debug.vm
- copied unchanged from r1372357, lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/debug.vm
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/velocity/join-doc.vm
- copied unchanged from r1372357, lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/join-doc.vm
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/velocity/product-doc.vm
- copied unchanged from r1372357, lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/product-doc.vm
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/velocity/richtext-doc.vm
- copied unchanged from r1372357, lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/richtext-doc.vm
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java
- copied unchanged from r1372357, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java
- copied unchanged from r1372357, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/test-files/solrj/solr/collection1/
- copied from r1372357, lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/
lucene/dev/branches/pforcodec_3892/solr/solrj/src/test-files/solrj/solr/solr.xml
- copied unchanged from r1372357, lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/solr.xml
lucene/dev/branches/pforcodec_3892/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
- copied unchanged from r1372357, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
lucene/dev/branches/pforcodec_3892/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
- copied unchanged from r1372357, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
lucene/dev/branches/pforcodec_3892/solr/test-framework/src/java/org/apache/solr/cloud/
- copied from r1372357, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/
lucene/dev/branches/pforcodec_3892/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.java
- copied unchanged from r1372357, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.java
lucene/dev/branches/pforcodec_3892/solr/webapp/web/img/filetypes/
- copied from r1372357, lucene/dev/trunk/solr/webapp/web/img/filetypes/
Removed:
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/FieldsEnum.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiFieldsEnum.java
lucene/dev/branches/pforcodec_3892/lucene/licenses/junit4-ant-1.6.0.jar.sha1
lucene/dev/branches/pforcodec_3892/lucene/licenses/randomizedtesting-runner-1.6.0.jar.sha1
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleNoInstanceHooksOverrides.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleNoStaticHooksShadowing.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleReportUncaughtExceptions.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/ZkTestServer.java
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/velocity/doc.vm
lucene/dev/branches/pforcodec_3892/solr/solrj/src/test-files/solrj/solr/conf/
Modified:
lucene/dev/branches/pforcodec_3892/ (props changed)
lucene/dev/branches/pforcodec_3892/build.xml
lucene/dev/branches/pforcodec_3892/dev-tools/ (props changed)
lucene/dev/branches/pforcodec_3892/dev-tools/eclipse/dot.classpath
lucene/dev/branches/pforcodec_3892/dev-tools/idea/.idea/libraries/JUnit.xml
lucene/dev/branches/pforcodec_3892/dev-tools/maven/README.maven
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/common/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/icu/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/stempel/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/uima/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/benchmark/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/core/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/demo/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/facet/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/grouping/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/highlighter/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/join/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/memory/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/misc/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/queries/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/queryparser/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/sandbox/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/suggest/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/test-framework/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/contrib/extraction/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/contrib/langid/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/contrib/uima/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/contrib/velocity/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/solrj/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/test-framework/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/webapp/pom.xml.template
lucene/dev/branches/pforcodec_3892/dev-tools/scripts/smokeTestRelease.py
lucene/dev/branches/pforcodec_3892/lucene/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/pforcodec_3892/lucene/MIGRATE.txt (contents, props changed)
lucene/dev/branches/pforcodec_3892/lucene/analysis/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/SUPPLEMENTARY.jflex-macro
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java
lucene/dev/branches/pforcodec_3892/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
lucene/dev/branches/pforcodec_3892/lucene/benchmark/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/dev/branches/pforcodec_3892/lucene/build.xml (contents, props changed)
lucene/dev/branches/pforcodec_3892/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/pforcodec_3892/lucene/core/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/analysis/package.html
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/FieldsConsumer.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/MappingMultiDocsAndPositionsEnum.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/PostingsConsumer.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/block/BlockPostingsReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsFormat.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsWriter.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/lucene40/package.html
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/document/FieldType.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/CoalescedDeletes.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/DocValues.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/Fields.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/IndexableFieldType.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MergeState.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/index/Terms.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/java/org/apache/lucene/util/hash/HashFunction.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestDoc.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestPostingsFormat.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/search/spans/MultiSpansWrapper.java
lucene/dev/branches/pforcodec_3892/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java
lucene/dev/branches/pforcodec_3892/lucene/facet/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/facet/src/java/org/apache/lucene/facet/search/PayloadIterator.java
lucene/dev/branches/pforcodec_3892/lucene/highlighter/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java
lucene/dev/branches/pforcodec_3892/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
lucene/dev/branches/pforcodec_3892/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java
lucene/dev/branches/pforcodec_3892/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/dev/branches/pforcodec_3892/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
lucene/dev/branches/pforcodec_3892/lucene/ivy-settings.xml (contents, props changed)
lucene/dev/branches/pforcodec_3892/lucene/licenses/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/memory/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/pforcodec_3892/lucene/misc/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
lucene/dev/branches/pforcodec_3892/lucene/module-build.xml (contents, props changed)
lucene/dev/branches/pforcodec_3892/lucene/suggest/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/test-framework/ivy.xml
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/search/RandomSimilarityProvider.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/LuceneJUnit3MethodProvider.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java
lucene/dev/branches/pforcodec_3892/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/pforcodec_3892/lucene/tools/ (props changed)
lucene/dev/branches/pforcodec_3892/lucene/tools/custom-tasks.xml
lucene/dev/branches/pforcodec_3892/solr/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/pforcodec_3892/solr/build.xml
lucene/dev/branches/pforcodec_3892/solr/common-build.xml (contents, props changed)
lucene/dev/branches/pforcodec_3892/solr/contrib/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
lucene/dev/branches/pforcodec_3892/solr/core/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/search/Grouping.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/update/CommitTracker.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/update/TransactionLog.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/update/UpdateLog.java
lucene/dev/branches/pforcodec_3892/solr/core/src/java/org/apache/solr/util/FastWriter.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test-files/solr/collection1/conf/schema.xml
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/search/TestRecovery.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/search/TestSolrJ.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java
lucene/dev/branches/pforcodec_3892/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java
lucene/dev/branches/pforcodec_3892/solr/example/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/schema.xml
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/velocity/VM_global_library.vm
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/velocity/facet_fields.vm
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/velocity/facet_ranges.vm
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/velocity/hit.vm
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/velocity/hitGrouped.vm
lucene/dev/branches/pforcodec_3892/solr/example/solr/collection1/conf/velocity/main.css
lucene/dev/branches/pforcodec_3892/solr/solrj/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/client/solrj/request/DirectXmlRequest.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/java/org/apache/zookeeper/SolrZooKeeper.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
lucene/dev/branches/pforcodec_3892/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
lucene/dev/branches/pforcodec_3892/solr/test-framework/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
lucene/dev/branches/pforcodec_3892/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/pforcodec_3892/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
lucene/dev/branches/pforcodec_3892/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java
lucene/dev/branches/pforcodec_3892/solr/testlogging.properties (contents, props changed)
lucene/dev/branches/pforcodec_3892/solr/webapp/ (props changed)
lucene/dev/branches/pforcodec_3892/solr/webapp/web/admin.html
lucene/dev/branches/pforcodec_3892/solr/webapp/web/js/scripts/app.js
Modified: lucene/dev/branches/pforcodec_3892/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/build.xml?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/build.xml (original)
+++ lucene/dev/branches/pforcodec_3892/build.xml Mon Aug 13 11:16:57 2012
@@ -51,11 +51,28 @@
</sequential>
</target>
- <target name="validate" description="Validate dependencies, licenses, etc.">
- <sequential><subant target="validate" inheritall="false" failonerror="true">
- <fileset dir="lucene" includes="build.xml" />
- <fileset dir="solr" includes="build.xml" />
- </subant></sequential>
+ <target name="validate" description="Validate dependencies, licenses, etc." depends="-validate-source-patterns">
+ <subant target="validate" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ <fileset dir="solr" includes="build.xml" />
+ </subant>
+ </target>
+
+ <target name="-validate-source-patterns" unless="disable.source-patterns">
+ <!-- check that there are no nocommits or @author javadoc tags: -->
+ <property name="validate.currDir" location="."/>
+ <pathconvert pathsep="${line.separator}" dirsep="/" property="validate.patternsFound" setonempty="false">
+ <fileset dir="${validate.currDir}">
+ <include name="**/*.java"/>
+ <exclude name="**/backwards/**"/>
+ <or>
+ <containsregexp expression="@author\b" casesensitive="yes"/>
+ <containsregexp expression="\bno(n|)commit\b" casesensitive="no"/>
+ </or>
+ </fileset>
+ <map from="${validate.currDir}${file.separator}" to="* "/>
+ </pathconvert>
+ <fail if="validate.patternsFound">The following files contain @author tags or nocommits:${line.separator}${validate.patternsFound}</fail>
</target>
<target name="rat-sources" description="Runs rat across all sources and tests">
@@ -184,4 +201,111 @@
</subant>
</sequential>
</target>
+
+ <!-- define here, as common-build is not included! -->
+ <property name="python32.exe" value="python3.2" />
+ <property name="fakeRelease" value="lucene/build/fakeRelease"/>
+ <property name="fakeReleaseTmp" value="lucene/build/fakeReleaseTmp"/>
+ <property name="fakeReleaseVersion" value="5.0"/> <!-- *not* -SNAPSHOT, the real version -->
+
+ <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it." depends="clean">
+ <sequential>
+ <fail unless="JAVA6_HOME">JAVA6_HOME property is not defined.</fail>
+ <fail unless="JAVA7_HOME">JAVA7_HOME property is not defined.</fail>
+ <subant target="prepare-release-no-sign" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ <fileset dir="solr" includes="build.xml" />
+ <property name="version" value="${fakeReleaseVersion}" />
+ </subant>
+ <delete dir="${fakeRelease}"/>
+ <delete dir="${fakeReleaseTmp}"/>
+ <mkdir dir="${fakeRelease}"/>
+ <copy todir="${fakeRelease}/lucene">
+ <fileset dir="lucene/dist"/>
+ </copy>
+ <copy todir="${fakeRelease}/lucene/changes">
+ <fileset dir="lucene/build/docs/changes"/>
+ </copy>
+ <get src="http://people.apache.org/keys/group/lucene.asc"
+ dest="${fakeRelease}/lucene/KEYS"/>
+ <copy todir="${fakeRelease}/solr">
+ <fileset dir="solr/package"/>
+ </copy>
+ <copy file="${fakeRelease}/lucene/KEYS" todir="${fakeRelease}/solr"/>
+ <makeurl file="${fakeRelease}" validate="false" property="fakeRelease.uri"/>
+ <exec executable="${python32.exe}" failonerror="true">
+ <arg value="-u"/>
+ <arg value="dev-tools/scripts/smokeTestRelease.py"/>
+ <arg value="${fakeRelease.uri}"/>
+ <arg value="${fakeReleaseVersion}"/>
+ <arg value="${fakeReleaseTmp}"/>
+ <arg value="false"/>
+ <env key="JAVA6_HOME" value="${JAVA6_HOME}"/>
+ <env key="JAVA7_HOME" value="${JAVA7_HOME}"/>
+ </exec>
+ <delete dir="${fakeRelease}"/>
+ <delete dir="${fakeReleaseTmp}"/>
+ </sequential>
+ </target>
+
+ <!-- Calls only generate-clover-reports on Lucene, as Solr's is just a clone with other target; the database itsself is fixed -->
+ <target name="generate-clover-reports">
+ <subant target="generate-clover-reports" inheritall="false" failonerror="true">
+ <fileset dir="." includes="build-clover.xml" />
+ </subant>
+ </target>
+
+ <!-- Jenkins tasks -->
+ <target name="jenkins-hourly" depends="clean,test,validate,-jenkins-javadocs-lint,-svn-status"/>
+
+ <target name="jenkins-clover">
+ <antcall target="-jenkins-clover">
+ <param name="run.clover" value="true"/>
+ <!-- must be 1, as clover does not like parallel test runs: -->
+ <param name="tests.jvms" value="1"/>
+ <!-- Also override some other props to be fast, ignoring what's set on command line: -->
+ <param name="tests.multiplier" value="1"/>
+ <param name="tests.slow" value="false"/>
+ <param name="tests.nightly" value="false"/>
+ <param name="tests.weekly" value="false"/>
+ <param name="tests.multiplier" value="1"/>
+ </antcall>
+ </target>
+ <target name="-jenkins-clover" depends="clean,test,generate-clover-reports"/>
+
+ <!-- we need this extra condition, as we want to match only on "true", not solely if property is set: -->
+ <property name="disable.javadocs-lint" value="false" />
+ <condition property="-disable.javadocs-lint">
+ <equals arg1="${disable.javadocs-lint}" arg2="true"/>
+ </condition>
+ <target name="-jenkins-javadocs-lint" unless="-disable.javadocs-lint">
+ <antcall target="javadocs-lint"/>
+ </target>
+
+ <!-- define here, as common-build is not included! -->
+ <property name="svn.exe" value="svn" />
+
+ <target name="-svn-status">
+ <exec executable="${svn.exe}" dir="." failonerror="true">
+ <arg value="status"/>
+ <redirector outputproperty="svn.status.output">
+ <outputfilterchain>
+ <linecontainsregexp>
+ <regexp pattern="^\?" />
+ </linecontainsregexp>
+ <tokenfilter>
+ <replaceregex pattern="^........" replace="* " />
+ <replacestring from="${file.separator}" to="/" />
+ </tokenfilter>
+ </outputfilterchain>
+ </redirector>
+ </exec>
+ <fail message="Source checkout is dirty after running tests!!! Offending files:${line.separator}${svn.status.output}">
+ <condition>
+ <not>
+ <equals arg1="${svn.status.output}" arg2=""/>
+ </not>
+ </condition>
+ </fail>
+ </target>
</project>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/eclipse/dot.classpath?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/eclipse/dot.classpath Mon Aug 13 11:16:57 2012
@@ -174,6 +174,6 @@
<classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-collections-3.2.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-1.6.0.jar"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar"/>
<classpathentry kind="output" path="bin/other"/>
</classpath>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/idea/.idea/libraries/JUnit.xml Mon Aug 13 11:16:57 2012
@@ -2,7 +2,7 @@
<library name="JUnit">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
- <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-1.6.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/README.maven
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/README.maven?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/README.maven (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/README.maven Mon Aug 13 11:16:57 2012
@@ -36,27 +36,25 @@ A. How to use nightly Jenkins-built Luce
B. How to generate Lucene/Solr Maven artifacts
- Prerequisites: JDK 1.6+ and Ant 1.7.X
+ Prerequisites: JDK 1.6+ and Ant 1.8.2+
Run 'ant generate-maven-artifacts' to create an internal Maven
repository, including POMs, binary .jars, source .jars, and javadoc
.jars.
- You can run the above command in four possible places: the top-level
- directory; under lucene/; under solr/; or under modules/. From the
- top-level directory, from lucene/, or from modules/, the internal
- repository will be located at dist/maven/. From solr/, the internal
- repository will be located at package/maven/.
+ You can run the above command in three possible places: the top-level
+ directory; under lucene/; or under solr/. From the top-level directory
+ or from lucene/, the internal repository will be located at dist/maven/.
+ From solr/, the internal repository will be located at package/maven/.
C. How to deploy Maven artifacts to a repository
- Prerequisites: JDK 1.6+ and Ant 1.7.X
+ Prerequisites: JDK 1.6+ and Ant 1.8.2+
- You can deploy targets for all of Lucene/Solr, only Lucene, only Solr,
- or only modules/, as in B. above. To deploy to a Maven repository, the
- command is the same as in B. above, with the addition of two system
- properties:
+ You can deploy targets for all of Lucene/Solr, only Lucene, or only Solr,
+ as in B. above. To deploy to a Maven repository, the command is the same
+ as in B. above, with the addition of two system properties:
ant -Dm2.repository.id=my-repo-id \
-Dm2.repository.url=http://example.org/my/repo \
@@ -101,7 +99,7 @@ D. How to use Maven to build Lucene/Solr
the default, you can supply an alternate version on the command line
with the above command, e.g.:
- ant -Dversion=5.0-my-special-version get-maven-poms
+ ant -Dversion=my-special-version get-maven-poms
Note: if you change the version in the POMs, there is one test method
that will fail under maven-surefire-plugin:
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/common/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/common/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/common/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/common/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -77,33 +71,5 @@
</excludes>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.analysis.charfilter.HtmlStripCharFilter</mainClass>
- <name>HtmlStripCharFilter</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.analysis.en.PorterStemmer</mainClass>
- <name>EnglishPorterStemmer</name>
- </program>
- <program>
- <mainClass>org.tartarus.snowball.TestApp</mainClass>
- <name>SnowballTestApp</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/icu/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/icu/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/icu/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -40,15 +40,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -75,6 +69,11 @@
<build>
<sourceDirectory>${module-path}/src/java</sourceDirectory>
<testSourceDirectory>${module-path}/src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${module-path}/src/resources</directory>
+ </resource>
+ </resources>
<testResources>
<testResource>
<directory>${project.build.testSourceDirectory}</directory>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -75,6 +69,11 @@
<build>
<sourceDirectory>${module-path}/src/java</sourceDirectory>
<testSourceDirectory>${module-path}/src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${module-path}/src/resources</directory>
+ </resource>
+ </resources>
<testResources>
<testResource>
<directory>${project.build.testSourceDirectory}</directory>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/stempel/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/stempel/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/uima/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/uima/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/analysis/uima/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -41,15 +41,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/benchmark/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/benchmark/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -120,41 +114,5 @@
</includes>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.benchmark.byTask.Benchmark</mainClass>
- <name>Benchmark</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.benchmark.quality.trec.QueryDriver</mainClass>
- <name>QueryDriver</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.benchmark.quality.utils.QualityQueriesFinder</mainClass>
- <name>QualityQueriesFinder</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.benchmark.utils.ExtractReuters</mainClass>
- <name>ExtractReuters</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.benchmark.utils.ExtractWikipedia</mainClass>
- <name>ExtractWikipedia</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/core/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/core/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/core/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -106,40 +100,6 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.index.CheckIndex</mainClass>
- <name>CheckIndex</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.index.IndexReader</mainClass>
- <name>IndexReader</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.store.LockStressTest</mainClass>
- <name>LockStressTest</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.store.LockVerifyServer</mainClass>
- <name>LockVerifyServer</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.util.English</mainClass>
- <name>English</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/demo/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/demo/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/demo/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -87,30 +81,5 @@
</excludes>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <assembleDirectory>${build-directory}</assembleDirectory>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.demo.IndexFiles</mainClass>
- <name>IndexFiles</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.demo.SearchFiles</mainClass>
- <name>SearchFiles</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/facet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/facet/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/facet/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/facet/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/grouping/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/grouping/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/grouping/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/grouping/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/highlighter/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/highlighter/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/highlighter/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/join/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/join/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/join/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/join/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/memory/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/memory/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/memory/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/memory/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/misc/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/misc/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/misc/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -72,49 +66,5 @@
</excludes>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.index.FieldNormModifier</mainClass>
- <name>FieldNormModifier</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.index.IndexSplitter</mainClass>
- <name>IndexSplitter</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.index.MultiPassIndexSplitter</mainClass>
- <name>MultiPassIndexSplitter</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.misc.GetTermInfo</mainClass>
- <name>GetTermInfo</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.misc.HighFreqTerms</mainClass>
- <name>HighFreqTerms</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.misc.IndexMergeTool</mainClass>
- <name>IndexMergeTool</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.misc.LengthNormModifier</mainClass>
- <name>LengthNormModifier</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -35,15 +35,9 @@
<module-directory>lucene</module-directory>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<modules>
<module>core</module>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/queries/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/queries/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/queries/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/queries/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/queryparser/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/queryparser/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/queryparser/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/sandbox/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/sandbox/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/sandbox/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/sandbox/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/suggest/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/suggest/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/suggest/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/suggest/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/test-framework/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/lucene/test-framework/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -31,15 +31,18 @@
<version>@version@</version>
<packaging>pom</packaging>
<name>Grandparent POM for Apache Lucene Core and Apache Solr</name>
- <description>Parent POM for Apache Lucene Core and Apache Solr</description>
- <url>http://lucene.apache.org/java</url>
+ <description>Grandparent POM for Apache Lucene Core and Apache Solr</description>
+ <url>http://lucene.apache.org</url>
<modules>
<module>lucene</module>
<module>solr</module>
</modules>
<properties>
<top-level>..</top-level>
- <base.specification.version>4.0.0</base.specification.version>
+ <vc-anonymous-base-url>http://svn.apache.org/repos/asf/lucene/dev/trunk</vc-anonymous-base-url>
+ <vc-dev-base-url>https://svn.apache.org/repos/asf/lucene/dev/trunk</vc-dev-base-url>
+ <vc-browse-base-url>http://svn.apache.org/viewvc/lucene/dev/trunk</vc-browse-base-url>
+ <base.specification.version>5.0.0</base.specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>1.6</java.compat.version>
<jetty.version>8.1.2.v20120308</jetty.version>
@@ -69,11 +72,11 @@
</properties>
<issueManagement>
<system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/LUCENE</url>
+ <url>https://issues.apache.org/jira/browse/LUCENE</url>
</issueManagement>
<ciManagement>
- <system>Hudson</system>
- <url>http://lucene.zones.apache.org:8080/hudson/job/Lucene-Nightly/</url>
+ <system>Jenkins</system>
+ <url>https://builds.apache.org/computer/lucene/</url>
</ciManagement>
<mailingLists>
<mailingList>
@@ -109,15 +112,9 @@
</mailingLists>
<inceptionYear>2000</inceptionYear>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}</developerConnection>
+ <url>${vc-browse-base-url}</url>
</scm>
<licenses>
<license>
@@ -388,7 +385,7 @@
<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
- <version>1.6.0</version>
+ <version>2.0.0.rc5</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -551,11 +548,6 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <version>1.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
</plugin>
Modified: lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1372366&r1=1372365&r2=1372366&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/pforcodec_3892/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Mon Aug 13 11:16:57 2012
@@ -35,18 +35,11 @@
<module-directory>solr/contrib/analysis-extras</module-directory>
<top-level>../../../..</top-level>
<module-path>${top-level}/${module-directory}</module-path>
- <surefire-top-level>${top-level}/../..</surefire-top-level>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -101,17 +94,12 @@
<testResource>
<directory>${top-level}/solr/core/src/test-files</directory>
</testResource>
+ <testResource>
+ <directory>${top-level}/dev-tools/maven/solr</directory>
+ <includes>
+ <include>maven.testlogging.properties</include>
+ </includes>
+ </testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <java.util.logging.config.file>${surefire-top-level}/solr/testlogging.properties</java.util.logging.config.file>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>