Merge "Merge branch 'stable-3.6'"
diff --git a/java/com/google/gerrit/index/project/ProjectSchemaDefinitions.java b/java/com/google/gerrit/index/project/ProjectSchemaDefinitions.java
index 3cc5f9b..52955d3 100644
--- a/java/com/google/gerrit/index/project/ProjectSchemaDefinitions.java
+++ b/java/com/google/gerrit/index/project/ProjectSchemaDefinitions.java
@@ -38,7 +38,10 @@
@Deprecated static final Schema<ProjectData> V3 = schema(V2);
// Lucene index was changed to add an additional field for sorting.
- static final Schema<ProjectData> V4 = schema(V3);
+ @Deprecated static final Schema<ProjectData> V4 = schema(V3);
+
+ // Upgrade Lucene to 7.x requires reindexing.
+ static final Schema<ProjectData> V5 = schema(V4);
/**
* Name of the project index to be used when contacting index backends or loading configurations.
diff --git a/java/com/google/gerrit/server/index/account/AccountSchemaDefinitions.java b/java/com/google/gerrit/server/index/account/AccountSchemaDefinitions.java
index 7029d10..2e75d46 100644
--- a/java/com/google/gerrit/server/index/account/AccountSchemaDefinitions.java
+++ b/java/com/google/gerrit/server/index/account/AccountSchemaDefinitions.java
@@ -58,7 +58,7 @@
.add(AccountField.ID_STR)
.build();
- // Bump Lucene version requires reindexing
+ // Upgrade Lucene to 7.x requires reindexing.
static final Schema<AccountState> V12 = schema(V11);
/**
diff --git a/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java b/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java
index aa08069..ec1506d 100644
--- a/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java
+++ b/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java
@@ -118,9 +118,13 @@
new Schema.Builder<ChangeData>().add(V75).add(ChangeField.FOOTER_NAME).build();
/** Added new field {@link ChangeField#COMMIT_MESSAGE_EXACT}. */
+ @Deprecated
static final Schema<ChangeData> V77 =
new Schema.Builder<ChangeData>().add(V76).add(ChangeField.COMMIT_MESSAGE_EXACT).build();
+ // Upgrade Lucene to 7.x requires reindexing.
+ static final Schema<ChangeData> V78 = schema(V77);
+
/**
* Name of the change index to be used when contacting index backends or loading configurations.
*/
diff --git a/java/com/google/gerrit/server/index/group/GroupSchemaDefinitions.java b/java/com/google/gerrit/server/index/group/GroupSchemaDefinitions.java
index 773aa9a..91dd285 100644
--- a/java/com/google/gerrit/server/index/group/GroupSchemaDefinitions.java
+++ b/java/com/google/gerrit/server/index/group/GroupSchemaDefinitions.java
@@ -45,7 +45,10 @@
// New numeric types: use dimensional points using the k-d tree geo-spatial data structure
// to offer fast single- and multi-dimensional numeric range.
- static final Schema<InternalGroup> V8 = schema(V7);
+ @Deprecated static final Schema<InternalGroup> V8 = schema(V7);
+
+ // Upgrade Lucene to 7.x requires reindexing.
+ static final Schema<InternalGroup> V9 = schema(V8);
/** Singleton instance of the schema definitions. This is one per JVM. */
public static final GroupSchemaDefinitions INSTANCE = new GroupSchemaDefinitions();
diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index d8f7020..37d8b9c 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -243,36 +243,36 @@
sha1 = "64cba89cf87c1d84cb8c81d06f0b9c482f10b4dc",
)
- LUCENE_VERS = "6.6.5"
+ LUCENE_VERS = "7.7.3"
maven_jar(
name = "lucene-core",
artifact = "org.apache.lucene:lucene-core:" + LUCENE_VERS,
- sha1 = "2983f80b1037e098209657b0ca9176827892d0c0",
+ sha1 = "5faa5ae56f7599019fce6184accc6c968b7519e7",
)
maven_jar(
name = "lucene-analyzers-common",
artifact = "org.apache.lucene:lucene-analyzers-common:" + LUCENE_VERS,
- sha1 = "6094f91071d90570b7f5f8ce481d5de7d2d2e9d5",
+ sha1 = "0a76cbf5e21bbbb0c2d6288b042450236248214e",
)
maven_jar(
name = "backward-codecs",
artifact = "org.apache.lucene:lucene-backward-codecs:" + LUCENE_VERS,
- sha1 = "460a19e8d1aa7d31e9614cf528a6cb508c9e823d",
+ sha1 = "40207d0dd023a0e2868a23dd87d72f1a3cdbb893",
)
maven_jar(
name = "lucene-misc",
artifact = "org.apache.lucene:lucene-misc:" + LUCENE_VERS,
- sha1 = "ce3a1b7b6a92b9af30791356a4bd46d1cea6cc1e",
+ sha1 = "3aca078edf983059722fe61a81b7b7bd5ecdb222",
)
maven_jar(
name = "lucene-queryparser",
artifact = "org.apache.lucene:lucene-queryparser:" + LUCENE_VERS,
- sha1 = "2db9ca0086a4b8e0b9bc9f08a9b420303168e37c",
+ sha1 = "685fc6166d29eb3e3441ae066873bb442aa02df1",
)
# JGit's transitive dependencies