Merge branch 'stable-2.10'

* stable-2.10:
  Update replication plugin
  Bump gwtorm to 1.14 - solves the primary key column order bug
  Buck: Package servlet-api in WEB-INF/pgm-lib again
  Update replication plugin to latest revision
  Update JGit to version 3.5.1.201410131835-r
  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.
  Fix comment box font colors of dark CM themes

Conflicts:
	gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/HttpPushForReviewIT.java
	lib/jgit/BUCK

Change-Id: I18307ca165dd5b2ca476b053fc75779bc17712bf
This commit is contained in:
David Pursehouse 2014-11-05 17:54:09 +09:00 committed by Edwin Kempin
commit 8afb53c221
7 changed files with 47 additions and 12 deletions
Documentation
ReleaseNotes
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff
gerrit-lucene/src/main/java/com/google/gerrit/lucene
gerrit-server
lib

@ -2061,6 +2061,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
@ -2104,6 +2112,7 @@ Sample Lucene index configuration:
----
[index]
type = LUCENE
defaultMaxClauseCount = 2048
[index "changes_open"]
ramBufferSize = 60 m

@ -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

@ -13,6 +13,29 @@
* limitations under the License.
*/
@external .cm-s-midnight;
@external .cm-s-night;
@external .cm-s-twilight;
@external .com-google-gerrit-client-diff-PublishedBox_BinderImpl_GenCss_style-name;
@external .com-google-gerrit-client-diff-Resources-Style-message;
@external .com-google-gerrit-client-diff-Resources-Style-date;
@external .com-google-gerrit-client-diff-DiffTable_BinderImpl_GenCss_style-rangeHighlight;
.cm-s-midnight .com-google-gerrit-client-diff-PublishedBox_BinderImpl_GenCss_style-name { color: black }
.cm-s-midnight .com-google-gerrit-client-diff-Resources-Style-message { color: black }
.cm-s-midnight .com-google-gerrit-client-diff-Resources-Style-date { color: black }
.cm-s-midnight .com-google-gerrit-client-diff-DiffTable_BinderImpl_GenCss_style-rangeHighlight { color: #777 }
.cm-s-night .com-google-gerrit-client-diff-PublishedBox_BinderImpl_GenCss_style-name { color: black }
.cm-s-night .com-google-gerrit-client-diff-Resources-Style-message { color: black }
.cm-s-night .com-google-gerrit-client-diff-Resources-Style-date { color: black }
.cm-s-night .com-google-gerrit-client-diff-DiffTable_BinderImpl_GenCss_style-rangeHighlight { color: #777 }
.cm-s-twilight .com-google-gerrit-client-diff-PublishedBox_BinderImpl_GenCss_style-name { color: black }
.cm-s-twilight .com-google-gerrit-client-diff-Resources-Style-message { color: black }
.cm-s-twilight .com-google-gerrit-client-diff-Resources-Style-date { color: black }
.cm-s-twilight .com-google-gerrit-client-diff-DiffTable_BinderImpl_GenCss_style-rangeHighlight { color: #777 }
.commentWidgets {
max-width: 650px;

@ -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;
@ -256,6 +257,9 @@ public class LuceneChangeIndex implements ChangeIndex {
CUSTOM_CHAR_MAPPING);
queryBuilder = new QueryBuilder(schema, analyzer);
BooleanQuery.setMaxClauseCount(cfg.getInt("index", "defaultMaxClauseCount",
BooleanQuery.getMaxClauseCount()));
GerritIndexWriterConfig openConfig =
new GerritIndexWriterConfig(luceneVersion, cfg, "changes_open");
GerritIndexWriterConfig closedConfig =

@ -47,7 +47,6 @@ java_library(
'//lib:parboiled-core',
'//lib:pegdown',
'//lib:protobuf',
'//lib:servlet-api-3_1',
'//lib:velocity',
'//lib/antlr:java_runtime',
'//lib/commons:codec',
@ -69,6 +68,7 @@ java_library(
'//lib/lucene:query-parser',
],
provided_deps = [
'//lib:servlet-api-3_1',
'//lib/bouncycastle:bcprov',
'//lib/bouncycastle:bcpg',
'//lib/bouncycastle:bcpkix',

@ -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(

@ -1,12 +1,12 @@
include_defs('//lib/maven.defs')
VERS = '3.5.0.201409071800-rc1'
VERS = '3.5.1.201410131835-r'
maven_jar(
name = 'jgit',
id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS,
bin_sha1 = 'e520f25877d6ec940ac98faa5ffa97a75d83b653',
src_sha1 = '2c9eda84801364e9b07a458114a5a5c04bb8c99b',
bin_sha1 = '23b8793639407fcbe2fee8557fb8238d18b2e409',
src_sha1 = '48ae55f9fed45e188177bcf3bf4638eed6bf3aae',
license = 'jgit',
unsign = True,
deps = [':ewah'],
@ -20,7 +20,7 @@ maven_jar(
maven_jar(
name = 'jgit-servlet',
id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS,
sha1 = '089e041d5065a7aa30366c3f1610868bac50bdba',
sha1 = 'ee4f9852eb62d9b0785705e4eb40e40035119da7',
license = 'jgit',
deps = [':jgit'],
unsign = True,
@ -33,7 +33,7 @@ maven_jar(
maven_jar(
name = 'jgit-archive',
id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS,
sha1 = 'b335e60660653a6a421e76af5604d84ca526aa6a',
sha1 = '48ddea0e3f6e78f9696e30dfc257118a446b453c',
license = 'jgit',
deps = [':jgit',
'//lib/commons:compress',
@ -49,7 +49,7 @@ maven_jar(
maven_jar(
name = 'junit',
id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS,
sha1 = '9253ab01d92ccd657290b5996defa64177e738d0',
sha1 = '1e8a9e7fa493e96ec6c07b9f6f51ed2d2db60b9f',
license = 'DO_NOT_DISTRIBUTE',
unsign = True,
deps = [':jgit'],