You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2021/03/10 10:09:11 UTC
[lucene] branch branch_6_5 created (now 7231911)
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a change to branch branch_6_5
in repository https://gitbox.apache.org/repos/asf/lucene.git.
at 7231911 LUCENE-7794: buildAndPushRelease.py should run validate and documentation-lint
This branch includes the following new commits:
new db86dda update doap files with Lucene / Solr 6.5.1 release
new 1b18baf Add version 6.5.2
new 88fdc91 Add 6.5.1 back compat test indexes
new 2cf5b34 LUCENE-7793: smokeTestRelease.py should run documentation-lint
new 7231911 LUCENE-7794: buildAndPushRelease.py should run validate and documentation-lint
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[lucene] 05/05: LUCENE-7794: buildAndPushRelease.py should run
validate and documentation-lint
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch branch_6_5
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 72319115a4ed5a3deb1a887b5b126a2e9ce12f87
Author: Steve Rowe <sa...@apache.org>
AuthorDate: Fri Apr 28 10:14:38 2017 -0400
LUCENE-7794: buildAndPushRelease.py should run validate and documentation-lint
---
dev-tools/scripts/buildAndPushRelease.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py
index 57f093b..7044e43 100644
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -97,8 +97,8 @@ def prepare(root, version, gpgKeyID, gpgPassword):
print(' Check DOAP files')
checkDOAPfiles(version)
- print(' ant clean test')
- run('ant clean test')
+ print(' ant clean test validate documentation-lint')
+ run('ant clean test validate documentation-lint')
open('rev.txt', mode='wb').write(rev.encode('UTF-8'))
[lucene] 02/05: Add version 6.5.2
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch branch_6_5
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 1b18baf30e9c390c474941ae9bb55cf5a216414f
Author: Jim Ferenczi <ji...@apache.org>
AuthorDate: Thu Apr 27 13:41:39 2017 +0200
Add version 6.5.2
---
lucene/CHANGES.txt | 3 +++
.../core/src/java/org/apache/lucene/util/Version.java | 11 +++++++++--
lucene/version.properties | 2 +-
solr/CHANGES.txt | 17 +++++++++++++++++
solr/example/example-DIH/solr/db/conf/solrconfig.xml | 2 +-
solr/example/example-DIH/solr/mail/conf/solrconfig.xml | 2 +-
solr/example/example-DIH/solr/rss/conf/solrconfig.xml | 2 +-
solr/example/example-DIH/solr/solr/conf/solrconfig.xml | 2 +-
solr/example/example-DIH/solr/tika/conf/solrconfig.xml | 2 +-
solr/example/files/conf/solrconfig.xml | 2 +-
.../solr/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, 39 insertions(+), 12 deletions(-)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 710d744..16768e7 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.2 =======================
+(No Changes)
+
======================= Lucene 6.5.1 =======================
Bug Fixes
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 4565b39..b5cda0b 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Version.java
@@ -201,11 +201,18 @@ public final class Version {
/**
* Match settings and bugs in Lucene's 6.5.1 release.
+ * @deprecated (6.5.2) Use latest
+ */
+ @Deprecated
+ public static final Version LUCENE_6_5_1 = new Version(6, 5, 1);
+
+ /**
+ * Match settings and bugs in Lucene's 6.5.2 release.
* <p>
* Use this to get the latest & greatest settings, bug
* fixes, etc, for Lucene.
*/
- public static final Version LUCENE_6_5_1 = new Version(6, 5, 1);
+ public static final Version LUCENE_6_5_2 = new Version(6, 5, 2);
// To add a new version:
// * Only add above this comment
@@ -226,7 +233,7 @@ public final class Version {
* some defaults may have changed and may break functionality
* in your application.
*/
- public static final Version LATEST = LUCENE_6_5_1;
+ public static final Version LATEST = LUCENE_6_5_2;
/**
* Constant for backwards compatibility.
diff --git a/lucene/version.properties b/lucene/version.properties
index 7bdabfd..286fac8 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.5.1
+version.base=6.5.2
# Other version property defaults, don't change:
version.suffix=SNAPSHOT
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 108f52f..be66152 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.2 ==================
+
+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.5.1 ==================
Bug Fixes
diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
index 07ca175..fa1d8ac 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.5.1</luceneMatchVersion>
+ <luceneMatchVersion>6.5.2</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
index 05879cb..8340303 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.5.1</luceneMatchVersion>
+ <luceneMatchVersion>6.5.2</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
index dfc994c..8cad561 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.5.1</luceneMatchVersion>
+ <luceneMatchVersion>6.5.2</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
index 2f1541e..3dee2d1 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.5.1</luceneMatchVersion>
+ <luceneMatchVersion>6.5.2</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
index a13f4fa..e8644f4 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.5.1</luceneMatchVersion>
+ <luceneMatchVersion>6.5.2</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index fac437c..8bdb9e9 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.5.1</luceneMatchVersion>
+ <luceneMatchVersion>6.5.2</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
index 255fe02..45ff0f6 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.5.1</luceneMatchVersion>
+ <luceneMatchVersion>6.5.2</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
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 948fcfe..030bb3a 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.5.1</luceneMatchVersion>
+ <luceneMatchVersion>6.5.2</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
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 5d1cd56..8c3e942 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.5.1</luceneMatchVersion>
+ <luceneMatchVersion>6.5.2</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
[lucene] 04/05: LUCENE-7793: smokeTestRelease.py should run
documentation-lint
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch branch_6_5
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 2cf5b3442530e845fc5e0d554788173f61af746e
Author: Steve Rowe <sa...@apache.org>
AuthorDate: Fri Apr 28 09:58:02 2017 -0400
LUCENE-7793: smokeTestRelease.py should run documentation-lint
---
dev-tools/scripts/smokeTestRelease.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index f6edc3e..c654654 100644
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -708,8 +708,10 @@ def verifyUnpacked(java, project, artifact, unpackPath, gitRevision, version, te
print(' %s' % line.strip())
raise RuntimeError('source release has WARs...')
- print(' run "ant validate"')
- java.run_java8('ant validate', '%s/validate.log' % unpackPath)
+ # Can't run documentation-lint in lucene src, because dev-tools is missing
+ validateCmd = 'ant validate' if project == 'lucene' else 'ant validate documentation-lint';
+ print(' run "%s"' % validateCmd)
+ java.run_java8(validateCmd, '%s/validate.log' % unpackPath)
if project == 'lucene':
print(" run tests w/ Java 8 and testArgs='%s'..." % testArgs)
[lucene] 01/05: update doap files with Lucene / Solr 6.5.1 release
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch branch_6_5
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit db86dda24d06f9bd9f33219a2b16a93346eb32ff
Author: Jim Ferenczi <ji...@apache.org>
AuthorDate: Thu Apr 27 13:06:39 2017 +0200
update doap files with Lucene / Solr 6.5.1 release
---
dev-tools/doap/lucene.rdf | 7 +++++++
dev-tools/doap/solr.rdf | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/dev-tools/doap/lucene.rdf b/dev-tools/doap/lucene.rdf
index 64be110..e47eaf3 100644
--- a/dev-tools/doap/lucene.rdf
+++ b/dev-tools/doap/lucene.rdf
@@ -68,6 +68,13 @@
<release>
<Version>
+ <name>lucene-6.5.1</name>
+ <created>2017-04-27</created>
+ <revision>6.5.1</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
<name>lucene-6.5.0</name>
<created>2017-03-27</created>
<revision>6.5.0</revision>
diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdf
index b351d89..eb92a96 100644
--- a/dev-tools/doap/solr.rdf
+++ b/dev-tools/doap/solr.rdf
@@ -68,6 +68,13 @@
<release>
<Version>
+ <name>solr-6.5.1</name>
+ <created>2017-04-27</created>
+ <revision>6.5.1</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
<name>solr-6.5.0</name>
<created>2017-03-27</created>
<revision>6.5.0</revision>
[lucene] 03/05: Add 6.5.1 back compat test indexes
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch branch_6_5
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 88fdc91c288adf65860fb52f70d7aafbaeb0163c
Author: Jim Ferenczi <ji...@apache.org>
AuthorDate: Thu Apr 27 13:46:32 2017 +0200
Add 6.5.1 back compat test indexes
---
.../apache/lucene/index/TestBackwardsCompatibility.java | 4 +++-
.../test/org/apache/lucene/index/index.6.5.1-cfs.zip | Bin 0 -> 15824 bytes
.../test/org/apache/lucene/index/index.6.5.1-nocfs.zip | Bin 0 -> 15842 bytes
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
index cc11338..ca2df16 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
@@ -327,7 +327,9 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
"6.4.2-cfs",
"6.4.2-nocfs",
"6.5.0-cfs",
- "6.5.0-nocfs"
+ "6.5.0-nocfs",
+ "6.5.1-cfs",
+ "6.5.1-nocfs"
};
final String[] unsupportedNames = {
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.5.1-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.5.1-cfs.zip
new file mode 100644
index 0000000..5bac404
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.5.1-cfs.zip differ
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.5.1-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.5.1-nocfs.zip
new file mode 100644
index 0000000..4aa7a90
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.5.1-nocfs.zip differ