You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2013/09/12 12:07:58 UTC
svn commit: r1522513 - in /lucene/dev/branches/branch_4x: ./
dev-tools/idea/.idea/ dev-tools/maven/ lucene/ lucene/core/
lucene/core/src/java/org/apache/lucene/util/
lucene/test-framework/src/java/org/apache/lucene/util/ solr/
Author: jpountz
Date: Thu Sep 12 10:07:58 2013
New Revision: 1522513
URL: http://svn.apache.org/r1522513
Log:
Update latest version to 4.6.
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/dev-tools/maven/pom.xml.template
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
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/util/Constants.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Version.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
Modified: lucene/dev/branches/branch_4x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/build.xml?rev=1522513&r1=1522512&r2=1522513&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/build.xml (original)
+++ lucene/dev/branches/branch_4x/build.xml Thu Sep 12 10:07:58 2013
@@ -132,7 +132,7 @@
</subant>
</target>
- <property name="version" value="4.5-SNAPSHOT"/>
+ <property name="version" value="4.6-SNAPSHOT"/>
<property name="maven-build-dir" value="maven-build"/>
<property name="maven-version" value="2.2.1"/>
@@ -280,7 +280,7 @@
<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.5.0"/> <!-- *not* -SNAPSHOT, the real version -->
+ <property name="fakeReleaseVersion" value="4.6.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=1522513&r1=1522512&r2=1522513&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 Thu Sep 12 10:07:58 2013
@@ -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.5-SNAPSHOT -DtempDir=temp" />
+ <option name="VM_PARAMETERS" value="-Xmx256m -ea -Dlucene.version=4.6-SNAPSHOT -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="Module analyzers-common" type="JUnit" factoryName="JUnit">
@@ -176,28 +176,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.5 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.6 -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.5 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.6 -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.5 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.6 -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.5 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.6 -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">
@@ -232,7 +232,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.5 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+ <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.6 -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/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template?rev=1522513&r1=1522512&r2=1522513&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template Thu Sep 12 10:07:58 2013
@@ -41,7 +41,7 @@
<vc-anonymous-base-url>http://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x</vc-anonymous-base-url>
<vc-dev-base-url>https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x</vc-dev-base-url>
<vc-browse-base-url>http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x</vc-browse-base-url>
- <base.specification.version>4.5.0</base.specification.version>
+ <base.specification.version>4.6.0</base.specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>1.6</java.compat.version>
<jetty.version>8.1.10.v20130312</jetty.version>
@@ -65,7 +65,7 @@
<tests.codec>random</tests.codec>
<tests.directory>random</tests.directory>
<tests.locale>random</tests.locale>
- <tests.luceneMatchVersion>4.5</tests.luceneMatchVersion>
+ <tests.luceneMatchVersion>4.6</tests.luceneMatchVersion>
<tests.multiplier>1</tests.multiplier>
<tests.nightly>false</tests.nightly>
<tests.postingsformat>random</tests.postingsformat>
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1522513&r1=1522512&r2=1522513&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Thu Sep 12 10:07:58 2013
@@ -3,6 +3,9 @@ Lucene Change Log
For more information on past and future Lucene versions, please see:
http://s.apache.org/luceneversions
+======================= Lucene 4.6.0 =======================
+
+
======================= Lucene 4.5.0 =======================
New features
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=1522513&r1=1522512&r2=1522513&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Thu Sep 12 10:07:58 2013
@@ -50,8 +50,8 @@
<property name="Name" value="Lucene"/>
<property name="name" value="${ant.project.name}"/>
- <property name="tests.luceneMatchVersion" value="4.5"/>
- <property name="dev.version.base" value="4.5"/>
+ <property name="tests.luceneMatchVersion" value="4.6"/>
+ <property name="dev.version.base" value="4.6"/>
<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/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=1522513&r1=1522512&r2=1522513&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 Thu Sep 12 10:07:58 2013
@@ -124,7 +124,7 @@ public final class Constants {
/**
* This is the internal Lucene version, recorded into each segment.
*/
- public static final String LUCENE_MAIN_VERSION = ident("4.5");
+ public static final String LUCENE_MAIN_VERSION = ident("4.6");
/**
* 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=1522513&r1=1522512&r2=1522513&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 Thu Sep 12 10:07:58 2013
@@ -29,9 +29,6 @@ import java.util.Locale;
* change the version at search-time, but instead also adjust
* your indexing code to match, and re-index.
*/
-// remove me when java 5 is no longer supported
-// this is a workaround for a JDK bug that wrongly emits a warning.
-@SuppressWarnings("dep-ann")
public enum Version {
/**
* Match settings and bugs in Lucene's 3.0 release.
@@ -108,19 +105,25 @@ public enum Version {
LUCENE_43,
/** Match settings and bugs in Lucene's 4.4 release.
- * <p>
- * Use this to get the latest & greatest settings, bug
- * fixes, etc, for Lucene.
+ * @deprecated (4.5) Use latest
*/
@Deprecated
LUCENE_44,
- /** Match settings and bugs in Lucene's 4.5 release.
+ /**
+ * Match settings and bugs in Lucene's 4.5 release.
+ * @deprecated (4.6) Use latest
+ */
+ @Deprecated
+ LUCENE_45,
+
+
+ /** Match settings and bugs in Lucene's 4.6 release.
* <p>
* Use this to get the latest & greatest settings, bug
* fixes, etc, for Lucene.
*/
- LUCENE_45,
+ LUCENE_46,
/* Add new constants for later versions **here** to respect order! */
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=1522513&r1=1522512&r2=1522513&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 Thu Sep 12 10:07:58 2013
@@ -234,7 +234,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_45;
+ public static final Version TEST_VERSION_CURRENT = Version.LUCENE_46;
/**
* 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=1522513&r1=1522512&r2=1522513&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Thu Sep 12 10:07:58 2013
@@ -20,6 +20,16 @@ See the tutorial at http://lucene.apache
$Id$
+================== 4.6.0 ==================
+
+Versions of Major Components
+---------------------
+Apache Tika 1.4
+Carrot2 3.8.0
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.5
+
================== 4.5.0 ==================
Versions of Major Components