You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ji...@apache.org on 2017/01/14 14:52:28 UTC

lucene-solr:branch_6x: dd next minor version for 6x: 6.5

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 5ed57e53b -> 87508f35c


dd next minor version for 6x: 6.5


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/87508f35
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/87508f35
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/87508f35

Branch: refs/heads/branch_6x
Commit: 87508f35ccb8015ade2b6a38c367380562d785a9
Parents: 5ed57e5
Author: Jim Ferenczi <ji...@elastic.co>
Authored: Sat Jan 14 15:51:48 2017 +0100
Committer: Jim Ferenczi <ji...@elastic.co>
Committed: Sat Jan 14 15:51:48 2017 +0100

----------------------------------------------------------------------
 lucene/CHANGES.txt                                 |  3 +++
 .../src/java/org/apache/lucene/util/Version.java   | 11 +++++++++--
 lucene/version.properties                          |  2 +-
 solr/CHANGES.txt                                   | 17 +++++++++++++++++
 .../example-DIH/solr/db/conf/solrconfig.xml        |  2 +-
 .../example-DIH/solr/mail/conf/solrconfig.xml      |  2 +-
 .../example-DIH/solr/rss/conf/solrconfig.xml       |  2 +-
 .../example-DIH/solr/solr/conf/solrconfig.xml      |  2 +-
 .../example-DIH/solr/tika/conf/solrconfig.xml      |  2 +-
 solr/example/files/conf/solrconfig.xml             |  2 +-
 .../configsets/basic_configs/conf/solrconfig.xml   |  2 +-
 .../data_driven_schema_configs/conf/solrconfig.xml |  2 +-
 .../conf/solrconfig.xml                            |  2 +-
 13 files changed, 39 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 747eea3..15a46c5 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -3,6 +3,9 @@ Lucene Change Log
 For more information on past and future Lucene versions, please see:
 http://s.apache.org/luceneversions
 
+======================= Lucene 6.5.0 =======================
+(No Changes)
+
 ======================= Lucene 6.4.0 =======================
 
 API Changes

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/lucene/core/src/java/org/apache/lucene/util/Version.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/util/Version.java b/lucene/core/src/java/org/apache/lucene/util/Version.java
index 24cd0d6..8d8f334 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Version.java
@@ -166,11 +166,18 @@ public final class Version {
 
   /**
    * Match settings and bugs in Lucene's 6.4.0 release.
+   * @deprecated (6.5.0) Use latest
+   */
+  @Deprecated
+  public static final Version LUCENE_6_4_0 = new Version(6, 4, 0);
+
+  /**
+   * Match settings and bugs in Lucene's 6.5.0 release.
    * <p>
    * Use this to get the latest &amp; greatest settings, bug
    * fixes, etc, for Lucene.
    */
-  public static final Version LUCENE_6_4_0 = new Version(6, 4, 0);
+  public static final Version LUCENE_6_5_0 = new Version(6, 5, 0);
 
   // To add a new version:
   //  * Only add above this comment
@@ -191,7 +198,7 @@ public final class Version {
    * some defaults may have changed and may break functionality 
    * in your application.
    */
-  public static final Version LATEST = LUCENE_6_4_0;
+  public static final Version LATEST = LUCENE_6_5_0;
 
   /**
    * Constant for backwards compatibility.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/lucene/version.properties
----------------------------------------------------------------------
diff --git a/lucene/version.properties b/lucene/version.properties
index 3d9ae01..be68f61 100644
--- a/lucene/version.properties
+++ b/lucene/version.properties
@@ -2,7 +2,7 @@
 
 # RELEASE MANAGER must change this file after creating a release and
 # enter new base version (format "x.y.z", no prefix/appendix): 
-version.base=6.4.0
+version.base=6.5.0
 
 # Other version property defaults, don't change:
 version.suffix=SNAPSHOT

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d027f3f..4a71c28 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -16,6 +16,23 @@ In this release, there is an example Solr server including a bundled
 servlet container in the directory named "example".
 See the Quick Start guide at http://lucene.apache.org/solr/quickstart.html
 
+==================  6.5.0 ==================
+
+Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
+
+Versions of Major Components
+---------------------
+Apache Tika 1.13
+Carrot2 3.15.0
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.6
+Jetty 9.3.14.v20161028
+
+
+(No Changes)
+
+
 ==================  6.4.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/solr/example/example-DIH/solr/db/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
index 8dbc51c..f11e859 100644
--- a/solr/example/example-DIH/solr/db/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
@@ -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>6.4.0</luceneMatchVersion>
+  <luceneMatchVersion>6.5.0</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
index d2c8a36..a9077df 100644
--- a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
@@ -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>6.4.0</luceneMatchVersion>
+  <luceneMatchVersion>6.5.0</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
index 4021b80..78fd8c9 100644
--- a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
@@ -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>6.4.0</luceneMatchVersion>
+  <luceneMatchVersion>6.5.0</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
index b9f83e3..8245d99 100644
--- a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
@@ -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>6.4.0</luceneMatchVersion>
+  <luceneMatchVersion>6.5.0</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
index 12e6eea..8fb9614 100644
--- a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
@@ -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>6.4.0</luceneMatchVersion>
+  <luceneMatchVersion>6.5.0</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/solr/example/files/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index a50013b..914003a 100644
--- a/solr/example/files/conf/solrconfig.xml
+++ b/solr/example/files/conf/solrconfig.xml
@@ -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>6.4.0</luceneMatchVersion>
+  <luceneMatchVersion>6.5.0</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
index 0a50222..ea68970 100644
--- a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
@@ -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>6.4.0</luceneMatchVersion>
+  <luceneMatchVersion>6.5.0</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
index 8537747..08c15b9 100644
--- a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
@@ -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>6.4.0</luceneMatchVersion>
+  <luceneMatchVersion>6.5.0</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87508f35/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index d1f6111..48ccc76 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -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>6.4.0</luceneMatchVersion>
+  <luceneMatchVersion>6.5.0</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in