opendev/gerrit
Code Issues Proposed changes

Update Lucene to version 4.10.2

Browse Source 
Version 4.10.2 includes a couple of bug fixes [1], but these are not
necessarily needed by Gerrit.

This update is needed because Elasticsearch 1.4.0 has a dependency
on this version [2].

There is no change in the index format since 4.10.1 so we reuse the
same version number for the Lucene backed change index.

[1] http://lucene.apache.org/core/4_10_2/changes/Changes.html#v4.10.2.bug_fixes
[2] http://mvnrepository.com/artifact/org.elasticsearch/elasticsearch/1.4.0

Change-Id: Ie47dd2238493da44659c73c7f97f0caa2f7fdfa4
This commit is contained in:
David Pursehouse
2014-11-13 17:54:11 +09:00
parent 99c6c1fd32
commit 9ac0746423
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
View File

@@ -144,6 +144,10 @@ public class LuceneChangeIndex implements ChangeIndex {
Version lucene48 = Version.LUCENE_48; Version lucene48 = Version.LUCENE_48;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
Version lucene410 = Version.LUCENE_4_10_0; Version lucene410 = Version.LUCENE_4_10_0;
// We are using 4.10.2 but there is no difference in the index
// format since 4.10.1, so we reuse the version here.
@SuppressWarnings("deprecation")
Version lucene4101 = Version.LUCENE_4_10_1;
for (Map.Entry<Integer, Schema<ChangeData>> e for (Map.Entry<Integer, Schema<ChangeData>> e
: ChangeSchemas.ALL.entrySet()) { : ChangeSchemas.ALL.entrySet()) {
if (e.getKey() <= 3) { if (e.getKey() <= 3) {
@@ -159,7 +163,7 @@ public class LuceneChangeIndex implements ChangeIndex {
} else if (e.getKey() <= 13) { } else if (e.getKey() <= 13) {
versions.put(e.getValue(), lucene410); versions.put(e.getValue(), lucene410);
} else { } else {
versions.put(e.getValue(), Version.LUCENE_4_10_1); versions.put(e.getValue(), lucene4101);
} }
} }
LUCENE_VERSIONS = versions.build(); LUCENE_VERSIONS = versions.build();

1
lib/asciidoctor/java/DocIndexer.java
View File

@@ -51,6 +51,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
public class DocIndexer { public class DocIndexer {
@SuppressWarnings("deprecation")
private static final Version LUCENE_VERSION = Version.LUCENE_4_10_1; private static final Version LUCENE_VERSION = Version.LUCENE_4_10_1;
private static final Pattern SECTION_HEADER = Pattern.compile("^=+ (.*)"); private static final Pattern SECTION_HEADER = Pattern.compile("^=+ (.*)");

8
lib/lucene/BUCK
View File

@@ -1,11 +1,11 @@
include_defs('//lib/maven.defs') include_defs('//lib/maven.defs')
VERSION = '4.10.1' VERSION = '4.10.2'
maven_jar( maven_jar(
name = 'core', name = 'core',
id = 'org.apache.lucene:lucene-core:' + VERSION, id = 'org.apache.lucene:lucene-core:' + VERSION,
sha1 = '4ff28101d9de465b7f3cf59d7bc2892c1c118b4b', sha1 = 'c01e3d675d277e0a93e7890d03cc3246b2cdecaa',
license = 'Apache2.0', license = 'Apache2.0',
exclude = [ exclude = [
'META-INF/LICENSE.txt', 'META-INF/LICENSE.txt',
@@ -16,7 +16,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'analyzers-common', name = 'analyzers-common',
id = 'org.apache.lucene:lucene-analyzers-common:' + VERSION, id = 'org.apache.lucene:lucene-analyzers-common:' + VERSION,
sha1 = '6491c6019c32e7c4f7674f238d5beaa84d3108a6', sha1 = 'f977f8c443e8f4e9d1fd7fdfda80a6cf60b3e7c2',
license = 'Apache2.0', license = 'Apache2.0',
exclude = [ exclude = [
'META-INF/LICENSE.txt', 'META-INF/LICENSE.txt',
@@ -27,6 +27,6 @@ maven_jar(
maven_jar( maven_jar(
name = 'query-parser', name = 'query-parser',
id = 'org.apache.lucene:lucene-queryparser:' + VERSION, id = 'org.apache.lucene:lucene-queryparser:' + VERSION,
sha1 = '0174ffd89d5289037ae24759f38111285b98636d', sha1 = 'd70f54e1060d553ba7aeb4d49a71fd0c068499e8',
license = 'Apache2.0', license = 'Apache2.0',
) )