From eb8010405de190f37014a2f05790d108dd9d0268 Mon Sep 17 00:00:00 2001 From: Christine Poerschke Date: Mon, 19 Nov 2018 14:51:13 +0000 Subject: [PATCH] SOLR-12972: remove deprecated, unused SolrIndexConfig.luceneVersion --- .../src/java/org/apache/solr/update/SolrIndexConfig.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java index 0429d4965ba..cd962af7aa0 100644 --- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java +++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java @@ -31,7 +31,6 @@ import org.apache.lucene.index.MergePolicy; import org.apache.lucene.index.MergeScheduler; import org.apache.lucene.search.Sort; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.Version; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.Utils; import org.apache.solr.core.DirectoryFactory; @@ -63,9 +62,6 @@ public class SolrIndexConfig implements MapSerializable { private static final String DEFAULT_MERGE_POLICY_FACTORY_CLASSNAME = DefaultMergePolicyFactory.class.getName(); public static final String DEFAULT_MERGE_SCHEDULER_CLASSNAME = ConcurrentMergeScheduler.class.getName(); - @Deprecated - public final Version luceneVersion; - public final boolean useCompoundFile; public final int maxBufferedDocs; @@ -86,7 +82,6 @@ public class SolrIndexConfig implements MapSerializable { * Internal constructor for setting defaults based on Lucene Version */ private SolrIndexConfig(SolrConfig solrConfig) { - luceneVersion = solrConfig.luceneMatchVersion; useCompoundFile = false; maxBufferedDocs = -1; ramBufferSizeMB = 100; @@ -119,8 +114,6 @@ public class SolrIndexConfig implements MapSerializable { // config section Object unused = solrConfig.getNode(prefix, false); - luceneVersion = solrConfig.luceneMatchVersion; - // Assert that end-of-life parameters or syntax is not in our config. // Warn for luceneMatchVersion's before LUCENE_3_6, fail fast above assertWarnOrFail("The myclass syntax is no longer supported in solrconfig.xml. Please use syntax instead.",