Merge "ConsistencyChecker: Fix reporting of delete old patch set problem" into stable-2.16
diff --git a/BUILD b/BUILD
index d924417..318968d 100644
--- a/BUILD
+++ b/BUILD
@@ -57,7 +57,6 @@
cmd = ("cat bazel-out/volatile-status.txt bazel-out/stable-status.txt | " +
"grep STABLE_BUILD_GERRIT_LABEL | cut -d ' ' -f 2 > $@"),
stamp = 1,
- visibility = ["//visibility:public"],
)
genrule(
@@ -65,7 +64,6 @@
srcs = ["//Documentation:licenses.txt"],
outs = ["LICENSES.txt"],
cmd = "cp $< $@",
- visibility = ["//visibility:public"],
)
pkg_war(
diff --git a/Documentation/BUILD b/Documentation/BUILD
index 4177f51..6fa5983 100644
--- a/Documentation/BUILD
+++ b/Documentation/BUILD
@@ -40,7 +40,6 @@
":prettify_files",
"//:LICENSES.txt",
],
- visibility = ["//visibility:public"],
)
license_map(
@@ -51,7 +50,6 @@
"//polygerrit-ui/app:polygerrit_ui",
"//java/com/google/gerrit/pgm",
],
- visibility = ["//visibility:public"],
)
license_map(
@@ -60,7 +58,6 @@
"//gerrit-gwtui:ui_module",
"//polygerrit-ui/app:polygerrit_ui",
],
- visibility = ["//visibility:public"],
)
DOC_DIR = "Documentation"
@@ -88,7 +85,6 @@
srcs = SRCS,
attributes = documentation_attributes(),
backend = "html5",
- visibility = ["//visibility:public"],
)
genasciidoc_zip(
@@ -97,7 +93,6 @@
attributes = documentation_attributes(),
backend = "html5",
directory = DOC_DIR,
- visibility = ["//visibility:public"],
)
genasciidoc_zip(
@@ -107,5 +102,4 @@
backend = "html5",
directory = DOC_DIR,
searchbox = False,
- visibility = ["//visibility:public"],
)
diff --git a/Documentation/config-plugins.txt b/Documentation/config-plugins.txt
index b9c5172..6d4fe3e 100644
--- a/Documentation/config-plugins.txt
+++ b/Documentation/config-plugins.txt
@@ -112,16 +112,6 @@
link:https://gerrit.googlesource.com/plugins/reviewnotes/+doc/master/src/main/resources/Documentation/about.md[
Documentation]
-[[review-strategy]]
-=== review-strategy
-
-This plugin allows users to configure different review strategies.
-
-link:https://gerrit-review.googlesource.com/admin/repos/plugins/review-strategy[
-Project] |
-link:https://gerrit.googlesource.com/plugins/review-strategy/+doc/master/src/main/resources/Documentation/about.md[
-Documentation]
-
[[singleusergroup]]
=== singleusergroup
@@ -565,6 +555,16 @@
link:https://gerrit.googlesource.com/plugins/reparent/+doc/master/src/main/resources/Documentation/config.md[
Configuration]
+[[review-strategy]]
+=== review-strategy
+
+This plugin allows users to configure different review strategies.
+
+link:https://gerrit-review.googlesource.com/admin/repos/plugins/review-strategy[
+Project] |
+link:https://gerrit.googlesource.com/plugins/review-strategy/+doc/master/src/main/resources/Documentation/about.md[
+Documentation]
+
[[reviewers]]
=== reviewers
diff --git a/WORKSPACE b/WORKSPACE
index bdc4456..727491e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1091,8 +1091,8 @@
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
- artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.5.1",
- sha1 = "d87892e24ef361b9fff5435246b0f0b8f4561fe8",
+ artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.5.2",
+ sha1 = "6ad0dd15affe56be7dfe638fe317bc5f7456b730",
)
JACKSON_VERSION = "2.9.7"
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index 14fe4de..19ea44b 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -45,7 +45,7 @@
case V6_4:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3";
case V6_5:
- return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.1";
+ return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.2";
case V7_0:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0-alpha1";
}
diff --git a/lib/commons/BUILD b/lib/commons/BUILD
index bb36389..93d3c2f 100644
--- a/lib/commons/BUILD
+++ b/lib/commons/BUILD
@@ -3,21 +3,18 @@
java_library(
name = "codec",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-codec//jar"],
)
java_library(
name = "compress",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-compress//jar"],
)
java_library(
name = "lang",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-lang//jar"],
)
@@ -30,14 +27,12 @@
java_library(
name = "net",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-net//jar"],
)
java_library(
name = "dbcp",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-dbcp//jar"],
runtime_deps = [":pool"],
)
@@ -45,20 +40,17 @@
java_library(
name = "pool",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-pool//jar"],
)
java_library(
name = "validator",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-validator//jar"],
)
java_library(
name = "io",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@commons-io//jar"],
)
diff --git a/lib/elasticsearch-rest-client/BUILD b/lib/elasticsearch-rest-client/BUILD
index c6357d0..8df3c70 100644
--- a/lib/elasticsearch-rest-client/BUILD
+++ b/lib/elasticsearch-rest-client/BUILD
@@ -3,6 +3,5 @@
java_library(
name = "elasticsearch-rest-client",
data = ["//lib:LICENSE-elasticsearch"],
- visibility = ["//visibility:public"],
exports = ["@elasticsearch-rest-client//jar"],
)
diff --git a/lib/greenmail/BUILD b/lib/greenmail/BUILD
index 55eb9f3..41fbdab 100644
--- a/lib/greenmail/BUILD
+++ b/lib/greenmail/BUILD
@@ -3,6 +3,5 @@
java_library(
name = "greenmail",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@greenmail//jar"],
)
diff --git a/lib/httpcomponents/BUILD b/lib/httpcomponents/BUILD
index 74cca14..03d9b68 100644
--- a/lib/httpcomponents/BUILD
+++ b/lib/httpcomponents/BUILD
@@ -3,7 +3,6 @@
java_library(
name = "fluent-hc",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@fluent-hc//jar"],
runtime_deps = [":httpclient"],
)
@@ -11,7 +10,6 @@
java_library(
name = "httpclient",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@httpclient//jar"],
runtime_deps = [
":httpcore",
@@ -23,7 +21,6 @@
java_library(
name = "httpcore",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@httpcore//jar"],
)
diff --git a/lib/jackson/BUILD b/lib/jackson/BUILD
index 3d751ab..0034748 100644
--- a/lib/jackson/BUILD
+++ b/lib/jackson/BUILD
@@ -1,5 +1,3 @@
-package(default_visibility = ["//visibility:public"])
-
java_library(
name = "jackson-core",
data = ["//lib:LICENSE-Apache2.0"],
diff --git a/lib/lucene/BUILD b/lib/lucene/BUILD
index 421caed..eab2ac8 100644
--- a/lib/lucene/BUILD
+++ b/lib/lucene/BUILD
@@ -11,13 +11,11 @@
"@lucene-core//jar",
],
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
)
java_library(
name = "lucene-analyzers-common",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@lucene-analyzers-common//jar"],
runtime_deps = [":lucene-core-and-backward-codecs"],
)
@@ -25,14 +23,12 @@
java_library(
name = "lucene-core",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@lucene-core//jar"],
)
java_library(
name = "lucene-misc",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@lucene-misc//jar"],
runtime_deps = [":lucene-core-and-backward-codecs"],
)
@@ -40,7 +36,6 @@
java_library(
name = "lucene-queryparser",
data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
exports = ["@lucene-queryparser//jar"],
runtime_deps = [":lucene-core-and-backward-codecs"],
)
diff --git a/lib/polymer_externs/BUILD b/lib/polymer_externs/BUILD
index 2f1bdbd..cd71d64 100644
--- a/lib/polymer_externs/BUILD
+++ b/lib/polymer_externs/BUILD
@@ -12,9 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package(
- default_visibility = ["//visibility:public"],
-)
+package(default_visibility = ["//visibility:public"])
load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
diff --git a/polygerrit-ui/BUILD b/polygerrit-ui/BUILD
index 384f835..5889ffd 100644
--- a/polygerrit-ui/BUILD
+++ b/polygerrit-ui/BUILD
@@ -1,6 +1,4 @@
-package(
- default_visibility = ["//visibility:public"],
-)
+package(default_visibility = ["//visibility:public"])
load("@io_bazel_rules_go//go:def.bzl", "go_binary")
load("//tools/bzl:js.bzl", "bower_component_bundle")
@@ -51,7 +49,6 @@
"zip -qr $$ROOT/$@ fonts",
]),
output_to_bindir = 1,
- visibility = ["//visibility:public"],
)
go_binary(
diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD
index c735746..0aa70b8 100644
--- a/polygerrit-ui/app/BUILD
+++ b/polygerrit-ui/app/BUILD
@@ -1,6 +1,4 @@
-package(
- default_visibility = ["//visibility:public"],
-)
+package(default_visibility = ["//visibility:public"])
load(":rules.bzl", "polygerrit_bundle")
load("//tools/bzl:genrule2.bzl", "genrule2")
diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml
index 57f0d52..b5f77e4 100644
--- a/tools/maven/gerrit-acceptance-framework_pom.xml
+++ b/tools/maven/gerrit-acceptance-framework_pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-acceptance-framework</artifactId>
- <version>2.16.1-SNAPSHOT</version>
+ <version>2.16.1</version>
<packaging>jar</packaging>
<name>Gerrit Code Review - Acceptance Test Framework</name>
<description>Framework for Gerrit's acceptance tests</description>
diff --git a/tools/maven/gerrit-extension-api_pom.xml b/tools/maven/gerrit-extension-api_pom.xml
index 872b09b..e2f8f8a 100644
--- a/tools/maven/gerrit-extension-api_pom.xml
+++ b/tools/maven/gerrit-extension-api_pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-extension-api</artifactId>
- <version>2.16.1-SNAPSHOT</version>
+ <version>2.16.1</version>
<packaging>jar</packaging>
<name>Gerrit Code Review - Extension API</name>
<description>API for Gerrit Extensions</description>
diff --git a/tools/maven/gerrit-plugin-api_pom.xml b/tools/maven/gerrit-plugin-api_pom.xml
index 47c2587..cf935e4 100644
--- a/tools/maven/gerrit-plugin-api_pom.xml
+++ b/tools/maven/gerrit-plugin-api_pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-plugin-api</artifactId>
- <version>2.16.1-SNAPSHOT</version>
+ <version>2.16.1</version>
<packaging>jar</packaging>
<name>Gerrit Code Review - Plugin API</name>
<description>API for Gerrit Plugins</description>
diff --git a/tools/maven/gerrit-plugin-gwtui_pom.xml b/tools/maven/gerrit-plugin-gwtui_pom.xml
index 375f5ea..64a7ef2 100644
--- a/tools/maven/gerrit-plugin-gwtui_pom.xml
+++ b/tools/maven/gerrit-plugin-gwtui_pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-plugin-gwtui</artifactId>
- <version>2.16.1-SNAPSHOT</version>
+ <version>2.16.1</version>
<packaging>jar</packaging>
<name>Gerrit Code Review - Plugin GWT UI</name>
<description>Common Classes for Gerrit GWT UI Plugins</description>
diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml
index 53ba70d..7ef5514 100644
--- a/tools/maven/gerrit-war_pom.xml
+++ b/tools/maven/gerrit-war_pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.gerrit</groupId>
<artifactId>gerrit-war</artifactId>
- <version>2.16.1-SNAPSHOT</version>
+ <version>2.16.1</version>
<packaging>war</packaging>
<name>Gerrit Code Review - WAR</name>
<description>Gerrit WAR</description>
diff --git a/version.bzl b/version.bzl
index e0182e7..9f25fc1 100644
--- a/version.bzl
+++ b/version.bzl
@@ -2,4 +2,4 @@
# Used by :api_install and :api_deploy targets
# when talking to the destination repository.
#
-GERRIT_VERSION = "2.16.1-SNAPSHOT"
+GERRIT_VERSION = "2.16.1"
