You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/04/11 07:59:11 UTC
svn commit: r1586580 - in /lucene/dev/branches/branch_4x: ./
dev-tools/idea/.idea/ lucene/
lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/
lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/
lucene/core/ lucene/core/...
Author: uschindler
Date: Fri Apr 11 05:59:10 2014
New Revision: 1586580
URL: http://svn.apache.org/r1586580
Log:
Update stable branch to Lucene 4.9
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/build.xml
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt
lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java
lucene/dev/branches/branch_4x/lucene/common-build.xml
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Version.java
lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java
lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java
lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/facet/FacetExamples.java
lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/multicore/core0/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/multicore/core1/conf/solrconfig.xml
lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml
Modified: lucene/dev/branches/branch_4x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/build.xml?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/build.xml (original)
+++ lucene/dev/branches/branch_4x/build.xml Fri Apr 11 05:59:10 2014
@@ -136,7 +136,7 @@
</subant>
</target>
- <property name="version" value="4.8-SNAPSHOT"/>
+ <property name="version" value="4.9-SNAPSHOT"/>
<property name="maven-build-dir" value="maven-build"/>
<property name="maven-version" value="2.2.1"/>
@@ -351,7 +351,7 @@ File | Project Structure | Platform Sett
<property name="python32.exe" value="python3.2" />
<property name="fakeRelease" location="lucene/build/fakeRelease"/>
<property name="fakeReleaseTmp" location="lucene/build/fakeReleaseTmp"/>
- <property name="fakeReleaseVersion" value="4.8.0"/> <!-- *not* -SNAPSHOT, the real version -->
+ <property name="fakeReleaseVersion" value="4.9.0"/> <!-- *not* -SNAPSHOT, the real version -->
<property name="smokeTestRelease.testArgs" value=""/>
<target name="-load-env">
Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml Fri Apr 11 05:59:10 2014
@@ -8,7 +8,7 @@
<module name="lucene-core-tests" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/core" />
- <option name="VM_PARAMETERS" value="-Xmx256m -ea -Dlucene.version=4.8-SNAPSHOT -DtempDir=temp" />
+ <option name="VM_PARAMETERS" value="-Xmx256m -ea -Dlucene.version=4.9-SNAPSHOT -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Module analyzers-common" type="JUnit" factoryName="JUnit">
@@ -183,28 +183,28 @@
<module name="solr-core-tests" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/solr-core" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.8 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.9 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Solrj" type="JUnit" factoryName="JUnit">
<module name="solrj-tests" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/solr-solrj" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.8 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.9 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Solr analysis-extras contrib" type="JUnit" factoryName="JUnit">
<module name="analysis-extras" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-analysis-extras" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.8 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.9 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Solr clustering contrib" type="JUnit" factoryName="JUnit">
<module name="clustering" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-clustering" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.8 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.9 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Solr dataimporthandler contrib" type="JUnit" factoryName="JUnit">
@@ -260,7 +260,7 @@
<module name="uima" />
<option name="TEST_OBJECT" value="package" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-uima" />
- <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.8 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.9 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Solr velocity contrib" type="JUnit" factoryName="JUnit">
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Fri Apr 11 05:59:10 2014
@@ -3,6 +3,12 @@ Lucene Change Log
For more information on past and future Lucene versions, please see:
http://s.apache.org/luceneversions
+======================= Lucene 4.9.0 =======================
+
+New Features
+
+* placeolder
+
======================= Lucene 4.8.0 =======================
System Requirements
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java Fri Apr 11 05:59:10 2014
@@ -97,7 +97,7 @@ public class CreateIndexTask extends Per
public static IndexWriterConfig createWriterConfig(Config config, PerfRunData runData, OpenMode mode, IndexCommit commit) {
// :Post-Release-Update-Version.LUCENE_XY:
- Version version = Version.valueOf(config.get("writer.version", Version.LUCENE_48.toString()));
+ Version version = Version.valueOf(config.get("writer.version", Version.LUCENE_49.toString()));
IndexWriterConfig iwConf = new IndexWriterConfig(version, runData.getAnalyzer());
iwConf.setOpenMode(mode);
IndexDeletionPolicy indexDeletionPolicy = getIndexDeletionPolicy(config);
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java Fri Apr 11 05:59:10 2014
@@ -38,7 +38,7 @@ public class CreateIndexTaskTest extends
private PerfRunData createPerfRunData(String infoStreamValue) throws Exception {
Properties props = new Properties();
// :Post-Release-Update-Version.LUCENE_XY:
- props.setProperty("writer.version", Version.LUCENE_47.toString());
+ props.setProperty("writer.version", Version.LUCENE_49.toString());
props.setProperty("print.props", "false"); // don't print anything
props.setProperty("directory", "RAMDirectory");
if (infoStreamValue != null) {
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Fri Apr 11 05:59:10 2014
@@ -50,8 +50,8 @@
<property name="Name" value="Lucene"/>
<property name="name" value="${ant.project.name}"/>
- <property name="tests.luceneMatchVersion" value="4.8"/>
- <property name="dev.version.base" value="4.8"/>
+ <property name="tests.luceneMatchVersion" value="4.9"/>
+ <property name="dev.version.base" value="4.9"/>
<property name="dev.version.suffix" value="SNAPSHOT"/>
<property name="dev.version" value="${dev.version.base}-${dev.version.suffix}"/>
<property name="version" value="${dev.version}"/>
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java Fri Apr 11 05:59:10 2014
@@ -51,7 +51,7 @@ import org.apache.lucene.util.IOUtils;
* <pre class="prettyprint">
* Directory fsDir = FSDirectory.open(new File("/path/to/index"));
* NRTCachingDirectory cachedFSDir = new NRTCachingDirectory(fsDir, 5.0, 60.0);
- * IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_48, analyzer);
+ * IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_49, analyzer);
* IndexWriter writer = new IndexWriter(cachedFSDir, conf);
* </pre>
*
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java Fri Apr 11 05:59:10 2014
@@ -118,7 +118,7 @@ public final class Constants {
* anything else is not allowed. This is done to prevent people from
* using indexes created with ALPHA/BETA versions with the released version.
*/
- public static final String LUCENE_MAIN_VERSION = ident("4.8");
+ public static final String LUCENE_MAIN_VERSION = ident("4.9");
/**
* This is the Lucene version for display purposes.
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Version.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Version.java?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Version.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Version.java Fri Apr 11 05:59:10 2014
@@ -130,12 +130,19 @@ public enum Version {
@Deprecated
LUCENE_47,
- /** Match settings and bugs in Lucene's 4.8 release.
+ /**
+ * Match settings and bugs in Lucene's 4.8 release.
+ * @deprecated (4.9) Use latest
+ */
+ @Deprecated
+ LUCENE_48,
+
+ /** Match settings and bugs in Lucene's 4.9 release.
* <p>
* Use this to get the latest & greatest settings, bug
* fixes, etc, for Lucene.
*/
- LUCENE_48,
+ LUCENE_49,
/* Add new constants for later versions **here** to respect order! */
Modified: lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java Fri Apr 11 05:59:10 2014
@@ -88,8 +88,8 @@ public class IndexFiles {
Directory dir = FSDirectory.open(new File(indexPath));
// :Post-Release-Update-Version.LUCENE_XY:
- Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_48);
- IndexWriterConfig iwc = new IndexWriterConfig(Version.LUCENE_48, analyzer);
+ Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_49);
+ IndexWriterConfig iwc = new IndexWriterConfig(Version.LUCENE_49, analyzer);
if (create) {
// Create a new index in the directory, removing any
Modified: lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java (original)
+++ lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java Fri Apr 11 05:59:10 2014
@@ -91,7 +91,7 @@ public class SearchFiles {
IndexReader reader = DirectoryReader.open(FSDirectory.open(new File(index)));
IndexSearcher searcher = new IndexSearcher(reader);
// :Post-Release-Update-Version.LUCENE_XY:
- Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_48);
+ Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_49);
BufferedReader in = null;
if (queries != null) {
@@ -100,7 +100,7 @@ public class SearchFiles {
in = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
}
// :Post-Release-Update-Version.LUCENE_XY:
- QueryParser parser = new QueryParser(Version.LUCENE_48, field, analyzer);
+ QueryParser parser = new QueryParser(Version.LUCENE_49, field, analyzer);
while (true) {
if (queries == null && queryString == null) { // prompt the user
System.out.println("Enter query: ");
Modified: lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/facet/FacetExamples.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/facet/FacetExamples.java?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/facet/FacetExamples.java (original)
+++ lucene/dev/branches/branch_4x/lucene/demo/src/java/org/apache/lucene/demo/facet/FacetExamples.java Fri Apr 11 05:59:10 2014
@@ -28,6 +28,6 @@ public interface FacetExamples {
// :Post-Release-Update-Version.LUCENE_XY:
/** The Lucene {@link Version} used by the example code. */
- public static final Version EXAMPLES_VER = Version.LUCENE_48;
+ public static final Version EXAMPLES_VER = Version.LUCENE_49;
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java Fri Apr 11 05:59:10 2014
@@ -286,7 +286,7 @@ public class DirectoryTaxonomyWriter imp
// :Post-Release-Update-Version.LUCENE_XY:
// Make sure we use a MergePolicy which always merges adjacent segments and thus
// keeps the doc IDs ordered as well (this is crucial for the taxonomy index).
- return new IndexWriterConfig(Version.LUCENE_48,
+ return new IndexWriterConfig(Version.LUCENE_49,
null).setOpenMode(openMode).setMergePolicy(
new LogByteSizeMergePolicy());
}
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Fri Apr 11 05:59:10 2014
@@ -343,7 +343,7 @@ public abstract class LuceneTestCase ext
* 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_48;
+ public static final Version TEST_VERSION_CURRENT = Version.LUCENE_49;
/**
* True if and only if tests are run in verbose mode. If this flag is false
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Fri Apr 11 05:59:10 2014
@@ -20,6 +20,26 @@ See the tutorial at http://lucene.apache
$Id$
+================== 4.9.0 ==================
+
+Versions of Major Components
+---------------------
+Apache Tika 1.5
+Carrot2 3.9.0
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.6
+
+Upgrading from Solr 4.8
+----------------------
+
+* placeholder
+
+Detailed Change List
+----------------------
+
+* placeholder
+
================== 4.8.0 ==================
Versions of Major Components
Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/solrconfig.xml Fri Apr 11 05:59:10 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>4.8</luceneMatchVersion>
+ <luceneMatchVersion>4.9</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in
Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Fri Apr 11 05:59:10 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>4.8</luceneMatchVersion>
+ <luceneMatchVersion>4.9</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in
Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Fri Apr 11 05:59:10 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>4.8</luceneMatchVersion>
+ <luceneMatchVersion>4.9</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in
Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml Fri Apr 11 05:59:10 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>4.8</luceneMatchVersion>
+ <luceneMatchVersion>4.9</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in
Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Fri Apr 11 05:59:10 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>4.8</luceneMatchVersion>
+ <luceneMatchVersion>4.9</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in
Modified: lucene/dev/branches/branch_4x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml Fri Apr 11 05:59:10 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>4.8</luceneMatchVersion>
+ <luceneMatchVersion>4.9</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in
Modified: lucene/dev/branches/branch_4x/solr/example/multicore/core0/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/multicore/core0/conf/solrconfig.xml?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/multicore/core0/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/multicore/core0/conf/solrconfig.xml Fri Apr 11 05:59:10 2014
@@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
- <luceneMatchVersion>4.8</luceneMatchVersion>
+ <luceneMatchVersion>4.9</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
Modified: lucene/dev/branches/branch_4x/solr/example/multicore/core1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/multicore/core1/conf/solrconfig.xml?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/multicore/core1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/multicore/core1/conf/solrconfig.xml Fri Apr 11 05:59:10 2014
@@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
- <luceneMatchVersion>4.8</luceneMatchVersion>
+ <luceneMatchVersion>4.9</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml?rev=1586580&r1=1586579&r2=1586580&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml Fri Apr 11 05:59:10 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>4.8</luceneMatchVersion>
+ <luceneMatchVersion>4.9</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in