Merge 'stable-3.3'

This contains a revert of the change that brought back
experiments on stable-3.3 that we already deleted on
master: 5f000f8509

* origin/stable-3.3:
  Set version to 3.3.2-SNAPSHOT
  Set version to 3.3.1
  Set version to 3.2.7-SNAPSHOT
  Set version to 3.2.6
  Set version to 3.1.12-SNAPSHOT
  Set version to 3.1.11
  Fix httpcore dependency needed by httpclient
  Revert "Add support for Elasticsearch version 7.9.*"
  Revert "Add support for Elasticsearch version 7.10.*"
  Expose patch set level comment in stream event
  Ship a list of default experiments from the backend and allow disabling
  Revert "Clean up comment experiment flags"
  Make UI experiments configurable from gerrit.config
  ForRef#check should permit internal users to read all refs
  Bazel: Adapt RBE to produce Java 11 language level
  Add Jacek Centkowski to developers
  Add support for Elasticsearch version 7.10.*
  Add support for Elasticsearch version 7.9.*
  Align http dependencies with elasticsearch-rest-client
  ChangeNotes: Don't use ChangeIndex when we can avoid it

Change-Id: I873b0714115c779a536487b0c2a95159feefc6b1
This commit is contained in:
Patrick Hiesel
2021-01-05 10:25:17 +01:00
21 changed files with 212 additions and 96 deletions

View File

@@ -45,9 +45,11 @@ http_archive(
load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
# Creates a default toolchain config for RBE.
# Use this as is if you are using the rbe_ubuntu16_04 container,
# otherwise refer to RBE docs.
rbe_autoconfig(name = "rbe_default")
rbe_autoconfig(
name = "rbe_jdk11",
java_home = "/usr/lib/jvm/11.29.3-ca-jdk11.0.2/reduced",
use_checked_in_confs = "Force",
)
http_archive(
name = "com_google_protobuf",
@@ -795,26 +797,30 @@ maven_jar(
sha1 = "fd369423346b2f1525c413e33f8cf95b09c92cbd",
)
# Note that all of the following org.apache.httpcomponents have newer versions,
# but 4.4.1 is the only version that is available for all of them.
HTTPCOMP_VERS = "4.4.1"
# Base the following org.apache.httpcomponents versions on what
# elasticsearch-rest-client explicitly depends on, except for
# commons-codec (non-http) which is not necessary yet. Note that
# below httpcore version(s) differs from the HTTPCOMP_VERS range,
# upstream: that specific dependency has no HTTPCOMP_VERS version
# equivalent currently.
HTTPCOMP_VERS = "4.5.2"
maven_jar(
name = "fluent-hc",
artifact = "org.apache.httpcomponents:fluent-hc:" + HTTPCOMP_VERS,
sha1 = "96fb842b68a44cc640c661186828b60590c71261",
sha1 = "7bfdfa49de6d720ad3c8cedb6a5238eec564dfed",
)
maven_jar(
name = "httpclient",
artifact = "org.apache.httpcomponents:httpclient:" + HTTPCOMP_VERS,
sha1 = "016d0bc512222f1253ee6b64d389c84e22f697f0",
sha1 = "733db77aa8d9b2d68015189df76ab06304406e50",
)
maven_jar(
name = "httpcore",
artifact = "org.apache.httpcomponents:httpcore:" + HTTPCOMP_VERS,
sha1 = "f5aa318bda4c6c8d688c9d00b90681dcd82ce636",
artifact = "org.apache.httpcomponents:httpcore:4.4.4",
sha1 = "b31526a230871fbe285fbcbe2813f9c0839ae9b0",
)
# Test-only dependencies below.