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:34:05 UTC
lucene-solr:branch_6x: Add next minor version for 6x: 6.4.1
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x ddca27a7c -> 294780666
Add next minor version for 6x: 6.4.1
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/29478066
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/29478066
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/29478066
Branch: refs/heads/branch_6x
Commit: 29478066673e22ab3311893ea8abc08fcb7a8096
Parents: ddca27a
Author: Jim Ferenczi <ji...@elastic.co>
Authored: Sat Jan 14 15:32:34 2017 +0100
Committer: Jim Ferenczi <ji...@elastic.co>
Committed: Sat Jan 14 15:32:34 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/29478066/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 747eea3..99114d8 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.4.1 =======================
+(No Changes)
+
======================= Lucene 6.4.0 =======================
API Changes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29478066/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..f412d9e 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.4.1) Use latest
+ */
+ @Deprecated
+ public static final Version LUCENE_6_4_0 = new Version(6, 4, 0);
+
+ /**
+ * Match settings and bugs in Lucene's 6.4.1 release.
* <p>
* Use this to get the latest & 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_4_1 = new Version(6, 4, 1);
// 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_4_1;
/**
* Constant for backwards compatibility.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29478066/lucene/version.properties
----------------------------------------------------------------------
diff --git a/lucene/version.properties b/lucene/version.properties
index 3d9ae01..7f03051 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.4.1
# Other version property defaults, don't change:
version.suffix=SNAPSHOT
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29478066/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d027f3f..643bad7 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.4.1 ==================
+
+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/29478066/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..4e77351 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.4.1</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/29478066/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..c097cdd 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.4.1</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/29478066/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..e9ca275 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.4.1</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/29478066/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..633cf05 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.4.1</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/29478066/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..847d4e5 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.4.1</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/29478066/solr/example/files/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index a50013b..a99ea20 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.4.1</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/29478066/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..d8a362b 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.4.1</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/29478066/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..860bd77 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.4.1</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/29478066/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..607d965 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.4.1</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
Re: lucene-solr:branch_6x: Add next minor version for 6x: 6.4.1
Posted by jim ferenczi <ji...@gmail.com>.
Done. Thanks for noticing.
2017-01-14 15:45 GMT+01:00 Uwe Schindler <uw...@thetaphi.de>:
> Next version on branch 6.x is 6.5! 6.4.1 would only be created on bugfix
> branch after release.
>
> Please fix.
>
> Uwe
>
> Am 14. Januar 2017 15:34:05 MEZ schrieb jimczi@apache.org:
>>
>> Repository: lucene-solr
>> Updated Branches:
>> refs/heads/branch_6x ddca27a7c -> 294780666
>>
>>
>> Add next minor version for 6x: 6.4.1
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/29478066
>> Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/29478066
>> Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/29478066
>>
>> Branch: refs/heads/branch_6x
>> Commit: 29478066673e22ab3311893ea8abc08fcb7a8096
>> Parents: ddca27a
>> Author: Jim Ferenczi <ji...@elastic.co>
>> Authored: Sat Jan 14 15:32:34 2017 +0100
>> Committer: Jim Ferenczi <ji...@elastic.co>
>> Committed: Sat Jan 14 15:32:34 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/29478066/lucene/CHANGES.txt
>> ------------------------------
>>
>> diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
>> index 747eea3..99114d8 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.4.1 =======================
>> +(No Changes)
>> +
>> ======================= Lucene 6.4.0 =======================
>>
>> API Changes
>>
>> http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29478066/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..f412d9e 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.4.1) Use latest
>> + */
>> + @Deprecated
>> + public static final Version LUCENE_6_4_0 = new Version(6, 4, 0);
>> +
>> + /**
>> + * Match settings and bugs in Lucene's 6.4.1 release.
>> * <p>
>> * Use this to get the latest & 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_4_1 = new Version(6, 4, 1);
>>
>> // 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_4_1;
>>
>> /**
>> * Constant for backwards compatibility.
>>
>> http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29478066/lucene/version.properties
>> ------------------------------
>>
>> diff --git a/lucene/version.properties b/lucene/version.properties
>> index 3d9ae01..7f03051 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.4.1
>>
>> # Other version property defaults, don't change:
>> version.suffix=SNAPSHOT
>>
>> http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29478066/solr/CHANGES.txt
>> ------------------------------
>>
>> diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
>> index d027f3f..643bad7 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.4.1 ==================
>> +
>> +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/29478066/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..4e77351 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.4.1</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/29478066/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..c097cdd 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.4.1</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/29478066/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..e9ca275 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.4.1</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/29478066/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..633cf05 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.4.1</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/29478066/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..847d4e5 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.4.1</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/29478066/solr/example/files/conf/solrconfig.xml
>> ------------------------------
>>
>> diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
>> index a50013b..a99ea20 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.4.1</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/29478066/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..d8a362b 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.4.1</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/29478066/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..860bd77 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.4.1</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/29478066/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..607d965 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.4.1</luceneMatchVersion>
>>
>> <!-- <lib/> directives can be used to instruct Solr to load any Jars
>> identified and use them to resolve any "plugins" specified in
>>
>>
> --
> Uwe Schindler
> Achterdiek 19, 28357 Bremen
> https://www.thetaphi.de
>
Re: lucene-solr:branch_6x: Add next minor version for 6x: 6.4.1
Posted by Uwe Schindler <uw...@thetaphi.de>.
Next version on branch 6.x is 6.5! 6.4.1 would only be created on bugfix branch after release.
Please fix.
Uwe
Am 14. Januar 2017 15:34:05 MEZ schrieb jimczi@apache.org:
>Repository: lucene-solr
>Updated Branches:
> refs/heads/branch_6x ddca27a7c -> 294780666
>
>
>Add next minor version for 6x: 6.4.1
>
>
>Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
>Commit:
>http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/29478066
>Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/29478066
>Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/29478066
>
>Branch: refs/heads/branch_6x
>Commit: 29478066673e22ab3311893ea8abc08fcb7a8096
>Parents: ddca27a
>Author: Jim Ferenczi <ji...@elastic.co>
>Authored: Sat Jan 14 15:32:34 2017 +0100
>Committer: Jim Ferenczi <ji...@elastic.co>
>Committed: Sat Jan 14 15:32:34 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/29478066/lucene/CHANGES.txt
>----------------------------------------------------------------------
>diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
>index 747eea3..99114d8 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.4.1 =======================
>+(No Changes)
>+
> ======================= Lucene 6.4.0 =======================
>
> API Changes
>
>http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29478066/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..f412d9e 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.4.1) Use latest
>+ */
>+ @Deprecated
>+ public static final Version LUCENE_6_4_0 = new Version(6, 4, 0);
>+
>+ /**
>+ * Match settings and bugs in Lucene's 6.4.1 release.
> * <p>
> * Use this to get the latest & 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_4_1 = new Version(6, 4, 1);
>
> // 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_4_1;
>
> /**
> * Constant for backwards compatibility.
>
>http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29478066/lucene/version.properties
>----------------------------------------------------------------------
>diff --git a/lucene/version.properties b/lucene/version.properties
>index 3d9ae01..7f03051 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.4.1
>
> # Other version property defaults, don't change:
> version.suffix=SNAPSHOT
>
>http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/29478066/solr/CHANGES.txt
>----------------------------------------------------------------------
>diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
>index d027f3f..643bad7 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.4.1 ==================
>+
>+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/29478066/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..4e77351 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.4.1</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/29478066/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..c097cdd 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.4.1</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/29478066/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..e9ca275 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.4.1</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/29478066/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..633cf05 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.4.1</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/29478066/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..847d4e5 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.4.1</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/29478066/solr/example/files/conf/solrconfig.xml
>----------------------------------------------------------------------
>diff --git a/solr/example/files/conf/solrconfig.xml
>b/solr/example/files/conf/solrconfig.xml
>index a50013b..a99ea20 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.4.1</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/29478066/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..d8a362b 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.4.1</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/29478066/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..860bd77 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.4.1</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/29478066/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..607d965 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.4.1</luceneMatchVersion>
>
> <!-- <lib/> directives can be used to instruct Solr to load any Jars
> identified and use them to resolve any "plugins" specified in
--
Uwe Schindler
Achterdiek 19, 28357 Bremen
https://www.thetaphi.de