Merge pull request #18 from projecthydra/solr-4.3

Updating to solr 4.3.0
samvera-deprecated · Oct 14, 2013 · 3f36c14 · 3f36c14
2 parents 1e4b967 + 2db3c2a
commit 3f36c14
Show file tree

Hide file tree

Showing 53 changed files with 2 additions and 22 deletions.
diff --git a/solr/development-core/conf/solrconfig.xml b/solr/development-core/conf/solrconfig.xml
@@ -6,7 +6,7 @@
 
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
-  <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
 
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 

diff --git a/solr/lib/apache-solr-clustering-4.0.0.jar b/solr/lib/apache-solr-clustering-4.0.0.jar
diff --git a/solr/lib/apache-solr-langid-4.0.0.jar b/solr/lib/apache-solr-langid-4.0.0.jar
diff --git a/...lysis-extras/lib/morfologik-fsa-1.5.3.jar → ...lysis-extras/lib/morfologik-fsa-1.5.5.jar b/...lysis-extras/lib/morfologik-fsa-1.5.3.jar → ...lysis-extras/lib/morfologik-fsa-1.5.5.jar
diff --git a/...is-extras/lib/morfologik-polish-1.5.3.jar → ...is-extras/lib/morfologik-polish-1.5.5.jar b/...is-extras/lib/morfologik-polish-1.5.3.jar → ...is-extras/lib/morfologik-polish-1.5.5.jar
diff --git a/...-extras/lib/morfologik-stemming-1.5.3.jar → ...-extras/lib/morfologik-stemming-1.5.5.jar b/...-extras/lib/morfologik-stemming-1.5.3.jar → ...-extras/lib/morfologik-stemming-1.5.5.jar
diff --git a/...ucene-libs/lucene-analyzers-icu-4.0.0.jar → ...ucene-libs/lucene-analyzers-icu-4.3.0.jar b/...ucene-libs/lucene-analyzers-icu-4.0.0.jar → ...ucene-libs/lucene-analyzers-icu-4.3.0.jar
diff --git a/solr/lib/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.0.0.jar b/solr/lib/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.0.0.jar
diff --git a/solr/lib/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.3.0.jar b/solr/lib/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-4.3.0.jar
diff --git a/...e-libs/lucene-analyzers-smartcn-4.0.0.jar → ...e-libs/lucene-analyzers-smartcn-4.3.0.jar b/...e-libs/lucene-analyzers-smartcn-4.0.0.jar → ...e-libs/lucene-analyzers-smartcn-4.3.0.jar
diff --git a/...e-libs/lucene-analyzers-stempel-4.0.0.jar → ...e-libs/lucene-analyzers-stempel-4.3.0.jar b/...e-libs/lucene-analyzers-stempel-4.0.0.jar → ...e-libs/lucene-analyzers-stempel-4.3.0.jar
diff --git a/solr/lib/contrib/clustering/README.txt b/solr/lib/contrib/clustering/README.txt
diff --git a/solr/lib/contrib/clustering/lib/carrot2-core-3.5.0.jar b/solr/lib/contrib/clustering/lib/carrot2-core-3.5.0.jar
diff --git a/solr/lib/contrib/clustering/lib/hppc-0.3.3.jar b/solr/lib/contrib/clustering/lib/hppc-0.3.3.jar
diff --git a/solr/lib/contrib/clustering/lib/jackson-core-asl-1.7.4.jar b/solr/lib/contrib/clustering/lib/jackson-core-asl-1.7.4.jar
diff --git a/solr/lib/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar b/solr/lib/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar
diff --git a/solr/lib/contrib/clustering/lib/mahout-collections-0.3.jar b/solr/lib/contrib/clustering/lib/mahout-collections-0.3.jar
diff --git a/solr/lib/contrib/clustering/lib/mahout-math-0.3.jar b/solr/lib/contrib/clustering/lib/mahout-math-0.3.jar
diff --git a/solr/lib/contrib/clustering/lib/simple-xml-2.4.1.jar b/solr/lib/contrib/clustering/lib/simple-xml-2.4.1.jar
diff --git a/solr/lib/contrib/extraction/README.txt b/solr/lib/contrib/extraction/README.txt
diff --git a/solr/lib/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar b/solr/lib/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar
diff --git a/solr/lib/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar b/solr/lib/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar
diff --git a/solr/lib/contrib/extraction/lib/apache-solr-cell-4.0.0.jar b/solr/lib/contrib/extraction/lib/apache-solr-cell-4.0.0.jar
diff --git a/solr/lib/contrib/extraction/lib/bcmail-jdk15-1.45.jar b/solr/lib/contrib/extraction/lib/bcmail-jdk15-1.45.jar
diff --git a/solr/lib/contrib/extraction/lib/bcprov-jdk15-1.45.jar b/solr/lib/contrib/extraction/lib/bcprov-jdk15-1.45.jar
diff --git a/solr/lib/contrib/extraction/lib/boilerpipe-1.1.0.jar b/solr/lib/contrib/extraction/lib/boilerpipe-1.1.0.jar
diff --git a/solr/lib/contrib/extraction/lib/commons-compress-1.4.1.jar b/solr/lib/contrib/extraction/lib/commons-compress-1.4.1.jar
diff --git a/solr/lib/contrib/extraction/lib/dom4j-1.6.1.jar b/solr/lib/contrib/extraction/lib/dom4j-1.6.1.jar
diff --git a/solr/lib/contrib/extraction/lib/fontbox-1.7.0.jar b/solr/lib/contrib/extraction/lib/fontbox-1.7.0.jar
diff --git a/solr/lib/contrib/extraction/lib/icu4j-49.1.jar b/solr/lib/contrib/extraction/lib/icu4j-49.1.jar
diff --git a/solr/lib/contrib/extraction/lib/isoparser-1.0-RC-1.jar b/solr/lib/contrib/extraction/lib/isoparser-1.0-RC-1.jar
diff --git a/solr/lib/contrib/extraction/lib/jdom-1.0.jar b/solr/lib/contrib/extraction/lib/jdom-1.0.jar
diff --git a/solr/lib/contrib/extraction/lib/jempbox-1.7.0.jar b/solr/lib/contrib/extraction/lib/jempbox-1.7.0.jar
diff --git a/solr/lib/contrib/extraction/lib/juniversalchardet-1.0.3.jar b/solr/lib/contrib/extraction/lib/juniversalchardet-1.0.3.jar
diff --git a/solr/lib/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar b/solr/lib/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar
diff --git a/solr/lib/contrib/extraction/lib/netcdf-4.2-min.jar b/solr/lib/contrib/extraction/lib/netcdf-4.2-min.jar
diff --git a/solr/lib/contrib/extraction/lib/pdfbox-1.7.0.jar b/solr/lib/contrib/extraction/lib/pdfbox-1.7.0.jar
diff --git a/solr/lib/contrib/extraction/lib/poi-3.8.jar b/solr/lib/contrib/extraction/lib/poi-3.8.jar
diff --git a/solr/lib/contrib/extraction/lib/poi-ooxml-3.8.jar b/solr/lib/contrib/extraction/lib/poi-ooxml-3.8.jar
diff --git a/solr/lib/contrib/extraction/lib/poi-ooxml-schemas-3.8.jar b/solr/lib/contrib/extraction/lib/poi-ooxml-schemas-3.8.jar
diff --git a/solr/lib/contrib/extraction/lib/poi-scratchpad-3.8.jar b/solr/lib/contrib/extraction/lib/poi-scratchpad-3.8.jar
diff --git a/solr/lib/contrib/extraction/lib/rome-0.9.jar b/solr/lib/contrib/extraction/lib/rome-0.9.jar
diff --git a/solr/lib/contrib/extraction/lib/tagsoup-1.2.1.jar b/solr/lib/contrib/extraction/lib/tagsoup-1.2.1.jar
diff --git a/solr/lib/contrib/extraction/lib/tika-core-1.2.jar b/solr/lib/contrib/extraction/lib/tika-core-1.2.jar
diff --git a/solr/lib/contrib/extraction/lib/tika-parsers-1.2.jar b/solr/lib/contrib/extraction/lib/tika-parsers-1.2.jar
diff --git a/solr/lib/contrib/extraction/lib/vorbis-java-core-0.1.jar b/solr/lib/contrib/extraction/lib/vorbis-java-core-0.1.jar
diff --git a/solr/lib/contrib/extraction/lib/vorbis-java-tika-0.1.jar b/solr/lib/contrib/extraction/lib/vorbis-java-tika-0.1.jar
diff --git a/solr/lib/contrib/extraction/lib/xercesImpl-2.9.1.jar b/solr/lib/contrib/extraction/lib/xercesImpl-2.9.1.jar
diff --git a/solr/lib/contrib/extraction/lib/xmlbeans-2.3.0.jar b/solr/lib/contrib/extraction/lib/xmlbeans-2.3.0.jar
diff --git a/solr/lib/contrib/extraction/lib/xz-1.0.jar b/solr/lib/contrib/extraction/lib/xz-1.0.jar
diff --git a/...lib/apache-solr-analysis-extras-4.0.0.jar → solr/lib/solr-analysis-extras-4.3.0.jar b/...lib/apache-solr-analysis-extras-4.0.0.jar → solr/lib/solr-analysis-extras-4.3.0.jar
diff --git a/solr/test-core/conf/solrconfig.xml b/solr/test-core/conf/solrconfig.xml
@@ -6,7 +6,7 @@
 
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
-  <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_43</luceneMatchVersion>
 
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 

diff --git a/webapps/solr.war b/webapps/solr.war