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 2014/08/27 12:15:42 UTC
svn commit: r1620852 [2/3] - in /lucene/dev/branches/lucene5904: ./
dev-tools/ dev-tools/maven/solr/ lucene/ lucene/analysis/
lucene/analysis/common/
lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/
lucene/analysis/common/src/test/org/...
Modified: lucene/dev/branches/lucene5904/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java (original)
+++ lucene/dev/branches/lucene5904/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java Wed Aug 27 10:15:38 2014
@@ -94,6 +94,14 @@ public class BlendedInfixSuggester exten
* Create a new instance, loading from a previously built
* directory, if it exists.
*/
+ public BlendedInfixSuggester(Directory dir, Analyzer analyzer) throws IOException {
+ this(analyzer.getVersion(), dir, analyzer);
+ }
+
+ /**
+ * @deprecated Use {@link #BlendedInfixSuggester(Directory, Analyzer)}
+ */
+ @Deprecated
public BlendedInfixSuggester(Version matchVersion, Directory dir, Analyzer analyzer) throws IOException {
super(matchVersion, dir, analyzer);
this.blenderType = BlenderType.POSITION_LINEAR;
@@ -110,6 +118,15 @@ public class BlendedInfixSuggester exten
* suggester index to disk and future instances of this suggester can use this pre-built dictionary.
* @throws IOException If there are problems opening the underlying Lucene index.
*/
+ public BlendedInfixSuggester(Directory dir, Analyzer indexAnalyzer, Analyzer queryAnalyzer,
+ int minPrefixChars, BlenderType blenderType, int numFactor, boolean commitOnBuild) throws IOException {
+ this(indexAnalyzer.getVersion(), dir, indexAnalyzer, queryAnalyzer, minPrefixChars, blenderType, numFactor, commitOnBuild);
+ }
+
+ /**
+ * @deprecated Use {@link #BlendedInfixSuggester(Directory, Analyzer, Analyzer, int, BlendedInfixSuggester.BlenderType, int, boolean)}
+ */
+ @Deprecated
public BlendedInfixSuggester(Version matchVersion, Directory dir, Analyzer indexAnalyzer, Analyzer queryAnalyzer,
int minPrefixChars, BlenderType blenderType, int numFactor, boolean commitOnBuild) throws IOException {
super(matchVersion, dir, indexAnalyzer, queryAnalyzer, minPrefixChars, commitOnBuild);
Modified: lucene/dev/branches/lucene5904/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java (original)
+++ lucene/dev/branches/lucene5904/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java Wed Aug 27 10:15:38 2014
@@ -163,7 +163,7 @@ public class LookupBenchmarkTest extends
} catch (InstantiationException e) {
Analyzer a = new MockAnalyzer(random, MockTokenizer.KEYWORD, false);
if (cls == AnalyzingInfixSuggester.class) {
- lookup = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, FSDirectory.open(createTempDir("LookupBenchmarkTest")), a);
+ lookup = new AnalyzingInfixSuggester(FSDirectory.open(createTempDir("LookupBenchmarkTest")), a);
} else {
Constructor<? extends Lookup> ctor = cls.getConstructor(Analyzer.class);
lookup = ctor.newInstance(a);
Modified: lucene/dev/branches/lucene5904/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java (original)
+++ lucene/dev/branches/lucene5904/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java Wed Aug 27 10:15:38 2014
@@ -51,7 +51,7 @@ public class AnalyzingInfixSuggesterTest
};
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newDirectory(), a, a, 3, false);
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newDirectory(), a, a, 3, false);
suggester.build(new InputArrayIterator(keys));
List<LookupResult> results = suggester.lookup(TestUtil.stringToCharSequence("ear", random()), 10, true, true);
@@ -94,12 +94,12 @@ public class AnalyzingInfixSuggesterTest
File tempDir = createTempDir("AnalyzingInfixSuggesterTest");
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a, 3, false);
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, 3, false);
suggester.build(new InputArrayIterator(keys));
assertEquals(2, suggester.getCount());
suggester.close();
- suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a, 3, false);
+ suggester = new AnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, 3, false);
List<LookupResult> results = suggester.lookup(TestUtil.stringToCharSequence("ear", random()), 10, true, true);
assertEquals(2, results.size());
assertEquals("a penny saved is a penny <b>ear</b>ned", results.get(0).key);
@@ -138,7 +138,7 @@ public class AnalyzingInfixSuggesterTest
};
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newDirectory(), a, a, 3, false) {
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newDirectory(), a, a, 3, false) {
@Override
protected Object highlight(String text, Set<String> matchedTokens, String prefixToken) throws IOException {
try (TokenStream ts = queryAnalyzer.tokenStream("text", new StringReader(text))) {
@@ -214,7 +214,7 @@ public class AnalyzingInfixSuggesterTest
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
int minPrefixLength = random().nextInt(10);
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a, minPrefixLength, false);
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, minPrefixLength, false);
suggester.build(new InputArrayIterator(keys));
for(int i=0;i<2;i++) {
@@ -271,7 +271,7 @@ public class AnalyzingInfixSuggesterTest
// Make sure things still work after close and reopen:
suggester.close();
- suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a, minPrefixLength, false);
+ suggester = new AnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, minPrefixLength, false);
}
suggester.close();
}
@@ -282,7 +282,7 @@ public class AnalyzingInfixSuggesterTest
};
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newDirectory(), a, a, 3, false);
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newDirectory(), a, a, 3, false);
suggester.build(new InputArrayIterator(keys));
List<LookupResult> results = suggester.lookup(TestUtil.stringToCharSequence("penn", random()), 10, true, true);
assertEquals(1, results.size());
@@ -296,7 +296,7 @@ public class AnalyzingInfixSuggesterTest
};
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, true);
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newDirectory(), a, a, 3, false);
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newDirectory(), a, a, 3, false);
suggester.build(new InputArrayIterator(keys));
List<LookupResult> results = suggester.lookup(TestUtil.stringToCharSequence("penn", random()), 10, true, true);
assertEquals(1, results.size());
@@ -305,7 +305,7 @@ public class AnalyzingInfixSuggesterTest
// Try again, but overriding addPrefixMatch to highlight
// the entire hit:
- suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newDirectory(), a, a, 3, false) {
+ suggester = new AnalyzingInfixSuggester(newDirectory(), a, a, 3, false) {
@Override
protected void addPrefixMatch(StringBuilder sb, String surface, String analyzed, String prefixToken) {
sb.append("<b>");
@@ -326,7 +326,7 @@ public class AnalyzingInfixSuggesterTest
};
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newDirectory(), a, a, 3, false);
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newDirectory(), a, a, 3, false);
suggester.build(new InputArrayIterator(keys));
suggester.close();
suggester.close();
@@ -352,7 +352,7 @@ public class AnalyzingInfixSuggesterTest
}
};
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newDirectory(), indexAnalyzer, queryAnalyzer, 3, false);
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newDirectory(), indexAnalyzer, queryAnalyzer, 3, false);
Input keys[] = new Input[] {
new Input("a bob for apples", 10, new BytesRef("foobaz")),
@@ -367,7 +367,7 @@ public class AnalyzingInfixSuggesterTest
public void testEmptyAtStart() throws Exception {
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newDirectory(), a, a, 3, false);
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newDirectory(), a, a, 3, false);
suggester.build(new InputArrayIterator(new Input[0]));
suggester.add(new BytesRef("a penny saved is a penny earned"), null, 10, new BytesRef("foobaz"));
suggester.add(new BytesRef("lend me your ear"), null, 8, new BytesRef("foobar"));
@@ -405,7 +405,7 @@ public class AnalyzingInfixSuggesterTest
public void testBothExactAndPrefix() throws Exception {
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newDirectory(), a, a, 3, false);
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newDirectory(), a, a, 3, false);
suggester.build(new InputArrayIterator(new Input[0]));
suggester.add(new BytesRef("the pen is pretty"), null, 10, new BytesRef("foobaz"));
suggester.refresh();
@@ -478,7 +478,7 @@ public class AnalyzingInfixSuggesterTest
System.out.println(" minPrefixChars=" + minPrefixChars);
}
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a, minPrefixChars, false);
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, minPrefixChars, false);
// Initial suggester built with nothing:
suggester.build(new InputArrayIterator(new Input[0]));
@@ -558,7 +558,7 @@ public class AnalyzingInfixSuggesterTest
}
lookupThread.finish();
suggester.close();
- suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a, minPrefixChars, false);
+ suggester = new AnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, minPrefixChars, false);
lookupThread = new LookupThread(suggester);
lookupThread.start();
@@ -730,7 +730,7 @@ public class AnalyzingInfixSuggesterTest
};
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newDirectory(), a, a, 3, false);
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newDirectory(), a, a, 3, false);
suggester.build(new InputArrayIterator(keys));
List<LookupResult> results = suggester.lookup(TestUtil.stringToCharSequence("ear", random()), 10, true, true);
@@ -794,7 +794,7 @@ public class AnalyzingInfixSuggesterTest
String[] keys = new String[] {"python", "java", "c", "scala", "ruby", "clojure", "erlang", "go", "swift", "lisp"};
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
File tempDir = createTempDir("AIS_NRT_PERSIST_TEST");
- AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a, 3, false);
+ AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, 3, false);
Thread[] multiAddThreads = new Thread[10];
try {
suggester.refresh();
@@ -822,7 +822,7 @@ public class AnalyzingInfixSuggesterTest
suggester.commit();
suggester.close();
- suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a, 3, false);
+ suggester = new AnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, 3, false);
results = suggester.lookup(TestUtil.stringToCharSequence("python", random()), 10, true, false);
assertEquals(1, results.size());
assertEquals("python", results.get(0).key);
@@ -871,11 +871,11 @@ public class AnalyzingInfixSuggesterTest
AnalyzingInfixSuggester suggester;
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
if (iter == 0) {
- suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a, 3, false);
+ suggester = new AnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, 3, false);
suggester.build(new InputArrayIterator(keys));
} else {
// Test again, after close/reopen:
- suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a, 3, false);
+ suggester = new AnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, 3, false);
}
// No context provided, all results returned
Modified: lucene/dev/branches/lucene5904/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java (original)
+++ lucene/dev/branches/lucene5904/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java Wed Aug 27 10:15:38 2014
@@ -47,7 +47,7 @@ public class BlendedInfixSuggesterTest e
File tempDir = createTempDir("BlendedInfixSuggesterTest");
Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET);
- BlendedInfixSuggester suggester = new BlendedInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a,
+ BlendedInfixSuggester suggester = new BlendedInfixSuggester(newFSDirectory(tempDir), a, a,
AnalyzingInfixSuggester.DEFAULT_MIN_PREFIX_CHARS,
BlendedInfixSuggester.BlenderType.POSITION_LINEAR,
BlendedInfixSuggester.DEFAULT_NUM_FACTOR, false);
@@ -87,7 +87,7 @@ public class BlendedInfixSuggesterTest e
Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET);
// BlenderType.LINEAR is used by default (remove position*10%)
- BlendedInfixSuggester suggester = new BlendedInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a);
+ BlendedInfixSuggester suggester = new BlendedInfixSuggester(newFSDirectory(tempDir), a);
suggester.build(new InputArrayIterator(keys));
assertEquals(w, getInResults(suggester, "top", pl, 1));
@@ -97,7 +97,7 @@ public class BlendedInfixSuggesterTest e
suggester.close();
// BlenderType.RECIPROCAL is using 1/(1+p) * w where w is weight and p the position of the word
- suggester = new BlendedInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a,
+ suggester = new BlendedInfixSuggester(newFSDirectory(tempDir), a, a,
AnalyzingInfixSuggester.DEFAULT_MIN_PREFIX_CHARS,
BlendedInfixSuggester.BlenderType.POSITION_RECIPROCAL, 1, false);
suggester.build(new InputArrayIterator(keys));
@@ -129,7 +129,7 @@ public class BlendedInfixSuggesterTest e
Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET);
// if factor is small, we don't get the expected element
- BlendedInfixSuggester suggester = new BlendedInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a,
+ BlendedInfixSuggester suggester = new BlendedInfixSuggester(newFSDirectory(tempDir), a, a,
AnalyzingInfixSuggester.DEFAULT_MIN_PREFIX_CHARS,
BlendedInfixSuggester.BlenderType.POSITION_RECIPROCAL, 1, false);
@@ -149,7 +149,7 @@ public class BlendedInfixSuggesterTest e
suggester.close();
// if we increase the factor we have it
- suggester = new BlendedInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a,
+ suggester = new BlendedInfixSuggester(newFSDirectory(tempDir), a, a,
AnalyzingInfixSuggester.DEFAULT_MIN_PREFIX_CHARS,
BlendedInfixSuggester.BlenderType.POSITION_RECIPROCAL, 2, false);
suggester.build(new InputArrayIterator(keys));
@@ -181,7 +181,7 @@ public class BlendedInfixSuggesterTest e
Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET);
// if factor is small, we don't get the expected element
- BlendedInfixSuggester suggester = new BlendedInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a,
+ BlendedInfixSuggester suggester = new BlendedInfixSuggester(newFSDirectory(tempDir), a, a,
AnalyzingInfixSuggester.DEFAULT_MIN_PREFIX_CHARS,
BlendedInfixSuggester.BlenderType.POSITION_RECIPROCAL,
BlendedInfixSuggester.DEFAULT_NUM_FACTOR, false);
Modified: lucene/dev/branches/lucene5904/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/lucene5904/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Wed Aug 27 10:15:38 2014
@@ -371,13 +371,6 @@ public abstract class LuceneTestCase ext
// for all suites ever since.
// -----------------------------------------------------------------
- // :Post-Release-Update-Version.LUCENE_XY:
- /**
- * Use this constant when creating Analyzers and any other version-dependent stuff.
- * <p><b>NOTE:</b> Change this when development starts for new Lucene version:
- */
- public static final Version TEST_VERSION_CURRENT = Version.LUCENE_5_0_0;
-
/**
* True if and only if tests are run in verbose mode. If this flag is false
* tests are not expected to print any messages. Enforced with {@link TestRuleLimitSysouts}.
Modified: lucene/dev/branches/lucene5904/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/CHANGES.txt?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene5904/solr/CHANGES.txt Wed Aug 27 10:15:38 2014
@@ -123,9 +123,6 @@ Bug Fixes
* SOLR-4895: An error should be returned when a rollback is attempted in SolrCloud mode.
(Vamsee Yarlagadda via Mark Miller)
-* SOLR-6410: Ensure all Lookup instances are closed via CloseHook
- (hossman, Areek Zillur, Ryan Ernst, Dawid Weiss)
-
* SOLR-6424: The hdfs block cache BLOCKCACHE_WRITE_ENABLED is not defaulting to false like it
should. (Mark Miller)
@@ -134,6 +131,9 @@ Bug Fixes
* SOLR-6426: SolrZkClient clean can fail due to a race with children nodes. (Mark Miller)
+* SOLR-5966: Admin UI Menu is fixed and doesn't respect smaller viewports.
+ (Aman Tandon, steffkes via shalin)
+
Other Changes
---------------------
@@ -146,6 +146,9 @@ Other Changes
constructors, improve javadocs for CloudSolrServer constructors.
(Steve Davids via Shawn Heisey)
+* LUCENE-5901: Replaced all occurences of LUCENE_CURRENT with LATEST for luceneMatchVersion.
+ (Ryan Ernst)
+
================== 4.10.0 =================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
@@ -224,7 +227,7 @@ New Features
a UUID into the unique Key field.
(Vitaliy Zhovtyuk, hossman, Steve Rowe, Erik Hatcher, shalin)
-* SOLR-6294: Remove the restriction of adding json by only wrapping it in an array in a
+* SOLR-6294: SOLR-6437: Remove the restriction of adding json by only wrapping it in an array in a
new path /update/json/docs (Noble Paul , hossman, Yonik Seeley, Steve Rowe)
* SOLR-6302: UpdateRequestHandlers are registered implicitly /update ,
@@ -367,6 +370,9 @@ Bug Fixes
* SOLR-6405: ZooKeeper calls can easily not be retried enough on ConnectionLoss.
(Jessica Cheng, Mark Miller)
+* SOLR-6410: Ensure all Lookup instances are closed via CloseHook
+ (hossman, Areek Zillur, Ryan Ernst, Dawid Weiss)
+
Optimizations
---------------------
Modified: lucene/dev/branches/lucene5904/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -17,7 +17,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data
other than the default ./data under the Solr home.
Modified: lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -17,7 +17,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -17,7 +17,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -17,7 +17,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data
other than the default ./data under the Solr home.
Modified: lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -17,7 +17,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<jmx />
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
Modified: lucene/dev/branches/lucene5904/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml Wed Aug 27 10:15:38 2014
@@ -34,7 +34,7 @@
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<requestHandler name="search" class="solr.SearchHandler" default="true">
<lst name="defaults">
Modified: lucene/dev/branches/lucene5904/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java Wed Aug 27 10:15:38 2014
@@ -23,6 +23,7 @@ import java.io.UnsupportedEncodingExcept
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Locale;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
@@ -61,6 +62,8 @@ public class MapReduceIndexerToolArgumen
@BeforeClass
public static void beforeClass() {
assumeFalse("Does not work on Windows, because it uses UNIX shell commands or POSIX paths", Constants.WINDOWS);
+ assumeFalse("This test fails on UNIX with Turkish default locale (https://issues.apache.org/jira/browse/SOLR-6387)",
+ new Locale("tr").getLanguage().equals(Locale.getDefault().getLanguage()));
}
@Before
Modified: lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<!-- lib directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
Modified: lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
Modified: lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
Modified: lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<!-- lib directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
Modified: lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
Modified: lucene/dev/branches/lucene5904/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -24,7 +24,7 @@
https://issues.apache.org/jira/browse/SOLR-1167
-->
<config xmlns:xi="http://www.w3.org/2001/XInclude">
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -24,7 +24,7 @@
https://issues.apache.org/jira/browse/SOLR-1167
-->
<config xmlns:xi="http://www.w3.org/2001/XInclude">
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -21,7 +21,7 @@
this file, see http://wiki.apache.org/solr/SolrConfigXml.
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -21,7 +21,7 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<mergePolicy class="org.apache.solr.update.DummyMergePolicy"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateRequestProcessorChain name="force-script-engine" default="true">
<processor class="solr.StatelessScriptUpdateProcessorFactory">
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateRequestProcessorChain name="force-script-engine" default="true">
<processor class="solr.StatelessScriptUpdateProcessorFactory">
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-managed-schema-named-schema.xml.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-managed-schema-named-schema.xml.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-managed-schema-named-schema.xml.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-managed-schema-named-schema.xml.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<!-- managed schema can't be named schema.xml -->
<schemaFactory class="ManagedIndexSchemaFactory">
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateRequestProcessorChain name="force-script-engine" default="true">
<processor class="solr.StatelessScriptUpdateProcessorFactory">
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<!-- BEGIN BAD: multiple useCompoundFile -->
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<useCompoundFile>true</useCompoundFile>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-schema-mutable-but-not-managed.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-schema-mutable-but-not-managed.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-schema-mutable-but-not-managed.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-schema-mutable-but-not-managed.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<!-- schema must be managed in order to be mutable -->
<!-- managed schema can't be named schema.xml -->
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<!-- The presence of bogusParam should trigger failure -->
<schemaFactory class="ManagedIndexSchemaFactory">
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-warmer-no-reopen.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-warmer-no-reopen.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-warmer-no-reopen.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-warmer-no-reopen.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<mergedSegmentWarmer class="org.apache.lucene.index.SimpleMergedSegmentWarmer"/>
<nrtMode>false</nrtMode> <!-- BAD -->
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<indexConfig>
<useCompoundFile>${unset.sys.property}</useCompoundFile>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<queryParser name="foo" class="FooQParserPlugin"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml Wed Aug 27 10:15:38 2014
@@ -22,7 +22,7 @@
configurations.
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestFSDirectoryFactory"></directoryFactory>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml Wed Aug 27 10:15:38 2014
@@ -47,7 +47,7 @@
<double name="maxWriteMBPerSecRead">4000000</double>
</directoryFactory>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml Wed Aug 27 10:15:38 2014
@@ -20,7 +20,7 @@
<!-- a basic solrconfig that tests can use when they want simple minimal solrconfig/schema
DO NOT ADD THINGS TO THIS CONFIG! -->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml Wed Aug 27 10:15:38 2014
@@ -15,7 +15,7 @@
limitations under the License.
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<query>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml Wed Aug 27 10:15:38 2014
@@ -47,7 +47,7 @@
<double name="maxWriteMBPerSecRead">4000000</double>
</directoryFactory>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml Wed Aug 27 10:15:38 2014
@@ -33,7 +33,7 @@
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateHandler class="solr.DirectUpdateHandler2"></updateHandler>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml Wed Aug 27 10:15:38 2014
@@ -24,7 +24,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-defaults.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-defaults.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-defaults.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-defaults.xml Wed Aug 27 10:15:38 2014
@@ -34,7 +34,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion><!--
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion><!--
DO NOT ADD THINGS TO THIS CONFIG!
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<updateHandler class="solr.DirectUpdateHandler2"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml Wed Aug 27 10:15:38 2014
@@ -28,7 +28,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
<dataDir>${solr.data.dir:}</dataDir>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<config>
<dataDir>${solr.data.dir:}</dataDir>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
<infoStream>true</infoStream>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml Wed Aug 27 10:15:38 2014
@@ -20,7 +20,7 @@
<!-- a basic solrconfig that tests can use when they want simple minimal solrconfig/schema
DO NOT ADD THINGS TO THIS CONFIG! -->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<dataDir>${solr.data.dir:}</dataDir>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml Wed Aug 27 10:15:38 2014
@@ -17,7 +17,7 @@
limitations under the License.
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<indexConfig>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml Wed Aug 27 10:15:38 2014
@@ -35,7 +35,7 @@
<directoryFactory name="DirectoryFactory"
class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml Wed Aug 27 10:15:38 2014
@@ -18,7 +18,7 @@
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- The DirectoryFactory to use for indexes.
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<!-- a basic solrconfig that tests NoOpRegenerator -->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml Wed Aug 27 10:15:38 2014
@@ -22,7 +22,7 @@
configurations.
-->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
Modified: lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml?rev=1620852&r1=1620851&r2=1620852&view=diff
==============================================================================
--- lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml (original)
+++ lucene/dev/branches/lucene5904/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml Wed Aug 27 10:15:38 2014
@@ -19,7 +19,7 @@
<!-- solrconfig.xml for a WFST phrase suggester -->
<config>
- <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>