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 2016/06/08 12:34:27 UTC
[1/2] lucene-solr:branch_6x: Add Version.LUCENE_6_2_0.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 3a57beaa9 -> e49561668
refs/heads/master 73045a4cd -> 18ac2978a
Add Version.LUCENE_6_2_0.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e4956166
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e4956166
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e4956166
Branch: refs/heads/branch_6x
Commit: e495616686fc3ff90bee5beffbc9a8a26b9e9580
Parents: 3a57bea
Author: Adrien Grand <jp...@gmail.com>
Authored: Wed Jun 8 14:31:40 2016 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Wed Jun 8 14:31:40 2016 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
.../src/java/org/apache/lucene/util/Version.java | 15 +++++++++++----
lucene/version.properties | 2 +-
solr/CHANGES.txt | 3 +++
solr/example/example-DIH/solr/db/conf/solrconfig.xml | 2 +-
.../example-DIH/solr/mail/conf/solrconfig.xml | 2 +-
.../example/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 +-
.../sample_techproducts_configs/conf/solrconfig.xml | 2 +-
13 files changed, 27 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e4956166/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index fd4f10f..94b1147 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.2.0 =======================
+(No Changes)
+
======================= Lucene 6.1.0 =======================
New Features
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e4956166/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 efc5daf..50cc01a 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Version.java
@@ -124,12 +124,19 @@ public final class Version {
/**
* Match settings and bugs in Lucene's 6.1.0 release.
- * <p>
- * Use this to get the latest & greatest settings, bug
- * fixes, etc, for Lucene.
+ * @deprecated (6.2.0) Use latest
*/
+ @Deprecated
public static final Version LUCENE_6_1_0 = new Version(6, 1, 0);
+ /**
+ * Match settings and bugs in Lucene's 6.2.0 release.
+ * <p>
+ * Use this to get the latest & greatest settings, bug
+ * fixes, etc, for Lucene.
+ */
+ public static final Version LUCENE_6_2_0 = new Version(6, 2, 0);
+
// To add a new version:
// * Only add above this comment
// * If the new version is the newest, change LATEST below and deprecate the previous LATEST
@@ -149,7 +156,7 @@ public final class Version {
* some defaults may have changed and may break functionality
* in your application.
*/
- public static final Version LATEST = LUCENE_6_1_0;
+ public static final Version LATEST = LUCENE_6_2_0;
/**
* Constant for backwards compatibility.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e4956166/lucene/version.properties
----------------------------------------------------------------------
diff --git a/lucene/version.properties b/lucene/version.properties
index 0e06ecb..d3ce4ad 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.1.0
+version.base=6.2.0
# Other version property defaults, don't change:
version.suffix=SNAPSHOT
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e4956166/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c14112e..5acf1ef 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -16,6 +16,9 @@ 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.2.0 ==================
+(No Changes)
+
================== 6.1.0 ==================
Upgrading from Solr any prior release
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e4956166/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 0a4c6ea..40fb3c1 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.1.0</luceneMatchVersion>
+ <luceneMatchVersion>6.2.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/e4956166/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 1cf7d89..ea548d6 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.1.0</luceneMatchVersion>
+ <luceneMatchVersion>6.2.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/e4956166/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 8db8e55..43501e1 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.1.0</luceneMatchVersion>
+ <luceneMatchVersion>6.2.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/e4956166/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 318fbf8..824be64 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.1.0</luceneMatchVersion>
+ <luceneMatchVersion>6.2.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/e4956166/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 6894298..ffd1e25 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.1.0</luceneMatchVersion>
+ <luceneMatchVersion>6.2.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/e4956166/solr/example/files/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index 7aa682a..8e045b4 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.1.0</luceneMatchVersion>
+ <luceneMatchVersion>6.2.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/e4956166/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 a4c00b2..069a4ee 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.1.0</luceneMatchVersion>
+ <luceneMatchVersion>6.2.0</luceneMatchVersion>
<!-- Data Directory
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e4956166/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 bd58d36..3b00d1c 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.1.0</luceneMatchVersion>
+ <luceneMatchVersion>6.2.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/e4956166/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 be3c16f..5334fa2 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.1.0</luceneMatchVersion>
+ <luceneMatchVersion>6.2.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
[2/2] lucene-solr:master: Add Version.LUCENE_6_2_0.
Posted by jp...@apache.org.
Add Version.LUCENE_6_2_0.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/18ac2978
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/18ac2978
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/18ac2978
Branch: refs/heads/master
Commit: 18ac2978a91451356f46dc4e614f35f981ff36ee
Parents: 73045a4
Author: Adrien Grand <jp...@gmail.com>
Authored: Wed Jun 8 14:33:49 2016 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Wed Jun 8 14:33:49 2016 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
lucene/core/src/java/org/apache/lucene/util/Version.java | 7 +++++++
solr/CHANGES.txt | 3 +++
3 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18ac2978/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index bd79c37..143067d 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -6,6 +6,9 @@ http://s.apache.org/luceneversions
======================= Lucene 7.0.0 =======================
(No Changes)
+======================= Lucene 6.2.0 =======================
+(No Changes)
+
======================= Lucene 6.1.0 =======================
New Features
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18ac2978/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 d5640d8..3bd817e 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Version.java
@@ -53,6 +53,13 @@ public final class Version {
public static final Version LUCENE_6_1_0 = new Version(6, 1, 0);
/**
+ * Match settings and bugs in Lucene's 6.2.0 release.
+ * @deprecated Use latest
+ */
+ @Deprecated
+ public static final Version LUCENE_6_2_0 = new Version(6, 2, 0);
+
+ /**
* Match settings and bugs in Lucene's 7.0.0 release.
* <p>
* Use this to get the latest & greatest settings, bug
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18ac2978/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bed02f2..6cd982f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -45,6 +45,9 @@ Optimizations
check on every request and move connection lifecycle management towards the client.
(Ryan Zezeski, Mark Miller, Shawn Heisey, Steve Davids)
+================== 6.2.0 ==================
+(No Changes)
+
================== 6.1.0 ==================
Upgrading from Solr any prior release