You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/03/30 17:25:00 UTC
[31/73] [abbrv] lucene-solr:jira/solr-6203: SOLR-9221: Remove Solr
contribs: map-reduce, morphlines-core and morphlines-cell
SOLR-9221: Remove Solr contribs: map-reduce, morphlines-core and morphlines-cell
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/53e5f34f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/53e5f34f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/53e5f34f
Branch: refs/heads/jira/solr-6203
Commit: 53e5f34f66d264c8f0ea2861e77389902b2a36c4
Parents: 6665aed
Author: Steve Rowe <sa...@apache.org>
Authored: Fri Mar 24 12:31:16 2017 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Mar 24 12:31:16 2017 -0400
----------------------------------------------------------------------
.gitignore | 1 -
dev-tools/idea/.idea/ant.xml | 3 -
.../libraries/Solr_morphlines_cell_library.xml | 10 -
.../libraries/Solr_morphlines_core_library.xml | 10 -
.../Solr_morphlines_core_test_library.xml | 10 -
dev-tools/idea/.idea/modules.xml | 3 -
dev-tools/idea/.idea/workspace.xml | 37 +-
.../idea/solr/contrib/map-reduce/map-reduce.iml | 43 -
.../contrib/morphlines-cell/morphlines-cell.iml | 29 -
.../contrib/morphlines-core/morphlines-core.iml | 28 -
.../solr/contrib/map-reduce/pom.xml.template | 90 --
.../contrib/morphlines-cell/pom.xml.template | 90 --
.../contrib/morphlines-core/pom.xml.template | 91 --
dev-tools/maven/solr/contrib/pom.xml.template | 3 -
lucene/ivy-ignore-conflicts.properties | 1 -
lucene/ivy-versions.properties | 59 -
solr/CHANGES.txt | 10 +
solr/contrib/map-reduce/README.txt | 20 -
solr/contrib/map-reduce/build.xml | 157 --
solr/contrib/map-reduce/ivy.xml | 37 -
.../map-reduce/src/java/assembly/hadoop-job.xml | 39 -
.../solr/hadoop/AlphaNumericComparator.java | 75 -
.../org/apache/solr/hadoop/BatchWriter.java | 243 ---
.../solr/hadoop/DataInputInputStream.java | 58 -
.../solr/hadoop/DataOutputOutputStream.java | 66 -
.../solr/hadoop/DryRunDocumentLoader.java | 57 -
.../src/java/org/apache/solr/hadoop/GoLive.java | 182 ---
.../apache/solr/hadoop/HdfsFileFieldNames.java | 41 -
.../org/apache/solr/hadoop/HeartBeater.java | 159 --
.../solr/hadoop/LineRandomizerMapper.java | 67 -
.../solr/hadoop/LineRandomizerReducer.java | 48 -
.../solr/hadoop/MapReduceIndexerTool.java | 1388 -----------------
.../apache/solr/hadoop/PathArgumentType.java | 233 ---
.../java/org/apache/solr/hadoop/PathParts.java | 130 --
.../solr/hadoop/SolrCloudPartitioner.java | 143 --
.../org/apache/solr/hadoop/SolrCounters.java | 53 -
.../solr/hadoop/SolrInputDocumentWritable.java | 66 -
.../java/org/apache/solr/hadoop/SolrMapper.java | 39 -
.../apache/solr/hadoop/SolrOutputFormat.java | 280 ----
.../apache/solr/hadoop/SolrRecordWriter.java | 479 ------
.../org/apache/solr/hadoop/SolrReducer.java | 188 ---
.../solr/hadoop/ToolRunnerHelpFormatter.java | 90 --
.../org/apache/solr/hadoop/TreeMergeMapper.java | 46 -
.../solr/hadoop/TreeMergeOutputFormat.java | 201 ---
.../hadoop/UnbufferedDataInputInputStream.java | 114 --
.../src/java/org/apache/solr/hadoop/Utils.java | 59 -
.../apache/solr/hadoop/ZooKeeperInspector.java | 213 ---
.../dedup/NoChangeUpdateConflictResolver.java | 36 -
.../dedup/RejectingUpdateConflictResolver.java | 48 -
.../RetainMostRecentUpdateConflictResolver.java | 114 --
.../dedup/SolrInputDocumentComparator.java | 84 -
.../dedup/SortingUpdateConflictResolver.java | 79 -
.../hadoop/dedup/UpdateConflictResolver.java | 71 -
.../apache/solr/hadoop/dedup/package-info.java | 25 -
.../hadoop/morphline/MorphlineCounters.java | 47 -
.../hadoop/morphline/MorphlineMapRunner.java | 268 ----
.../solr/hadoop/morphline/MorphlineMapper.java | 193 ---
.../solr/hadoop/morphline/package-info.java | 25 -
.../org/apache/solr/hadoop/package-info.java | 25 -
solr/contrib/map-reduce/src/java/overview.html | 21 -
.../map-reduce/src/test-files/README.txt | 1 -
.../solr/hadoop/AlphaNumericComparatorTest.java | 46 -
.../org/apache/solr/hadoop/IdentityMapper.java | 38 -
.../org/apache/solr/hadoop/IdentityReducer.java | 37 -
.../hadoop/LineRandomizerMapperReducerTest.java | 94 --
.../test/org/apache/solr/hadoop/MRUnitBase.java | 64 -
.../MapReduceIndexerToolArgumentParserTest.java | 468 ------
.../solr/hadoop/MorphlineBasicMiniMRTest.java | 415 -----
.../solr/hadoop/MorphlineGoLiveMiniMRTest.java | 881 -----------
.../apache/solr/hadoop/MorphlineMapperTest.java | 76 -
.../solr/hadoop/MorphlineReducerTest.java | 131 --
.../org/apache/solr/hadoop/UtilsForTests.java | 57 -
.../solr/hadoop/hack/MiniMRClientCluster.java | 41 -
.../hadoop/hack/MiniMRClientClusterFactory.java | 88 --
.../apache/solr/hadoop/hack/MiniMRCluster.java | 266 ----
.../solr/hadoop/hack/MiniMRYarnCluster.java | 205 ---
.../hadoop/hack/MiniMRYarnClusterAdapter.java | 78 -
.../solr/hadoop/hack/MiniYARNCluster.java | 409 -----
solr/contrib/morphlines-cell/README.txt | 6 -
solr/contrib/morphlines-cell/build.xml | 144 --
solr/contrib/morphlines-cell/ivy.xml | 35 -
.../solr/morphlines/cell/SolrCellBuilder.java | 348 -----
.../StripNonCharSolrContentHandlerFactory.java | 81 -
.../cell/TrimSolrContentHandlerFactory.java | 58 -
.../solr/morphlines/cell/package-info.java | 25 -
.../morphlines-cell/src/java/overview.html | 21 -
.../morphlines-cell/src/test-files/README.txt | 1 -
.../morphlines/cell/SolrCellMorphlineTest.java | 292 ----
solr/contrib/morphlines-core/README.txt | 6 -
solr/contrib/morphlines-core/build.xml | 105 --
solr/contrib/morphlines-core/ivy.xml | 128 --
.../solr/morphlines/solr/DocumentLoader.java | 73 -
.../apache/solr/morphlines/solr/FileUtils.java | 140 --
.../solr/GenerateSolrSequenceKeyBuilder.java | 143 --
.../solr/morphlines/solr/LoadSolrBuilder.java | 153 --
.../solr/SafeConcurrentUpdateSolrClient.java | 70 -
.../solr/SanitizeUnknownSolrFieldsBuilder.java | 101 --
.../solr/SolrClientDocumentLoader.java | 124 --
.../solr/morphlines/solr/SolrLocator.java | 254 ---
.../morphlines/solr/SolrMorphlineContext.java | 80 -
.../morphlines/solr/TokenizeTextBuilder.java | 154 --
.../morphlines/solr/ZooKeeperDownloader.java | 142 --
.../solr/morphlines/solr/package-info.java | 25 -
.../morphlines-core/src/java/overview.html | 21 -
.../src/test-files/custom-mimetypes.xml | 38 -
.../src/test-files/log4j.properties | 7 -
.../src/test-files/morphlines-core.marker | 1 -
.../solr/collection1/conf/currency.xml | 67 -
.../solr/collection1/conf/elevate.xml | 42 -
.../collection1/conf/lang/contractions_ca.txt | 8 -
.../collection1/conf/lang/contractions_fr.txt | 9 -
.../collection1/conf/lang/contractions_ga.txt | 5 -
.../collection1/conf/lang/contractions_it.txt | 23 -
.../collection1/conf/lang/hyphenations_ga.txt | 5 -
.../solr/collection1/conf/lang/stemdict_nl.txt | 6 -
.../solr/collection1/conf/lang/stoptags_ja.txt | 420 -----
.../solr/collection1/conf/lang/stopwords_ar.txt | 125 --
.../solr/collection1/conf/lang/stopwords_bg.txt | 193 ---
.../solr/collection1/conf/lang/stopwords_ca.txt | 220 ---
.../solr/collection1/conf/lang/stopwords_cz.txt | 172 ---
.../solr/collection1/conf/lang/stopwords_da.txt | 108 --
.../solr/collection1/conf/lang/stopwords_de.txt | 292 ----
.../solr/collection1/conf/lang/stopwords_el.txt | 78 -
.../solr/collection1/conf/lang/stopwords_en.txt | 54 -
.../solr/collection1/conf/lang/stopwords_es.txt | 354 -----
.../solr/collection1/conf/lang/stopwords_eu.txt | 99 --
.../solr/collection1/conf/lang/stopwords_fa.txt | 313 ----
.../solr/collection1/conf/lang/stopwords_fi.txt | 95 --
.../solr/collection1/conf/lang/stopwords_fr.txt | 183 ---
.../solr/collection1/conf/lang/stopwords_ga.txt | 110 --
.../solr/collection1/conf/lang/stopwords_gl.txt | 161 --
.../solr/collection1/conf/lang/stopwords_hi.txt | 235 ---
.../solr/collection1/conf/lang/stopwords_hu.txt | 209 ---
.../solr/collection1/conf/lang/stopwords_hy.txt | 46 -
.../solr/collection1/conf/lang/stopwords_id.txt | 359 -----
.../solr/collection1/conf/lang/stopwords_it.txt | 301 ----
.../solr/collection1/conf/lang/stopwords_ja.txt | 127 --
.../solr/collection1/conf/lang/stopwords_lv.txt | 172 ---
.../solr/collection1/conf/lang/stopwords_nl.txt | 117 --
.../solr/collection1/conf/lang/stopwords_no.txt | 192 ---
.../solr/collection1/conf/lang/stopwords_pt.txt | 251 ---
.../solr/collection1/conf/lang/stopwords_ro.txt | 233 ---
.../solr/collection1/conf/lang/stopwords_ru.txt | 241 ---
.../solr/collection1/conf/lang/stopwords_sv.txt | 131 --
.../solr/collection1/conf/lang/stopwords_th.txt | 119 --
.../solr/collection1/conf/lang/stopwords_tr.txt | 212 ---
.../solr/collection1/conf/lang/userdict_ja.txt | 29 -
.../solr/collection1/conf/protwords.txt | 21 -
.../test-files/solr/collection1/conf/schema.xml | 927 -----------
.../solr/collection1/conf/solrconfig.xml | 1426 -----------------
.../solr/collection1/conf/stopwords.txt | 14 -
.../solr/collection1/conf/synonyms.txt | 29 -
.../test-files/solr/minimr/conf/currency.xml | 67 -
.../src/test-files/solr/minimr/conf/elevate.xml | 42 -
.../solr/minimr/conf/lang/contractions_ca.txt | 8 -
.../solr/minimr/conf/lang/contractions_fr.txt | 9 -
.../solr/minimr/conf/lang/contractions_ga.txt | 5 -
.../solr/minimr/conf/lang/contractions_it.txt | 23 -
.../solr/minimr/conf/lang/hyphenations_ga.txt | 5 -
.../solr/minimr/conf/lang/stemdict_nl.txt | 6 -
.../solr/minimr/conf/lang/stoptags_ja.txt | 420 -----
.../solr/minimr/conf/lang/stopwords_ar.txt | 125 --
.../solr/minimr/conf/lang/stopwords_bg.txt | 193 ---
.../solr/minimr/conf/lang/stopwords_ca.txt | 220 ---
.../solr/minimr/conf/lang/stopwords_cz.txt | 172 ---
.../solr/minimr/conf/lang/stopwords_da.txt | 108 --
.../solr/minimr/conf/lang/stopwords_de.txt | 292 ----
.../solr/minimr/conf/lang/stopwords_el.txt | 78 -
.../solr/minimr/conf/lang/stopwords_en.txt | 54 -
.../solr/minimr/conf/lang/stopwords_es.txt | 354 -----
.../solr/minimr/conf/lang/stopwords_eu.txt | 99 --
.../solr/minimr/conf/lang/stopwords_fa.txt | 313 ----
.../solr/minimr/conf/lang/stopwords_fi.txt | 95 --
.../solr/minimr/conf/lang/stopwords_fr.txt | 183 ---
.../solr/minimr/conf/lang/stopwords_ga.txt | 110 --
.../solr/minimr/conf/lang/stopwords_gl.txt | 161 --
.../solr/minimr/conf/lang/stopwords_hi.txt | 235 ---
.../solr/minimr/conf/lang/stopwords_hu.txt | 209 ---
.../solr/minimr/conf/lang/stopwords_hy.txt | 46 -
.../solr/minimr/conf/lang/stopwords_id.txt | 359 -----
.../solr/minimr/conf/lang/stopwords_it.txt | 301 ----
.../solr/minimr/conf/lang/stopwords_ja.txt | 127 --
.../solr/minimr/conf/lang/stopwords_lv.txt | 172 ---
.../solr/minimr/conf/lang/stopwords_nl.txt | 117 --
.../solr/minimr/conf/lang/stopwords_no.txt | 192 ---
.../solr/minimr/conf/lang/stopwords_pt.txt | 251 ---
.../solr/minimr/conf/lang/stopwords_ro.txt | 233 ---
.../solr/minimr/conf/lang/stopwords_ru.txt | 241 ---
.../solr/minimr/conf/lang/stopwords_sv.txt | 131 --
.../solr/minimr/conf/lang/stopwords_th.txt | 119 --
.../solr/minimr/conf/lang/stopwords_tr.txt | 212 ---
.../solr/minimr/conf/lang/userdict_ja.txt | 29 -
.../test-files/solr/minimr/conf/protwords.txt | 21 -
.../src/test-files/solr/minimr/conf/schema.xml | 941 ------------
.../test-files/solr/minimr/conf/solrconfig.xml | 1446 -----------------
.../test-files/solr/minimr/conf/stopwords.txt | 14 -
.../test-files/solr/minimr/conf/synonyms.txt | 29 -
.../src/test-files/solr/minimr/solr.xml | 46 -
.../test-files/solr/mrunit/conf/currency.xml | 67 -
.../src/test-files/solr/mrunit/conf/elevate.xml | 42 -
.../solr/mrunit/conf/lang/contractions_ca.txt | 8 -
.../solr/mrunit/conf/lang/contractions_fr.txt | 9 -
.../solr/mrunit/conf/lang/contractions_ga.txt | 5 -
.../solr/mrunit/conf/lang/contractions_it.txt | 23 -
.../solr/mrunit/conf/lang/hyphenations_ga.txt | 5 -
.../solr/mrunit/conf/lang/stemdict_nl.txt | 6 -
.../solr/mrunit/conf/lang/stoptags_ja.txt | 420 -----
.../solr/mrunit/conf/lang/stopwords_ar.txt | 125 --
.../solr/mrunit/conf/lang/stopwords_bg.txt | 193 ---
.../solr/mrunit/conf/lang/stopwords_ca.txt | 220 ---
.../solr/mrunit/conf/lang/stopwords_cz.txt | 172 ---
.../solr/mrunit/conf/lang/stopwords_da.txt | 108 --
.../solr/mrunit/conf/lang/stopwords_de.txt | 292 ----
.../solr/mrunit/conf/lang/stopwords_el.txt | 78 -
.../solr/mrunit/conf/lang/stopwords_en.txt | 54 -
.../solr/mrunit/conf/lang/stopwords_es.txt | 354 -----
.../solr/mrunit/conf/lang/stopwords_eu.txt | 99 --
.../solr/mrunit/conf/lang/stopwords_fa.txt | 313 ----
.../solr/mrunit/conf/lang/stopwords_fi.txt | 95 --
.../solr/mrunit/conf/lang/stopwords_fr.txt | 183 ---
.../solr/mrunit/conf/lang/stopwords_ga.txt | 110 --
.../solr/mrunit/conf/lang/stopwords_gl.txt | 161 --
.../solr/mrunit/conf/lang/stopwords_hi.txt | 235 ---
.../solr/mrunit/conf/lang/stopwords_hu.txt | 209 ---
.../solr/mrunit/conf/lang/stopwords_hy.txt | 46 -
.../solr/mrunit/conf/lang/stopwords_id.txt | 359 -----
.../solr/mrunit/conf/lang/stopwords_it.txt | 301 ----
.../solr/mrunit/conf/lang/stopwords_ja.txt | 127 --
.../solr/mrunit/conf/lang/stopwords_lv.txt | 172 ---
.../solr/mrunit/conf/lang/stopwords_nl.txt | 117 --
.../solr/mrunit/conf/lang/stopwords_no.txt | 192 ---
.../solr/mrunit/conf/lang/stopwords_pt.txt | 251 ---
.../solr/mrunit/conf/lang/stopwords_ro.txt | 233 ---
.../solr/mrunit/conf/lang/stopwords_ru.txt | 241 ---
.../solr/mrunit/conf/lang/stopwords_sv.txt | 131 --
.../solr/mrunit/conf/lang/stopwords_th.txt | 119 --
.../solr/mrunit/conf/lang/stopwords_tr.txt | 212 ---
.../solr/mrunit/conf/lang/userdict_ja.txt | 29 -
.../test-files/solr/mrunit/conf/protwords.txt | 21 -
.../src/test-files/solr/mrunit/conf/schema.xml | 940 ------------
.../test-files/solr/mrunit/conf/solrconfig.xml | 1449 ------------------
.../test-files/solr/mrunit/conf/stopwords.txt | 14 -
.../test-files/solr/mrunit/conf/synonyms.txt | 29 -
.../src/test-files/solr/mrunit/solr.xml | 45 -
.../src/test-files/solr/solr.xml | 34 -
.../solrcelltest/collection1/conf/currency.xml | 67 -
.../solrcelltest/collection1/conf/elevate.xml | 42 -
.../collection1/conf/lang/contractions_ca.txt | 8 -
.../collection1/conf/lang/contractions_fr.txt | 9 -
.../collection1/conf/lang/contractions_ga.txt | 5 -
.../collection1/conf/lang/contractions_it.txt | 23 -
.../collection1/conf/lang/hyphenations_ga.txt | 5 -
.../collection1/conf/lang/stemdict_nl.txt | 6 -
.../collection1/conf/lang/stoptags_ja.txt | 420 -----
.../collection1/conf/lang/stopwords_ar.txt | 125 --
.../collection1/conf/lang/stopwords_bg.txt | 193 ---
.../collection1/conf/lang/stopwords_ca.txt | 220 ---
.../collection1/conf/lang/stopwords_cz.txt | 172 ---
.../collection1/conf/lang/stopwords_da.txt | 108 --
.../collection1/conf/lang/stopwords_de.txt | 292 ----
.../collection1/conf/lang/stopwords_el.txt | 78 -
.../collection1/conf/lang/stopwords_en.txt | 54 -
.../collection1/conf/lang/stopwords_es.txt | 354 -----
.../collection1/conf/lang/stopwords_eu.txt | 99 --
.../collection1/conf/lang/stopwords_fa.txt | 313 ----
.../collection1/conf/lang/stopwords_fi.txt | 95 --
.../collection1/conf/lang/stopwords_fr.txt | 183 ---
.../collection1/conf/lang/stopwords_ga.txt | 110 --
.../collection1/conf/lang/stopwords_gl.txt | 161 --
.../collection1/conf/lang/stopwords_hi.txt | 235 ---
.../collection1/conf/lang/stopwords_hu.txt | 209 ---
.../collection1/conf/lang/stopwords_hy.txt | 46 -
.../collection1/conf/lang/stopwords_id.txt | 359 -----
.../collection1/conf/lang/stopwords_it.txt | 301 ----
.../collection1/conf/lang/stopwords_ja.txt | 127 --
.../collection1/conf/lang/stopwords_lv.txt | 172 ---
.../collection1/conf/lang/stopwords_nl.txt | 117 --
.../collection1/conf/lang/stopwords_no.txt | 192 ---
.../collection1/conf/lang/stopwords_pt.txt | 251 ---
.../collection1/conf/lang/stopwords_ro.txt | 233 ---
.../collection1/conf/lang/stopwords_ru.txt | 241 ---
.../collection1/conf/lang/stopwords_sv.txt | 131 --
.../collection1/conf/lang/stopwords_th.txt | 119 --
.../collection1/conf/lang/stopwords_tr.txt | 212 ---
.../collection1/conf/lang/userdict_ja.txt | 29 -
.../solrcelltest/collection1/conf/protwords.txt | 21 -
.../solrcelltest/collection1/conf/schema.xml | 893 -----------
.../collection1/conf/solrconfig.xml | 1426 -----------------
.../solrcelltest/collection1/conf/stopwords.txt | 14 -
.../solrcelltest/collection1/conf/synonyms.txt | 29 -
.../solr/solrcloud/conf/solrconfig.xml | 1437 -----------------
.../test-files/test-documents/NullHeader.docx | Bin 4355 -> 0 bytes
.../test-files/test-documents/boilerplate.html | 58 -
.../src/test-files/test-documents/cars.csv | 6 -
.../src/test-files/test-documents/cars.csv.gz | Bin 167 -> 0 bytes
.../src/test-files/test-documents/cars.tar.gz | Bin 298 -> 0 bytes
.../src/test-files/test-documents/complex.mbox | 291 ----
.../src/test-files/test-documents/email.eml | 40 -
.../src/test-files/test-documents/rsstest.rss | 36 -
.../sample-statuses-20120521-100919.avro | Bin 3192 -> 0 bytes
.../sample-statuses-20120906-141433 | 4 -
.../sample-statuses-20120906-141433-medium.avro | Bin 249540 -> 0 bytes
.../sample-statuses-20120906-141433.avro | Bin 1208 -> 0 bytes
.../sample-statuses-20120906-141433.bz2 | Bin 1054 -> 0 bytes
.../sample-statuses-20120906-141433.gz | Bin 907 -> 0 bytes
.../test-files/test-documents/test-outlook.msg | Bin 19968 -> 0 bytes
.../src/test-files/test-documents/testAIFF.aif | Bin 3894 -> 0 bytes
.../src/test-files/test-documents/testBMP.bmp | Bin 22554 -> 0 bytes
.../src/test-files/test-documents/testBMPfp.txt | 3 -
.../src/test-files/test-documents/testEMLX.emlx | 72 -
.../src/test-files/test-documents/testEXCEL.xls | Bin 13824 -> 0 bytes
.../test-files/test-documents/testEXCEL.xlsx | Bin 9453 -> 0 bytes
.../src/test-files/test-documents/testFLAC.flac | Bin 10604 -> 0 bytes
.../src/test-files/test-documents/testFLV.flv | Bin 90580 -> 0 bytes
.../test-files/test-documents/testJPEG_EXIF.jpg | Bin 16357 -> 0 bytes
.../test-documents/testJPEG_EXIF.jpg.gz | Bin 8595 -> 0 bytes
.../test-documents/testJPEG_EXIF.jpg.tar.gz | Bin 8722 -> 0 bytes
.../test-files/test-documents/testMP3i18n.mp3 | Bin 40832 -> 0 bytes
.../src/test-files/test-documents/testMP4.m4a | Bin 4770 -> 0 bytes
.../src/test-files/test-documents/testPDF.pdf | Bin 34824 -> 0 bytes
.../src/test-files/test-documents/testPNG.png | Bin 17041 -> 0 bytes
.../test-documents/testPPT_various.ppt | Bin 164352 -> 0 bytes
.../test-documents/testPPT_various.pptx | Bin 56659 -> 0 bytes
.../src/test-files/test-documents/testPSD.psd | Bin 69410 -> 0 bytes
.../test-files/test-documents/testPages.pages | Bin 134152 -> 0 bytes
.../src/test-files/test-documents/testRFC822 | 41 -
.../test-documents/testRTFVarious.rtf | 329 ----
.../src/test-files/test-documents/testSVG.svg | 23 -
.../src/test-files/test-documents/testTIFF.tif | Bin 25584 -> 0 bytes
.../src/test-files/test-documents/testVISIO.vsd | Bin 45568 -> 0 bytes
.../src/test-files/test-documents/testWAV.wav | Bin 3884 -> 0 bytes
.../test-documents/testWORD_various.doc | Bin 35328 -> 0 bytes
.../src/test-files/test-documents/testXML.xml | 48 -
.../src/test-files/test-documents/testXML2.xml | 22 -
.../test-morphlines/loadSolrBasic.conf | 68 -
.../test-morphlines/solrCellDocumentTypes.conf | 304 ----
.../test-morphlines/solrCellJPGCompressed.conf | 150 --
.../test-files/test-morphlines/solrCellXML.conf | 78 -
.../test-morphlines/tokenizeText.conf | 38 -
.../tutorialReadAvroContainer.conf | 145 --
.../solr/AbstractSolrMorphlineTestBase.java | 318 ----
.../solr/AbstractSolrMorphlineZkTestBase.java | 141 --
.../solr/CollectingDocumentLoader.java | 95 --
.../morphlines/solr/EmbeddedTestSolrServer.java | 46 -
.../solr/morphlines/solr/SolrMorphlineTest.java | 69 -
.../solr/SolrMorphlineZkAliasTest.java | 96 --
.../solr/SolrMorphlineZkAvroTest.java | 140 --
.../morphlines/solr/SolrMorphlineZkTest.java | 92 --
solr/licenses/Saxon-HE-9.6.0-2.jar.sha1 | 1 -
solr/licenses/Saxon-HE-LICENSE-MPL.txt | 108 --
solr/licenses/aopalliance-1.0.jar.sha1 | 1 -
solr/licenses/aopalliance-LICENSE-PD.txt | 1 -
solr/licenses/argparse4j-0.4.3.jar.sha1 | 1 -
solr/licenses/argparse4j-LICENSE-MIT.txt | 23 -
solr/licenses/avro-1.7.5.jar.sha1 | 1 -
solr/licenses/avro-LICENSE-ASL.txt | 308 ----
solr/licenses/avro-NOTICE.txt | 9 -
solr/licenses/bcpkix-jdk15on-1.47.jar.sha1 | 1 -
.../bcpkix-jdk15on-LICENSE-BSD_LIKE.txt | 15 -
solr/licenses/bcpkix-jdk15on-NOTICE.txt | 2 -
solr/licenses/config-1.0.2.jar.sha1 | 1 -
solr/licenses/config-LICENSE-ASL.txt | 202 ---
solr/licenses/config-NOTICE.txt | 0
solr/licenses/guice-3.0.jar.sha1 | 1 -
solr/licenses/guice-LICENSE-ASL.txt | 202 ---
solr/licenses/guice-NOTICE.txt | 0
solr/licenses/guice-servlet-3.0.jar.sha1 | 1 -
solr/licenses/guice-servlet-LICENSE-ASL.txt | 202 ---
solr/licenses/guice-servlet-NOTICE.txt | 0
.../hadoop-mapreduce-client-app-2.7.2.jar.sha1 | 1 -
.../hadoop-mapreduce-client-app-LICENSE-ASL.txt | 244 ---
.../hadoop-mapreduce-client-app-NOTICE.txt | 2 -
...adoop-mapreduce-client-common-2.7.2.jar.sha1 | 1 -
...doop-mapreduce-client-common-LICENSE-ASL.txt | 244 ---
.../hadoop-mapreduce-client-common-NOTICE.txt | 2 -
.../hadoop-mapreduce-client-core-2.7.2.jar.sha1 | 1 -
...hadoop-mapreduce-client-core-LICENSE-ASL.txt | 244 ---
.../hadoop-mapreduce-client-core-NOTICE.txt | 2 -
.../hadoop-mapreduce-client-hs-2.7.2.jar.sha1 | 1 -
.../hadoop-mapreduce-client-hs-LICENSE-ASL.txt | 244 ---
.../hadoop-mapreduce-client-hs-NOTICE.txt | 2 -
...reduce-client-jobclient-2.7.2-tests.jar.sha1 | 1 -
...op-mapreduce-client-jobclient-2.7.2.jar.sha1 | 1 -
...p-mapreduce-client-jobclient-LICENSE-ASL.txt | 244 ---
...hadoop-mapreduce-client-jobclient-NOTICE.txt | 2 -
...doop-mapreduce-client-shuffle-2.7.2.jar.sha1 | 1 -
...oop-mapreduce-client-shuffle-LICENSE-ASL.txt | 244 ---
.../hadoop-mapreduce-client-shuffle-NOTICE.txt | 2 -
solr/licenses/hadoop-yarn-api-2.7.2.jar.sha1 | 1 -
solr/licenses/hadoop-yarn-api-LICENSE-ASL.txt | 244 ---
solr/licenses/hadoop-yarn-api-NOTICE.txt | 2 -
solr/licenses/hadoop-yarn-client-2.7.2.jar.sha1 | 1 -
.../licenses/hadoop-yarn-client-LICENSE-ASL.txt | 244 ---
solr/licenses/hadoop-yarn-client-NOTICE.txt | 2 -
solr/licenses/hadoop-yarn-common-2.7.2.jar.sha1 | 1 -
.../licenses/hadoop-yarn-common-LICENSE-ASL.txt | 244 ---
solr/licenses/hadoop-yarn-common-NOTICE.txt | 2 -
...ver-applicationhistoryservice-2.7.2.jar.sha1 | 1 -
...er-applicationhistoryservice-LICENSE-ASL.txt | 244 ---
...-server-applicationhistoryservice-NOTICE.txt | 2 -
.../hadoop-yarn-server-common-2.7.2.jar.sha1 | 1 -
.../hadoop-yarn-server-common-LICENSE-ASL.txt | 244 ---
.../hadoop-yarn-server-common-NOTICE.txt | 2 -
...adoop-yarn-server-nodemanager-2.7.2.jar.sha1 | 1 -
...doop-yarn-server-nodemanager-LICENSE-ASL.txt | 244 ---
.../hadoop-yarn-server-nodemanager-NOTICE.txt | 2 -
...p-yarn-server-resourcemanager-2.7.2.jar.sha1 | 1 -
...-yarn-server-resourcemanager-LICENSE-ASL.txt | 244 ---
...adoop-yarn-server-resourcemanager-NOTICE.txt | 2 -
...adoop-yarn-server-tests-2.7.2-tests.jar.sha1 | 1 -
.../hadoop-yarn-server-tests-LICENSE-ASL.txt | 244 ---
.../hadoop-yarn-server-tests-NOTICE.txt | 2 -
.../hadoop-yarn-server-web-proxy-2.7.2.jar.sha1 | 1 -
...hadoop-yarn-server-web-proxy-LICENSE-ASL.txt | 244 ---
.../hadoop-yarn-server-web-proxy-NOTICE.txt | 2 -
solr/licenses/jackson-jaxrs-1.9.13.jar.sha1 | 1 -
solr/licenses/jackson-jaxrs-LICENSE-ASL.txt | 13 -
solr/licenses/jackson-jaxrs-NOTICE.txt | 7 -
solr/licenses/javax.inject-1.jar.sha1 | 1 -
solr/licenses/javax.inject-LICENSE-ASL.txt | 202 ---
solr/licenses/javax.inject-NOTICE.txt | 0
solr/licenses/jaxb-impl-2.2.3-1.jar.sha1 | 1 -
solr/licenses/jaxb-impl-LICENSE-CDDL.txt | 135 --
solr/licenses/jersey-bundle-1.9.jar.sha1 | 1 -
solr/licenses/jersey-bundle-LICENSE-CDDL.txt | 85 -
solr/licenses/jersey-guice-1.9.jar.sha1 | 1 -
solr/licenses/jersey-guice-LICENSE-CDDL.txt | 85 -
solr/licenses/jersey-json-1.9.jar.sha1 | 1 -
solr/licenses/jersey-json-LICENSE-CDDL.txt | 85 -
.../kite-morphlines-avro-1.1.0.jar.sha1 | 1 -
.../kite-morphlines-avro-LICENSE-ASL.txt | 202 ---
solr/licenses/kite-morphlines-avro-NOTICE.txt | 8 -
.../kite-morphlines-core-1.1.0-tests.jar.sha1 | 1 -
.../kite-morphlines-core-1.1.0.jar.sha1 | 1 -
.../kite-morphlines-core-LICENSE-ASL.txt | 202 ---
solr/licenses/kite-morphlines-core-NOTICE.txt | 8 -
...orphlines-hadoop-sequencefile-1.1.0.jar.sha1 | 1 -
...rphlines-hadoop-sequencefile-LICENSE-ASL.txt | 202 ---
...te-morphlines-hadoop-sequencefile-NOTICE.txt | 8 -
.../kite-morphlines-json-1.1.0.jar.sha1 | 1 -
.../kite-morphlines-json-LICENSE-ASL.txt | 202 ---
solr/licenses/kite-morphlines-json-NOTICE.txt | 8 -
.../kite-morphlines-saxon-1.1.0.jar.sha1 | 1 -
.../kite-morphlines-saxon-LICENSE-ASL.txt | 202 ---
solr/licenses/kite-morphlines-saxon-NOTICE.txt | 8 -
.../kite-morphlines-tika-core-1.1.0.jar.sha1 | 1 -
.../kite-morphlines-tika-core-LICENSE-ASL.txt | 202 ---
.../kite-morphlines-tika-core-NOTICE.txt | 8 -
...te-morphlines-tika-decompress-1.1.0.jar.sha1 | 1 -
...e-morphlines-tika-decompress-LICENSE-ASL.txt | 202 ---
.../kite-morphlines-tika-decompress-NOTICE.txt | 8 -
.../kite-morphlines-twitter-1.1.0.jar.sha1 | 1 -
.../kite-morphlines-twitter-LICENSE-ASL.txt | 202 ---
.../licenses/kite-morphlines-twitter-NOTICE.txt | 8 -
solr/licenses/leveldb-0.7.jar.sha1 | 1 -
solr/licenses/leveldb-LICENSE-BSD.txt | 27 -
solr/licenses/leveldb-NOTICE.txt | 0
solr/licenses/leveldb-api-0.7.jar.sha1 | 1 -
solr/licenses/leveldb-api-LICENSE-BSD.txt | 27 -
solr/licenses/leveldb-api-NOTICE.txt | 0
solr/licenses/leveldbjni-1.8.jar.sha1 | 1 -
solr/licenses/leveldbjni-LICENSE-BSD.txt | 27 -
solr/licenses/leveldbjni-NOTICE.txt | 0
.../metrics-healthchecks-3.1.2.jar.sha1 | 1 -
.../metrics-healthchecks-LICENSE-ASL.txt | 202 ---
solr/licenses/metrics-healthchecks-NOTICE.txt | 11 -
solr/licenses/mrunit-1.0.0-hadoop2.jar.sha1 | 1 -
solr/licenses/mrunit-LICENSE-ASL.txt | 479 ------
solr/licenses/mrunit-NOTICE.txt | 5 -
solr/licenses/netty-3.2.4.Final.jar.sha1 | 1 -
solr/licenses/netty-LICENSE-ASL.txt | 202 ---
solr/licenses/netty-NOTICE.txt | 98 --
solr/licenses/paranamer-2.3.jar.sha1 | 1 -
solr/licenses/paranamer-LICENSE-BSD.txt | 28 -
solr/licenses/paranamer-NOTICE.txt | 0
solr/licenses/rome-1.6.1.jar.sha1 | 1 -
solr/licenses/snappy-java-1.0.5.jar.sha1 | 1 -
solr/licenses/snappy-java-LICENSE-ASL.txt | 201 ---
solr/licenses/snappy-java-NOTICE.txt | 0
.../map-reduce/set-map-reduce-classpath.sh | 52 -
480 files changed, 15 insertions(+), 59625 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 625cfa9..4962ab9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ parent.iml
/solr/example/example-DIH/solr/mail/lib/*.jar
solr/contrib/dataimporthandler/test-lib/
-solr/contrib/morphlines-core/test-lib/
solr/core/test-lib/
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/idea/.idea/ant.xml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/.idea/ant.xml b/dev-tools/idea/.idea/ant.xml
index 8d454ad..8723e63 100644
--- a/dev-tools/idea/.idea/ant.xml
+++ b/dev-tools/idea/.idea/ant.xml
@@ -46,9 +46,6 @@
<buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/build.xml" />
<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/morphlines-cell/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/solr/contrib/map-reduce/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" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml b/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml
deleted file mode 100644
index cbc9907..0000000
--- a/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Solr morphlines cell library">
- <CLASSES>
- <root url="file://$PROJECT_DIR$/solr/contrib/morphlines-cell/lib" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/morphlines-cell/lib" recursive="false" />
- </library>
-</component>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml b/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml
deleted file mode 100644
index 4260f58..0000000
--- a/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Solr morphlines core library">
- <CLASSES>
- <root url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/lib" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/lib" recursive="false" />
- </library>
-</component>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml b/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml
deleted file mode 100644
index 74699f4..0000000
--- a/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Solr morphlines core test library">
- <CLASSES>
- <root url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/test-lib" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/test-lib" recursive="false" />
- </library>
-</component>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/idea/.idea/modules.xml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml
index d6b44f4..7ad2a78 100644
--- a/dev-tools/idea/.idea/modules.xml
+++ b/dev-tools/idea/.idea/modules.xml
@@ -56,9 +56,6 @@
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/extraction/extraction.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/langid/langid.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/ltr/ltr.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/map-reduce/map-reduce.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/morphlines-cell/morphlines-cell.iml" />
- <module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/morphlines-core/morphlines-core.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/uima/uima.iml" />
<module group="Solr/Contrib" filepath="$PROJECT_DIR$/solr/contrib/velocity/velocity.iml" />
</modules>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/idea/.idea/workspace.xml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/.idea/workspace.xml b/dev-tools/idea/.idea/workspace.xml
index 65be571..0ca7f0c 100644
--- a/dev-tools/idea/.idea/workspace.xml
+++ b/dev-tools/idea/.idea/workspace.xml
@@ -316,30 +316,6 @@
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
<patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
</configuration>
- <configuration default="false" name="Solr map-reduce contrib" type="JUnit" factoryName="JUnit">
- <module name="map-reduce" />
- <option name="TEST_OBJECT" value="pattern" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/map-reduce" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
- </configuration>
- <configuration default="false" name="Solr morphlines-cell contrib" type="JUnit" factoryName="JUnit">
- <module name="morphlines-cell" />
- <option name="TEST_OBJECT" value="pattern" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/morphlines-cell" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
- </configuration>
- <configuration default="false" name="Solr morphlines-core contrib" type="JUnit" factoryName="JUnit">
- <module name="morphlines-core" />
- <option name="TEST_OBJECT" value="pattern" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/morphlines-core" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
- </configuration>
<configuration default="false" name="Solr uima contrib" type="JUnit" factoryName="JUnit">
<module name="uima" />
<option name="TEST_OBJECT" value="pattern" />
@@ -357,7 +333,7 @@
<patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
</configuration>
- <list size="44">
+ <list size="41">
<item index="0" class="java.lang.String" itemvalue="JUnit.Lucene core" />
<item index="1" class="java.lang.String" itemvalue="JUnit.Module analyzers-common" />
<item index="2" class="java.lang.String" itemvalue="JUnit.Module analyzers-icu" />
@@ -395,13 +371,10 @@
<item index="34" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler contrib" />
<item index="35" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler-extras contrib" />
<item index="36" class="java.lang.String" itemvalue="JUnit.Solr extraction contrib" />
- <item index="37" class="java.lang.String" itemvalue="JUnit.Solr map-reduce contrib" />
- <item index="38" class="java.lang.String" itemvalue="JUnit.Solr morphlines-cell contrib" />
- <item index="39" class="java.lang.String" itemvalue="JUnit.Solr morphlines-core contrib" />
- <item index="40" class="java.lang.String" itemvalue="JUnit.Solr langid contrib" />
- <item index="41" class="java.lang.String" itemvalue="JUnit.Solr ltr contrib" />
- <item index="42" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
- <item index="43" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
+ <item index="37" class="java.lang.String" itemvalue="JUnit.Solr langid contrib" />
+ <item index="38" class="java.lang.String" itemvalue="JUnit.Solr ltr contrib" />
+ <item index="39" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
+ <item index="40" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
</list>
</component>
</project>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml b/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml
deleted file mode 100644
index af266b0..0000000
--- a/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/map-reduce/classes/java" />
- <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/map-reduce/classes/test" />
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test-files" type="java-test-resource" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="library" name="Solr core library" level="project" />
- <orderEntry type="library" name="Solrj library" level="project" />
- <orderEntry type="library" name="Solr extraction library" level="project" />
- <orderEntry type="library" name="Solr morphlines core library" level="project" />
- <orderEntry type="library" name="Solr morphlines cell library" level="project" />
- <orderEntry type="library" scope="TEST" name="Solr morphlines core test library" level="project" />
- <orderEntry type="library" scope="TEST" name="Solr example library" level="project" />
- <orderEntry type="library" scope="TEST" name="Solr core test library" level="project" />
- <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
- <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
- <orderEntry type="module" module-name="solr-core" />
- <orderEntry type="module" module-name="solrj" />
- <orderEntry type="module" module-name="misc" />
- <orderEntry type="module" module-name="extraction" />
- <orderEntry type="module" module-name="lucene-core" />
- <orderEntry type="module" module-name="morphlines-core" />
- <orderEntry type="module" module-name="analysis-common" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="file://$MODULE_DIR$/lib" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
- </library>
- </orderEntry>
- </component>
-</module>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml b/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml
deleted file mode 100644
index f6f3900..0000000
--- a/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/morphlines-cell/classes/java" />
- <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/morphlines-cell/classes/test" />
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test-files" type="java-test-resource" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="library" name="Solr core library" level="project" />
- <orderEntry type="library" name="Solrj library" level="project" />
- <orderEntry type="library" name="Solr extraction library" level="project" />
- <orderEntry type="library" name="Solr morphlines core library" level="project" />
- <orderEntry type="library" name="Solr morphlines cell library" level="project" />
- <orderEntry type="library" scope="TEST" name="Solr morphlines core test library" level="project" />
- <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
- <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
- <orderEntry type="module" scope="TEST" module-name="lucene-core" />
- <orderEntry type="module" module-name="solr-core" />
- <orderEntry type="module" module-name="solrj" />
- <orderEntry type="module" module-name="extraction" />
- <orderEntry type="module" module-name="morphlines-core" />
- </component>
-</module>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/idea/solr/contrib/morphlines-core/morphlines-core.iml
----------------------------------------------------------------------
diff --git a/dev-tools/idea/solr/contrib/morphlines-core/morphlines-core.iml b/dev-tools/idea/solr/contrib/morphlines-core/morphlines-core.iml
deleted file mode 100644
index 15f26f2..0000000
--- a/dev-tools/idea/solr/contrib/morphlines-core/morphlines-core.iml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/morphlines-core/classes/java" />
- <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/morphlines-core/classes/test" />
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test-files" type="java-test-resource" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
- <orderEntry type="library" name="Solr example library" level="project" />
- <orderEntry type="library" name="Solr core library" level="project" />
- <orderEntry type="library" name="Solrj library" level="project" />
- <orderEntry type="library" name="Solr extraction library" level="project" />
- <orderEntry type="library" name="Solr morphlines core library" level="project" />
- <orderEntry type="library" scope="TEST" name="Solr morphlines core test library" level="project" />
- <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
- <orderEntry type="module" scope="TEST" module-name="solr-test-framework" />
- <orderEntry type="module" module-name="solr-core" />
- <orderEntry type="module" module-name="solrj" />
- <orderEntry type="module" module-name="lucene-core" />
- <orderEntry type="module" module-name="analysis-common" />
- </component>
-</module>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/maven/solr/contrib/map-reduce/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/solr/contrib/map-reduce/pom.xml.template b/dev-tools/maven/solr/contrib/map-reduce/pom.xml.template
deleted file mode 100644
index 623c8cb..0000000
--- a/dev-tools/maven/solr/contrib/map-reduce/pom.xml.template
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--
- 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.
--->
-<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">
- <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-map-reduce</artifactId>
- <packaging>jar</packaging>
- <name>Apache Solr map-reduce index construction</name>
- <description>Apache Solr - map-reduce index construction</description>
- <properties>
- <module-directory>solr/contrib/map-reduce</module-directory>
- <relative-top-level>../../../..</relative-top-level>
- <module-path>${relative-top-level}/${module-directory}</module-path>
- </properties>
- <scm>
- <connection>scm:git:${vc-anonymous-base-url}</connection>
- <developerConnection>scm:git:${vc-dev-base-url}</developerConnection>
- <url>${vc-browse-base-url};f=${module-directory}</url>
- </scm>
- <dependencies>
- <dependency>
- <!-- lucene-test-framework dependency must be declared before lucene-core -->
- <!-- This dependency cannot be put into solr-parent, because local -->
- <!-- dependencies are always ordered before inherited dependencies. -->
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-test-framework</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-morphlines-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-@solr-map-reduce.internal.dependencies@
-@solr-map-reduce.external.dependencies@
-@solr-map-reduce.internal.test.dependencies@
-@solr-map-reduce.external.test.dependencies@
- </dependencies>
- <build>
- <sourceDirectory>${module-path}/src/java</sourceDirectory>
- <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${module-path}/src/test-files</directory>
- </testResource>
- <testResource>
- <!-- TODO: This is a hack, because the shared test-files folder seems not to be
- included by the dependency, maybe because the dependency test-jar is not unpacked? -->
- <directory>${module-path}/../morphlines-core/src/test-files</directory>
- </testResource>
- <testResource>
- <directory>${top-level}/dev-tools/maven/solr</directory>
- <includes>
- <include>maven.testlogging.properties</include>
- </includes>
- </testResource>
- </testResources>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/maven/solr/contrib/morphlines-cell/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/solr/contrib/morphlines-cell/pom.xml.template b/dev-tools/maven/solr/contrib/morphlines-cell/pom.xml.template
deleted file mode 100644
index 2849e90..0000000
--- a/dev-tools/maven/solr/contrib/morphlines-cell/pom.xml.template
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--
- 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.
--->
-<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">
- <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-morphlines-cell</artifactId>
- <packaging>jar</packaging>
- <name>Apache Solr Cell Morphlines</name>
- <description>Apache Solr - Cell Morphlines</description>
- <properties>
- <module-directory>solr/contrib/morphlines-cell</module-directory>
- <relative-top-level>../../../..</relative-top-level>
- <module-path>${relative-top-level}/${module-directory}</module-path>
- </properties>
- <scm>
- <connection>scm:git:${vc-anonymous-base-url}</connection>
- <developerConnection>scm:git:${vc-dev-base-url}</developerConnection>
- <url>${vc-browse-base-url};f=${module-directory}</url>
- </scm>
- <dependencies>
- <dependency>
- <!-- lucene-test-framework dependency must be declared before lucene-core -->
- <!-- This dependency cannot be put into solr-parent, because local -->
- <!-- dependencies are always ordered before inherited dependencies. -->
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-test-framework</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-morphlines-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-@solr-morphlines-cell.internal.dependencies@
-@solr-morphlines-cell.external.dependencies@
-@solr-morphlines-cell.internal.test.dependencies@
-@solr-morphlines-cell.external.test.dependencies@
- </dependencies>
- <build>
- <sourceDirectory>${module-path}/src/java</sourceDirectory>
- <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${module-path}/src/test-files</directory>
- </testResource>
- <testResource>
- <!-- TODO: This is a hack, because the shared test-files folder seems not to be
- included by the dependency, maybe because the dependency test-jar is not unpacked? -->
- <directory>${module-path}/../morphlines-core/src/test-files</directory>
- </testResource>
- <testResource>
- <directory>${top-level}/dev-tools/maven/solr</directory>
- <includes>
- <include>maven.testlogging.properties</include>
- </includes>
- </testResource>
- </testResources>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/maven/solr/contrib/morphlines-core/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/solr/contrib/morphlines-core/pom.xml.template b/dev-tools/maven/solr/contrib/morphlines-core/pom.xml.template
deleted file mode 100644
index a14707d..0000000
--- a/dev-tools/maven/solr/contrib/morphlines-core/pom.xml.template
+++ /dev/null
@@ -1,91 +0,0 @@
-<!--
- 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.
--->
-<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">
- <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-morphlines-core</artifactId>
- <packaging>jar</packaging>
- <name>Apache Solr Morphlines Core</name>
- <description>Apache Solr - Morphlines Core</description>
- <properties>
- <module-directory>solr/contrib/morphlines-core</module-directory>
- <relative-top-level>../../../..</relative-top-level>
- <module-path>${relative-top-level}/${module-directory}</module-path>
- </properties>
- <scm>
- <connection>scm:git:${vc-anonymous-base-url}</connection>
- <developerConnection>scm:git:${vc-dev-base-url}</developerConnection>
- <url>${vc-browse-base-url};f=${module-directory}</url>
- </scm>
- <dependencies>
- <dependency>
- <!-- lucene-test-framework dependency must be declared before lucene-core -->
- <!-- This dependency cannot be put into solr-parent, because local -->
- <!-- dependencies are always ordered before inherited dependencies. -->
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-test-framework</artifactId>
- <scope>test</scope>
- </dependency>
-@solr-morphlines-core.internal.dependencies@
-@solr-morphlines-core.external.dependencies@
-@solr-morphlines-core.internal.test.dependencies@
-@solr-morphlines-core.external.test.dependencies@
- </dependencies>
- <build>
- <sourceDirectory>${module-path}/src/java</sourceDirectory>
- <testSourceDirectory>${module-path}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${module-path}/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-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/dev-tools/maven/solr/contrib/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/solr/contrib/pom.xml.template b/dev-tools/maven/solr/contrib/pom.xml.template
index 20cbac5..8159ecc 100644
--- a/dev-tools/maven/solr/contrib/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/pom.xml.template
@@ -39,9 +39,6 @@
<module>extraction</module>
<module>langid</module>
<module>ltr</module>
- <module>morphlines-cell</module>
- <module>morphlines-core</module>
- <module>map-reduce</module>
<module>uima</module>
<module>velocity</module>
</modules>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/lucene/ivy-ignore-conflicts.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-ignore-conflicts.properties b/lucene/ivy-ignore-conflicts.properties
index 34b6bca..3e80311 100644
--- a/lucene/ivy-ignore-conflicts.properties
+++ b/lucene/ivy-ignore-conflicts.properties
@@ -10,6 +10,5 @@
# trigger a conflict) when the ant check-lib-versions target is run.
/com.google.guava/guava = 16.0.1
-/com.google.inject/guice=4.0-beta5
/javax.servlet/servlet-api = 2.5, 3.0-alpha-1
/org.ow2.asm/asm = 5.0_BETA
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 7f57fed..6bd3f8d 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -3,7 +3,6 @@
# when the lexical sort check is performed by the ant check-lib-versions target.
/antlr/antlr = 2.7.7
-/aopalliance/aopalliance = 1.0
/com.adobe.xmp/xmpcore = 5.1.2
com.carrotsearch.randomizedtesting.version = 2.5.0
@@ -26,10 +25,6 @@ com.fasterxml.jackson.core.version = 2.5.4
/com.google.guava/guava = 14.0.1
-com.google.inject.guice.version = 3.0
-/com.google.inject.extensions/guice-servlet = ${com.google.inject.guice.version}
-/com.google.inject/guice = ${com.google.inject.guice.version}
-
/com.google.protobuf/protobuf-java = 3.1.0
/com.googlecode.juniversalchardet/juniversalchardet = 1.0.3
/com.googlecode.mp4parser/isoparser = 1.1.18
@@ -37,24 +32,14 @@ com.google.inject.guice.version = 3.0
/com.ibm.icu/icu4j = 56.1
/com.pff/java-libpst = 0.8.1
-com.rometools.version = 1.6.1
-/com.rometools/rome = ${com.rometools.version}
-
com.sun.jersey.version = 1.9
-/com.sun.jersey.contribs/jersey-guice = ${com.sun.jersey.version}
-/com.sun.jersey/jersey-bundle = ${com.sun.jersey.version}
/com.sun.jersey/jersey-core = ${com.sun.jersey.version}
-/com.sun.jersey/jersey-json = ${com.sun.jersey.version}
/com.sun.jersey/jersey-server = ${com.sun.jersey.version}
/com.sun.mail/gimap = 1.5.1
/com.sun.mail/javax.mail = 1.5.1
-/com.sun.xml.bind/jaxb-impl = 2.2.3-1
-
/com.tdunning/t-digest = 3.1
-/com.thoughtworks.paranamer/paranamer = 2.3
-/com.typesafe/config = 1.0.2
/commons-beanutils/commons-beanutils = 1.8.3
/commons-cli/commons-cli = 1.2
/commons-codec/commons-codec = 1.10
@@ -74,7 +59,6 @@ io.dropwizard.metrics.version = 3.1.2
/io.dropwizard.metrics/metrics-core = ${io.dropwizard.metrics.version}
/io.dropwizard.metrics/metrics-ganglia = ${io.dropwizard.metrics.version}
/io.dropwizard.metrics/metrics-graphite = ${io.dropwizard.metrics.version}
-/io.dropwizard.metrics/metrics-healthchecks = ${io.dropwizard.metrics.version}
/io.dropwizard.metrics/metrics-jetty9 = ${io.dropwizard.metrics.version}
/io.dropwizard.metrics/metrics-jvm = ${io.dropwizard.metrics.version}
@@ -82,7 +66,6 @@ io.netty.netty-all.version = 4.0.36.Final
/io.netty/netty-all = ${io.netty.netty-all.version}
/javax.activation/activation = 1.1.1
-/javax.inject/javax.inject= 1
/javax.servlet/javax.servlet-api = 3.1.0
/javax.servlet/servlet-api = 2.4
/jdom/jdom = 1.0
@@ -95,14 +78,11 @@ io.netty.netty-all.version = 4.0.36.Final
/net.bytebuddy/byte-buddy = 1.6.2
/net.hydromatic/eigenbase-properties = 1.1.5
/net.sf.ehcache/ehcache-core = 2.4.4
-/net.sf.saxon/Saxon-HE = 9.6.0-2
-/net.sourceforge.argparse4j/argparse4j = 0.4.3
/net.sourceforge.jmatio/jmatio = 1.0
/net.sourceforge.nekohtml/nekohtml = 1.9.17
/org.antlr/antlr4-runtime = 4.5.1-1
/org.apache.ant/ant = 1.8.2
-/org.apache.avro/avro = 1.7.5
org.apache.calcite.avatica.version = 1.9.0
/org.apache.calcite.avatica/avatica-core = ${org.apache.calcite.avatica.version}
@@ -160,23 +140,7 @@ org.apache.hadoop.version = 2.7.2
/org.apache.hadoop/hadoop-auth = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-common = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-hdfs = ${org.apache.hadoop.version}
-
-/org.apache.hadoop/hadoop-mapreduce-client-app = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-mapreduce-client-common = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-mapreduce-client-core = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-mapreduce-client-hs = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-mapreduce-client-jobclient = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-mapreduce-client-shuffle = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-minikdc = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-yarn-api = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-yarn-client = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-yarn-common = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-yarn-server-applicationhistoryservice = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-yarn-server-common = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-yarn-server-nodemanager = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-yarn-server-resourcemanager = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-yarn-server-tests = ${org.apache.hadoop.version}
-/org.apache.hadoop/hadoop-yarn-server-web-proxy = ${org.apache.hadoop.version}
/org.apache.htrace/htrace-core = 3.2.0-incubating
@@ -193,7 +157,6 @@ org.apache.james.apache.mime4j.version = 0.7.2
/org.apache.james/apache-mime4j-dom = ${org.apache.james.apache.mime4j.version}
/org.apache.mina/mina-core = 2.0.0-M5
-/org.apache.mrunit/mrunit = 1.0.0
org.apache.pdfbox.version = 2.0.1
/org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version}
@@ -228,7 +191,6 @@ org.apache.uima.version = 2.3.1
org.bouncycastle.version = 1.45
/org.bouncycastle/bcmail-jdk15 = ${org.bouncycastle.version}
-/org.bouncycastle/bcpkix-jdk15on = 1.47
/org.bouncycastle/bcprov-jdk15 = ${org.bouncycastle.version}
/org.carrot2.attributes/attributes-binder = 1.3.1
@@ -245,7 +207,6 @@ org.carrot2.morfologik.version = 2.1.1
org.codehaus.jackson.version = 1.9.13
/org.codehaus.jackson/jackson-core-asl = ${org.codehaus.jackson.version}
-/org.codehaus.jackson/jackson-jaxrs = ${org.codehaus.jackson.version}
/org.codehaus.jackson/jackson-mapper-asl = ${org.codehaus.jackson.version}
org.codehaus.janino.version = 2.7.6
@@ -271,29 +232,10 @@ org.eclipse.jetty.version = 9.3.14.v20161028
/org.eclipse.jetty/jetty-webapp = ${org.eclipse.jetty.version}
/org.eclipse.jetty/jetty-xml = ${org.eclipse.jetty.version}
-/org.fusesource.leveldbjni/leveldbjni = 1.8
-
org.gagravarr.vorbis.java.version = 0.8
/org.gagravarr/vorbis-java-core = ${org.gagravarr.vorbis.java.version}
/org.gagravarr/vorbis-java-tika = ${org.gagravarr.vorbis.java.version}
-org.iq80.leveldb.version = 0.7
-/org.iq80.leveldb/leveldb = ${org.iq80.leveldb.version}
-/org.iq80.leveldb/leveldb-api = ${org.iq80.leveldb.version}
-
-org.jboss.netty.netty.version = 3.2.4.Final
-/org.jboss.netty/netty = ${org.jboss.netty.netty.version}
-
-org.kitesdk.kite-morphlines.version = 1.1.0
-/org.kitesdk/kite-morphlines-avro = ${org.kitesdk.kite-morphlines.version}
-/org.kitesdk/kite-morphlines-core = ${org.kitesdk.kite-morphlines.version}
-/org.kitesdk/kite-morphlines-hadoop-sequencefile = ${org.kitesdk.kite-morphlines.version}
-/org.kitesdk/kite-morphlines-json = ${org.kitesdk.kite-morphlines.version}
-/org.kitesdk/kite-morphlines-saxon = ${org.kitesdk.kite-morphlines.version}
-/org.kitesdk/kite-morphlines-tika-core = ${org.kitesdk.kite-morphlines.version}
-/org.kitesdk/kite-morphlines-tika-decompress = ${org.kitesdk.kite-morphlines.version}
-/org.kitesdk/kite-morphlines-twitter = ${org.kitesdk.kite-morphlines.version}
-
/org.locationtech.spatial4j/spatial4j = 0.6
/org.mockito/mockito-core = 2.6.2
@@ -322,7 +264,6 @@ org.slf4j.version = 1.7.7
/org.slf4j/slf4j-log4j12 = ${org.slf4j.version}
/org.tukaani/xz = 1.5
-/org.xerial.snappy/snappy-java = 1.0.5
/rome/rome = 1.0
/xerces/xercesImpl = 2.9.1
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e74e4ae..428bde4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -104,6 +104,11 @@ Apache UIMA 2.3.1
Apache ZooKeeper 3.4.6
Jetty 9.3.14.v20161028
+Upgrade Notes
+----------------------
+
+* Solr contribs map-reduce, morphlines-core and morphlines-cell have been removed.
+
Detailed Change List
----------------------
@@ -128,6 +133,11 @@ Bug Fixes
* SOLR-10281: ADMIN_PATHS is duplicated in two places and inconsistent. This can cause automatic
retries to /admin/metrics handler by the CloudSolrClient. (shalin)
+Other Changes
+----------------------
+
+* SOLR-9221: Remove Solr contribs: map-reduce, morphlines-core and morphlines-cell. (Steve Rowe)
+
================== 6.5.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/solr/contrib/map-reduce/README.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/README.txt b/solr/contrib/map-reduce/README.txt
deleted file mode 100644
index a655aca..0000000
--- a/solr/contrib/map-reduce/README.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Apache Solr MapReduce
-
-*Experimental* - This contrib is currently subject to change in ways that may
-break back compatibility.
-
-The Solr MapReduce contrib provides an a mapreduce job that allows you to build
-Solr indexes and optionally merge them into a live Solr cluster.
-
-Example:
-
-# Build an index with map-reduce and deploy it to SolrCloud
-
-source $solr_distrib/example/scripts/map-reduce/set-map-reduce-classpath.sh
-
-$hadoop_distrib/bin/hadoop --config $hadoop_conf_dir jar \
-$solr_distrib/dist/solr-map-reduce-*.jar -D 'mapred.child.java.opts=-Xmx500m' \
--libjars "$HADOOP_LIBJAR" --morphline-file readAvroContainer.conf \
---zk-host 127.0.0.1:9983 --output-dir hdfs://127.0.0.1:8020/outdir \
---collection $collection --log4j log4j.properties --go-live \
---verbose "hdfs://127.0.0.1:8020/indir"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/solr/contrib/map-reduce/build.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/build.xml b/solr/contrib/map-reduce/build.xml
deleted file mode 100644
index d6aefc7..0000000
--- a/solr/contrib/map-reduce/build.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- 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.
- -->
-
-<project name="solr-map-reduce" default="default">
-
- <description>
- Solr map-reduce index construction.
- </description>
-
- <!-- <property name="name" value="MapReduceIndexerTool" /> -->
-
- <import file="../contrib-build.xml"/>
-
- <solr-contrib-uptodate name="extraction"
- property="solr-extraction.uptodate"
- classpath.property="solr-cell.jar"/>
-
- <target name="compile-solr-extraction" unless="solr-extraction.uptodate">
- <ant dir="${common-solr.dir}/contrib/extraction" target="compile-core" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- </target>
-
- <solr-contrib-uptodate name="morphlines-core"
- property="solr-morphlines-core.uptodate"/>
-
- <target name="compile-morphlines-core" unless="solr-morphlines-core.uptodate">
- <ant dir="${common-solr.dir}/contrib/morphlines-core" target="compile-core" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- </target>
-
- <solr-contrib-uptodate name="morphlines-cell"
- property="solr-morphlines-cell.uptodate"/>
-
- <target name="compile-morphlines-cell" unless="solr-morphlines-cell.uptodate">
- <ant dir="${common-solr.dir}/contrib/morphlines-cell" target="compile-core" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- </target>
-
- <target name="resolve-extraction-libs">
- <ant dir="${common-solr.dir}/contrib/extraction" target="resolve" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- </target>
-
- <target name="resolve-morphlines-core-libs">
- <ant dir="${common-solr.dir}/contrib/morphlines-core" target="resolve" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- </target>
-
- <target name="resolve-morphlines-cell-libs">
- <ant dir="${common-solr.dir}/contrib/morphlines-cell" target="resolve" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- </target>
-
- <path id="classpath.additions">
- <pathelement location="${common-solr.dir}/build/contrib/solr-cell/classes/java"/>
- <fileset dir="${common-solr.dir}/contrib/extraction/lib" excludes="${common.classpath.excludes}"/>
- <pathelement location="${common-solr.dir}/build/contrib/solr-morphlines-core/classes/java"/>
- <fileset dir="${common-solr.dir}/contrib/morphlines-core/lib" excludes="${common.classpath.excludes}"/>
- <pathelement location="${common-solr.dir}/build/contrib/solr-morphlines-cell/classes/java"/>
- <fileset dir="${common-solr.dir}/contrib/morphlines-cell/lib" excludes="${common.classpath.excludes}"/>
- </path>
-
- <path id="classpath">
- <path refid="solr.base.classpath"/>
- <path refid="classpath.additions"/>
- </path>
-
- <path id="test.classpath">
- <path refid="solr.test.base.classpath"/>
- <path refid="classpath.additions"/>
- <pathelement location="${common-solr.dir}/build/contrib/solr-morphlines-core/classes/test"/>
- <pathelement location="${common-solr.dir}/contrib/morphlines-core/src/test-files"/>
- <fileset dir="${common-solr.dir}/contrib/morphlines-core/test-lib" excludes="${common.classpath.excludes}"/>
- </path>
-
- <path id="javadoc.classpath">
- <path refid="junit-path"/>
- <path refid="classpath"/>
- <pathelement location="${ant.home}/lib/ant.jar"/>
- <fileset dir=".">
- <exclude name="build/**/*.jar"/>
- <include name="**/lib/*.jar"/>
- </fileset>
- </path>
-
- <!-- TODO: make this nicer like lucene? -->
- <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solr-core,javadocs-extraction,javadocs-morphlines-core,javadocs-morphlines-cell,check-javadocs-uptodate" unless="javadocs-uptodate-${name}">
- <sequential>
- <mkdir dir="${javadoc.dir}/${name}"/>
- <solr-invoke-javadoc>
- <solrsources>
- <packageset dir="${src.dir}"/>
- </solrsources>
- <links>
- <link href="../solr-solrj"/>
- <link href="../solr-morphlines-core"/>
- <link href="../solr-cell"/>
- </links>
- </solr-invoke-javadoc>
- <solr-jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
- </sequential>
- </target>
-
- <target name="javadocs-extraction">
- <ant dir="${common-solr.dir}/contrib/extraction" target="javadocs" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- </target>
-
- <target name="javadocs-morphlines-core">
- <ant dir="${common-solr.dir}/contrib/morphlines-core" target="javadocs" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- </target>
-
- <target name="javadocs-morphlines-cell">
- <ant dir="${common-solr.dir}/contrib/morphlines-cell" target="javadocs" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
- </target>
-
- <target name="compile-core" depends="resolve-extraction-libs, resolve-morphlines-core-libs, resolve-morphlines-cell-libs, compile-solr-extraction, compile-morphlines-core, compile-morphlines-cell, solr-contrib-build.compile-core"/>
-
- <property name="main.class" value="org.apache.solr.hadoop.MapReduceIndexerTool" />
- <target name="jar-core" depends="compile-core">
- <solr-jarify>
- <solr-jarify-additional-manifest-attributes>
- <attribute name="Main-Class" value="${main.class}"/>
- </solr-jarify-additional-manifest-attributes>
- </solr-jarify>
- </target>
-
- <target name="dist" depends="common-solr.dist"/>
-
-</project>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/solr/contrib/map-reduce/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/ivy.xml b/solr/contrib/map-reduce/ivy.xml
deleted file mode 100644
index d2e158e..0000000
--- a/solr/contrib/map-reduce/ivy.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- 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.
--->
-<ivy-module version="2.0">
- <info organisation="org.apache.solr" module="map-reduce" />
- <configurations defaultconfmapping="compile->master;test->master">
- <conf name="compile" transitive="false" />
- <conf name="test" transitive="false" />
- </configurations>
-
- <dependencies>
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" rev="${/org.apache.hadoop/hadoop-mapreduce-client-core}" conf="compile" />
- <dependency org="net.sourceforge.argparse4j" name="argparse4j" rev="${/net.sourceforge.argparse4j/argparse4j}" conf="compile" />
- <dependency org="org.kitesdk" name="kite-morphlines-saxon" rev="${/org.kitesdk/kite-morphlines-saxon}" conf="compile" />
- <dependency org="net.sf.saxon" name="Saxon-HE" rev="${/net.sf.saxon/Saxon-HE}" conf="compile" />
- <dependency org="org.kitesdk" name="kite-morphlines-hadoop-sequencefile" rev="${/org.kitesdk/kite-morphlines-hadoop-sequencefile}" conf="compile" />
- <dependency org="org.jboss.netty" name="netty" rev="${/org.jboss.netty/netty}" conf="test" />
- <dependency org="org.bouncycastle" name="bcpkix-jdk15on" rev="${/org.bouncycastle/bcpkix-jdk15on}" conf="test"/>
- <dependency org="com.rometools" name="rome" rev="${/com.rometools/rome}" conf="test"/>
- <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}" />
- </dependencies>
-</ivy-module>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/solr/contrib/map-reduce/src/java/assembly/hadoop-job.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/assembly/hadoop-job.xml b/solr/contrib/map-reduce/src/java/assembly/hadoop-job.xml
deleted file mode 100644
index 1640b6f..0000000
--- a/solr/contrib/map-reduce/src/java/assembly/hadoop-job.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
- http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-
- <id>job</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputDirectory>lib</outputDirectory>
- <excludes>
- <exclude>${groupId}:${artifactId}</exclude>
- </excludes>
- </dependencySet>
- <dependencySet>
- <unpack>true</unpack>
- <includes>
- <include>${groupId}:${artifactId}</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/53e5f34f/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/AlphaNumericComparator.java
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/AlphaNumericComparator.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/AlphaNumericComparator.java
deleted file mode 100644
index f596a88..0000000
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/AlphaNumericComparator.java
+++ /dev/null
@@ -1,75 +0,0 @@
-//The MIT License
-//
-// Copyright (c) 2003 Ron Alford, Mike Grove, Bijan Parsia, Evren Sirin
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-package org.apache.solr.hadoop;
-
-import java.util.Comparator;
-
-/**
- * This is a comparator to perform a mix of alphabetical+numeric comparison. For
- * example, if there is a list {"test10", "test2", "test150", "test25", "test1"}
- * then what we generally expect from the ordering is the result {"test1",
- * "test2", "test10", "test25", "test150"}. However, standard lexigraphic
- * ordering does not do that and "test10" comes before "test2". This class is
- * provided to overcome that problem. This functionality is useful to sort the
- * benchmark files (like the ones in in DL-benchmark-suite) from smallest to the
- * largest. Comparisons are done on the String values retuned by toString() so
- * care should be taken when this comparator is used to sort arbitrary Java
- * objects.
- *
- */
-final class AlphaNumericComparator implements Comparator {
-
- public AlphaNumericComparator() {
- }
-
- public int compare(Object o1, Object o2) {
- String s1 = o1.toString();
- String s2 = o2.toString();
- int n1 = s1.length(), n2 = s2.length();
- int i1 = 0, i2 = 0;
- while (i1 < n1 && i2 < n2) {
- int p1 = i1;
- int p2 = i2;
- char c1 = s1.charAt(i1++);
- char c2 = s2.charAt(i2++);
- if(c1 != c2) {
- if (Character.isDigit(c1) && Character.isDigit(c2)) {
- int value1 = 0, value2 = 0;
- while (i1 < n1 && Character.isDigit(c1 = s1.charAt(i1))) {
- i1++;
- }
- value1 = Integer.parseInt(s1.substring(p1, i1));
- while (i2 < n2 && Character.isDigit(c2 = s2.charAt(i2))) {
- i2++;
- }
- value2 = Integer.parseInt(s2.substring(p2, i2));
- if (value1 != value2) {
- return value1 - value2;
- }
- }
- return c1 - c2;
- }
- }
-
- return n1 - n2;
- }
-}
\ No newline at end of file