lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1625980 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/core/ lucene/core/src/java/org/apache/lucene/codecs/lucene46/ lucene/core/src/java/org/apache/lucene/util/ lucene/core/src/test/org/apache/lucene/index/ solr/ solr/example/ sol...
Date Thu, 18 Sep 2014 13:55:23 GMT
Author: uschindler
Date: Thu Sep 18 13:55:22 2014
New Revision: 1625980

URL: http://svn.apache.org/r1625980
Log:
LUCENE-5944: Bump version in branch_5x

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/lucene/core/   (props changed)
    lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java
    lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Version.java
    lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
    lucene/dev/branches/branch_5x/lucene/version.properties   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/example/   (props changed)
    lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
    lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
    lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
    lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
    lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
    lucene/dev/branches/branch_5x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
    lucene/dev/branches/branch_5x/solr/example/multicore/core0/conf/solrconfig.xml
    lucene/dev/branches/branch_5x/solr/example/multicore/core1/conf/solrconfig.xml
    lucene/dev/branches/branch_5x/solr/example/solr/collection1/conf/solrconfig.xml

Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Thu Sep 18 13:55:22 2014
@@ -3,7 +3,7 @@ Lucene Change Log
 For more information on past and future Lucene versions, please see:
 http://s.apache.org/luceneversions
 
-======================= Lucene 4.11.0 ======================
+======================= Lucene 5.0.0 ======================
 
 New Features
 

Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java
(original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java
Thu Sep 18 13:55:22 2014
@@ -54,8 +54,8 @@ public class Lucene46SegmentInfoWriter e
     try {
       CodecUtil.writeHeader(output, Lucene46SegmentInfoFormat.CODEC_NAME, Lucene46SegmentInfoFormat.VERSION_CURRENT);
       Version version = si.getVersion();
-      if (version.major < 3 || version.major > 4) {
-        throw new IllegalArgumentException("invalid major version: should be 3 or 4 but got:
" + version.major + " segment=" + si);
+      if (version.major < 3) {
+        throw new IllegalArgumentException("invalid major version: should be >= 3 but
got: " + version.major + " segment=" + si);
       }
       // Write the Lucene version that created this segment, since 3.1
       output.writeString(version.toString());

Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Version.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Version.java?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Version.java
(original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/Version.java
Thu Sep 18 13:55:22 2014
@@ -221,9 +221,9 @@ public final class Version {
   public static final Version LUCENE_4_10_0 = new Version(4, 10, 0);
 
   /**
-   * Match settings and bugs in Lucene's 4.11.0 release.
+   * Match settings and bugs in Lucene's 5.0 release.
    */
-  public static final Version LUCENE_4_11_0 = new Version(4, 11, 0);
+  public static final Version LUCENE_5_0_0 = new Version(5, 0, 0);
 
   // To add a new version:
   //  * Only add above this comment
@@ -244,7 +244,7 @@ public final class Version {
    * some defaults may have changed and may break functionality 
    * in your application.
    */
-  public static final Version LATEST = LUCENE_4_11_0;
+  public static final Version LATEST = LUCENE_5_0_0;
 
   /**
    * Constant for backwards compatibility.
@@ -474,8 +474,8 @@ public final class Version {
     this.minor = minor;
     this.bugfix = bugfix;
     this.prerelease = prerelease;
-    if (major > 4 || major < 3) {
-      throw new IllegalArgumentException("Lucene 4.x only supports 4.x and 3.x versions");
+    if (major > 5 || major < 3) { // TODO: fix this when removal of 3.x was backported
+      throw new IllegalArgumentException("Lucene 5.x only supports 5.x, 4.x, and 3.x versions");
     }
     if (minor > 255 | minor < 0) {
       throw new IllegalArgumentException("Illegal minor version: " + minor);

Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
(original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
Thu Sep 18 13:55:22 2014
@@ -336,12 +336,14 @@ public class TestBackwardsCompatibility 
         expectedVersions.add(major + minor + bugfix + prerelease + ".cfs");
       }
     }
+    /* TODO: Add this back after 5.0.0 - how can this be handled better?
     if (Version.LATEST.minor == 0 && Version.LATEST.bugfix == 0 && Version.LATEST.prerelease
== 0) {
       // we are on trunk (latest is a first major release) so the last minor index
       // for the previous major version is also not yet tested
       assertNotNull(lastPrevMajorVersion);
       expectedVersions.remove(lastPrevMinorIndex);
     }
+    */
     Collections.sort(expectedVersions);
 
     // find what versions we are testing

Modified: lucene/dev/branches/branch_5x/lucene/version.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/version.properties?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/version.properties (original)
+++ lucene/dev/branches/branch_5x/lucene/version.properties Thu Sep 18 13:55:22 2014
@@ -2,7 +2,7 @@
 
 # RELEAE MANAGER must change this file after creating a release and
 # enter new base version (format "x.y.z", no prefix/appendix): 
-version.base=4.11.0
+version.base=5.0.0
 
 # Other version property defaults, don't change:
 version.suffix=SNAPSHOT

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Thu Sep 18 13:55:22 2014
@@ -17,7 +17,7 @@ In this release, there is an example Sol
 servlet container in the directory named "example".
 See the tutorial at http://lucene.apache.org/solr/tutorial.html
 
-==================  4.11.0 =================
+==================  5.0.0 =================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
 

Modified: lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/db/conf/solrconfig.xml Thu
Sep 18 13:55:22 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.11.0</luceneMatchVersion>
+  <luceneMatchVersion>5.0.0</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/branch_5x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Thu
Sep 18 13:55:22 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.11.0</luceneMatchVersion>
+  <luceneMatchVersion>5.0.0</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/branch_5x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Thu
Sep 18 13:55:22 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.11.0</luceneMatchVersion>
+  <luceneMatchVersion>5.0.0</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/branch_5x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml Thu
Sep 18 13:55:22 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.11.0</luceneMatchVersion>
+  <luceneMatchVersion>5.0.0</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/branch_5x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Thu
Sep 18 13:55:22 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.11.0</luceneMatchVersion>
+  <luceneMatchVersion>5.0.0</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/branch_5x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
(original)
+++ lucene/dev/branches/branch_5x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
Thu Sep 18 13:55:22 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.11.0</luceneMatchVersion>
+  <luceneMatchVersion>5.0.0</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/branch_5x/solr/example/multicore/core0/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/multicore/core0/conf/solrconfig.xml?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/multicore/core0/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/example/multicore/core0/conf/solrconfig.xml Thu Sep
18 13:55:22 2014
@@ -21,7 +21,7 @@
  It is *not* a good example to work from. 
 -->
 <config>
-  <luceneMatchVersion>4.11.0</luceneMatchVersion>
+  <luceneMatchVersion>5.0.0</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_5x/solr/example/multicore/core1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/multicore/core1/conf/solrconfig.xml?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/multicore/core1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/example/multicore/core1/conf/solrconfig.xml Thu Sep
18 13:55:22 2014
@@ -21,7 +21,7 @@
  It is *not* a good example to work from. 
 -->
 <config>
-  <luceneMatchVersion>4.11.0</luceneMatchVersion>
+  <luceneMatchVersion>5.0.0</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_5x/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/solr/collection1/conf/solrconfig.xml?rev=1625980&r1=1625979&r2=1625980&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/example/solr/collection1/conf/solrconfig.xml Thu Sep
18 13:55:22 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.11.0</luceneMatchVersion>
+  <luceneMatchVersion>5.0.0</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in



Mime
View raw message