Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  Bump gwtorm to 1.14 - solves the primary key column order bug
  Update replication plugin to latest revision
  Fix ordering of 2.9.x releases in the release notes index.
  Disable Gitweb for in-memory acceptance tests
  Allow to raise BooleanQuery limit in gerrit.config.

Change-Id: I00a034bbe166eb3e6b1f2058ba46ce0a1ff47c86

Documentation/config-gerrit.txt

@@ -2018,6 +2018,14 @@ Open and closed changes are indexed in separate indexes named
 
 The following settings are only used when the index type is `LUCENE`.
 
+[[index.defaultMaxClauseCount]]index.defaultMaxClauseCount::
++
+Only used when the type is `LUCENE`.
++
+Sets the maximum number of clauses permitted per BooleanQuery.
++
+Defaults to 1024.
+
 [[index.name.ramBufferSize]]index.name.ramBufferSize::
 +
 Determines the amount of RAM that may be used for buffering added documents
@@ -2061,6 +2069,7 @@ Sample Lucene index configuration:
 ----
 [index]
   type = LUCENE
+  defaultMaxClauseCount = 2048
 
 [index "changes_open"]
   ramBufferSize = 60 m

ReleaseNotes/index.txt

@@ -9,8 +9,8 @@ Version 2.10.x
 [[2_9]]
 Version 2.9.x
 -------------
-* link:ReleaseNotes-2.9.html[2.9]
 * link:ReleaseNotes-2.9.1.html[2.9.1]
+* link:ReleaseNotes-2.9.html[2.9]
 
 [[2_8]]
 Version 2.8.x

gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java

@@ -74,6 +74,7 @@ import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.IndexWriterConfig.OpenMode;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.ScoreDoc;
@@ -242,6 +243,9 @@ public class LuceneChangeIndex implements ChangeIndex {
         new StandardAnalyzer(luceneVersion, CharArraySet.EMPTY_SET);
     queryBuilder = new QueryBuilder(schema, analyzer);
 
+    BooleanQuery.setMaxClauseCount(cfg.getInt("index", "defaultMaxClauseCount",
+        BooleanQuery.getMaxClauseCount()));
+
     GerritIndexWriterConfig openConfig =
         new GerritIndexWriterConfig(luceneVersion, cfg, "changes_open");
     GerritIndexWriterConfig closedConfig =

lib/BUCK

@@ -25,12 +25,11 @@ define_license(name = 'DO_NOT_DISTRIBUTE')
 
 maven_jar(
   name = 'gwtorm',
-  id = 'com.google.gerrit:gwtorm:1.13',
-  bin_sha1 = 'f522e05ca280335f8f8ba63c9c3e1b36be6ca7c2',
-  src_sha1 = '81bd99d55be872cd2fc52611f92cf5f3a64ffe8b',
+  id = 'com.google.gerrit:gwtorm:1.14',
+  bin_sha1 = '7e7562d2a8ae233ac9f23ec90dee1a01646483c0',
+  src_sha1 = 'ae991fdefe5e92ee7ed754786b924dc1ec119a8b',
   license = 'Apache2.0',
   deps = [':protobuf'],
-  repository = GERRIT,
 )
 
 maven_jar(