276 Commits

Author SHA1 Message Date
David Pursehouse
260dcee97b Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Require minimum Bazel version 0.19.0

Change-Id: I18b21640b5721be9311a37c8697ac1de5855634d
2018-11-09 08:49:51 +09:00
David Pursehouse
a5ca033785 Require minimum Bazel version 0.19.0
Change-Id: Idd85e245b46969c87417714d0f0c30336e1d67bd
2018-11-07 10:21:16 +00:00
David Pursehouse
dd2182557b Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  ElasticContainer: Test with versions 5.6.13 and 6.4.3
  Upgrade elasticsearch-rest-client to 6.4.3
  Bazel: Consume versions directly from lib:versions.bzl in skylib

Change-Id: I2264b3f077799c5a7b9467a3e33606b71c53f174
2018-11-07 19:17:16 +09:00
David Pursehouse
bfeaf28f58 Merge "Bazel: Consume versions directly from lib:versions.bzl in skylib" into stable-2.14 2018-11-07 10:16:18 +00:00
David Pursehouse
481bf8500f Upgrade elasticsearch-rest-client to 6.4.3
Change-Id: Iac9306a0cfd19e13226a58437536d0297642aca8
2018-11-07 11:43:24 +09:00
David Ostrovsky
efcb9927a2 Bazel: Consume versions directly from lib:versions.bzl in skylib
Avoid loading versions from @bazel_skylib//:lib.bzl, because it is now
deprecated and is going to be removed in future skylib versions:

https://github.com/bazelbuild/bazel-skylib/blob/master/lib.bzl#L17

Change-Id: Idfd131cb1d773887bbc07faadd168da53524fdc0
2018-11-07 01:20:51 +00:00
David Pursehouse
bb61707214 Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  AbstractChangeNotes: Never open repo when NoteDb is off
  dev-contributing: Specify buildifier version 0.17.2
  Remove unused dependency on httpcomponents:httpmime
  Fix Elasticsearch dependency on httpcore-nio
  Upgrade Jetty to 9.3.24.v20180605 to fix several CVEs
  [CVE-2018-1000180, CVE-2018-1000613] Upgrade Bouncycastle to 1.60
  Adapt PublicKeyStoreTest to work with BouncyCastle 1.60
  [CVE-2018-10237]: Upgrade guava to 24.1.1-jre
  Stop using CharMatcher.javaLetterOrDigit
  project/Index: Assign and ignore unused future
  [CVE-2017-12629] Upgrade Lucene to 5.5.5
  [CVE-2018-10936] Upgrade postgresql to 42.2.5
  [CVE-2015-1832] Upgrade Apache Derby to 10.12.1.1
  Set version to 2.14.17-SNAPSHOT

Change-Id: Id35c46871597e8005d63379c3fce1d9113b80ed6
2018-11-07 10:18:37 +09:00
David Pursehouse
0a154a41bb Remove unused dependency on httpcomponents:httpmime
The only consumer of httpmime was Apache Solr, which was removed
in change Ic62ae3103 more than 3 years ago.

Change-Id: I6204dc74cc99a878ac4cac7c777a235544f9f80e
2018-11-05 10:00:40 +09:00
David Pursehouse
cafa53b95e Fix Elasticsearch dependency on httpcore-nio
The elasticsearch-rest-client library has an explicit dependency on
version 4.4.5 of httpcore-nio [1], but the version provided by Gerrit
is tied to the same version 4.4.1 as all the other httpcomponents.

Since httpcore-nio is only used by elasticsearch-rest-client, we can
safely provide the required version. We can also restrict visibility
to the elasticsearch package to prevent accidental usage elsewhere.

The same is true for the httpasyncclient component, which we already
provide at the correct version as used by elasticsearch-rest-client,
so also restrict its visibility in the same way.

At the same time, move httpcore-nio and httpasyncclient declarations
up the WORKSPACE file adjacent to the other httpcomponents, and add
a comment to clarify that they are set at explicit versions for ES.

[1] https://search.maven.org/artifact/org.elasticsearch.client/elasticsearch-rest-client/6.4.2/jar

Bug: Issue 9969
Change-Id: Id80f92768667541604df0c53235ea81ecdda9c0e
2018-11-05 10:00:40 +09:00
David Pursehouse
f904ab9ef3 Upgrade Jetty to 9.3.24.v20180605 to fix several CVEs
This upgrade fixes the following CVEs:

- CVE-2017-7656 [1]:

  In Eclipse Jetty, versions 9.2.x and older, 9.3.x (all configurations),
  and 9.4.x (non-default configuration with RFC2616 compliance enabled),
  HTTP/0.9 is handled poorly. An HTTP/1 style request line (i.e. method
  space URI space version) that declares a version of HTTP/0.9 was accepted
  and treated as a 0.9 request. If deployed behind an intermediary that also
  accepted and passed through the 0.9 version (but did not act on it), then
  the response sent could be interpreted by the intermediary as HTTP/1
  headers. This could be used to poison the cache if the server allowed the
  origin client to generate arbitrary content in the response.

- CVE-2017-7657 [2]:

  In Eclipse Jetty, versions 9.2.x and older, 9.3.x (all configurations), and
  9.4.x (non-default configuration with RFC2616 compliance enabled), transfer-
  encoding chunks are handled poorly. The chunk length parsing was vulnerable
  to an integer overflow. Thus a large chunk size could be interpreted as a
  smaller chunk size and content sent as chunk body could be interpreted as a
  pipelined request. If Jetty was deployed behind an intermediary that imposed
  some authorization and that intermediary allowed arbitrarily large chunks to
  be passed on unchanged, then this flaw could be used to bypass the
  authorization imposed by the intermediary as the fake pipelined request would
  not be interpreted by the intermediary as a request.

- CVE-2017-7658 [3]:

  In Eclipse Jetty Server, versions 9.2.x and older, 9.3.x (all non HTTP/1.x
  configurations), and 9.4.x (all HTTP/1.x configurations), when presented with
  two content-length headers, Jetty ignored the second. When presented with a
  content-length and a chunked encoding header, the content-length was ignored
  (as per RFC 2616). If an intermediary decided on the shorter length, but still
  passed on the longer body, then body content could be interpreted by Jetty as
  a pipelined request. If the intermediary was imposing authorization, the fake
  pipelined request would bypass that authorization.

- CVE-2017-9735 [4]:

  Jetty through 9.4.x is prone to a timing channel in util/security/Password.java,
  which makes it easier for remote attackers to obtain access by observing
  elapsed times before rejection of incorrect passwords.

- CVE-2018-12536 [5]:

  In Eclipse Jetty Server, all 9.x versions, on webapps deployed using default
  Error Handling, when an intentionally bad query arrives that doesn't match a
  dynamic url-pattern, and is eventually handled by the DefaultServlet's static
  file serving, the bad characters can trigger a
  java.nio.file.InvalidPathException which includes the full path to the base
  resource directory that the DefaultServlet and/or webapp is using. If this
  InvalidPathException is then handled by the default Error Handler, the
  InvalidPathException message is included in the error response, revealing the
  full server path to the requesting system.

[1] https://nvd.nist.gov/vuln/detail/CVE-2017-7656
[2] https://nvd.nist.gov/vuln/detail/CVE-2017-7657
[3] https://nvd.nist.gov/vuln/detail/CVE-2017-7658
[4] https://nvd.nist.gov/vuln/detail/CVE-2017-9735
[5] https://nvd.nist.gov/vuln/detail/CVE-2018-12536

Bug: Issue 9952
Change-Id: I1ebb91406b88289e3803ffb1d5049ea7352c695c
2018-11-05 10:00:40 +09:00
David Pursehouse
6f97ef16b3 [CVE-2018-1000180, CVE-2018-1000613] Upgrade Bouncycastle to 1.60
This upgrade fixes CVE-2018-1000180 [1]:

  Bouncy Castle BC 1.54 - 1.59, BC-FJA 1.0.0, BC-FJA 1.0.1 and earlier
  have a flaw in the Low-level interface to RSA key pair generator,
  specifically RSA Key Pairs generated in low-level API with added
  certainty may have less M-R tests than expected. This appears to be
  fixed in versions BC 1.60 beta 4 and later, BC-FJA 1.0.2 and later.

and CVE-2018-1000613 [2]:

  Bouncy Castle Java Cryptography APIs version prior to version 1.60
  contains a CWE-470: Use of Externally-Controlled Input to Select
  Classes or Code ('Unsafe Reflection') vulnerability in XMSS/XMSS^MT
  private key deserialization that can result in Deserializing an
  XMSS/XMSS^MT private key can result in the execution of unexpected
  code. This attack appear to be exploitable via a handcrafted private
  key can include references to unexpected classes which will be picked
  up from the class path for the executing application. This
  vulnerability appears to have been fixed in 1.60 and later.

Bouncycastle 1.57 introduced generics in its APIs. Remove the casts
and @SuppressWarnings("unchecked") annotations that are not necessary
any more.

[1] https://nvd.nist.gov/vuln/detail/CVE-2018-1000180
[2] https://nvd.nist.gov/vuln/detail/CVE-2018-1000613

Bug: Issue 9952
Change-Id: I9b25b1568ac7da555de96d82c597b3dff47966c6
2018-11-05 10:00:40 +09:00
David Pursehouse
b0618f9b94 [CVE-2018-10237]: Upgrade guava to 24.1.1-jre
This upgrade fixes CVE-2018-10237 [1]:

  Unbounded memory allocation in Google Guava 11.0 through 24.x before
  24.1.1 allows remote attackers to conduct denial of service attacks
  against servers that depend on this library and deserialize attacker-
  provided data, because the AtomicDoubleArray class (when serialized
  with Java serialization) and the CompoundOrdering class (when
  serialized with GWT serialization) perform eager allocation without
  appropriate checks on what a client has sent and whether the data size
  is reasonable.

[1] https://nvd.nist.gov/vuln/detail/CVE-2018-10237

This also adds dependency on j2objc-annotations to prevent the following
warning during the build:

  INFO: From Building java/com/google/gerrit/lucene/liblucene.jar (12 source files):
  warning: unknown enum constant ReflectionSupport$Level.FULL
  reason: class file for com.google.j2objc.annotations.ReflectionSupport$Level not found

Bug: Issue 9952
Change-Id: Iea79ee7d93c4b7c85479b5ec01ee07e19beed611
2018-11-05 10:00:40 +09:00
David Pursehouse
fb11ccf507 [CVE-2017-12629] Upgrade Lucene to 5.5.5
This upgrade fixes CVE-2017-12629 [1]. Although this issue only affects
Solr, according to the description, it's probably worth upgrading anyway
since there have been several bug fixes in the intermediate versions.

See the release notes for 5.5.2 [2], 5.5.4 [3] and 5.5.5 [4] for details.

Note: there are no bug fixes listed for 5.5.3.

The only reason we didn't upgrade to the latest version before is because
we had a dependency on Elasticsearch which had a tight coupling with a
specific Lucene version.

[1] https://nvd.nist.gov/vuln/detail/CVE-2017-12629
[2] https://lucene.apache.org/core/5_5_2/changes/Changes.html#v5.5.2.bug_fixes
[3] https://lucene.apache.org/core/5_5_4/changes/Changes.html#v5.5.4.bug_fixes
[4] https://lucene.apache.org/core/5_5_5/changes/Changes.html#v5.5.5.bug_fixes

Bug: Issue 9952
Change-Id: I776e2dc10c86dc6761a0a1ce6644ce5ac384509c
2018-11-05 10:00:39 +09:00
David Pursehouse
bb37eef53a [CVE-2018-10936] Upgrade postgresql to 42.2.5
This upgrade fixes CVE-2018-10936 [1]:

  A weakness was found in postgresql-jdbc before version 42.2.5. It was
  possible to provide an SSL Factory and not check the host name if a
  host name verifier was not provided to the driver. This could lead to
  a condition where a man-in-the-middle attacker could masquerade as a
  trusted server by providing a certificate for the wrong host, as long
  as it was signed by a trusted CA.

[1] https://nvd.nist.gov/vuln/detail/CVE-2018-10936

Bug: Issue 9952
Change-Id: I32972ae466a7876c221e6b678ffddcf3ca5a5a10
2018-11-05 10:00:39 +09:00
David Pursehouse
79b7ca9476 [CVE-2015-1832] Upgrade Apache Derby to 10.12.1.1
This upgrade fixes CVE-2015-1832 [1]:

  XML external entity (XXE) vulnerability in the SqlXmlUtil code in
  Apache Derby before 10.12.1.1, when a Java Security Manager is not
  in place, allows context-dependent attackers to read arbitrary files
  or cause a denial of service (resource consumption) via vectors
  involving XmlVTI and the XML datatype.

[1] https://nvd.nist.gov/vuln/detail/CVE-2015-1832

Bug: Issue 9952
Change-Id: I632d3048c21baece089affdd01e2e7782dbaebc6
2018-11-05 10:00:39 +09:00
David Pursehouse
5fe24a948c Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Update JGit to 4.7.5.201810051826-r
  ElasticContainer: Use Elasticsearch 6.4.2 for V6_4 tests
  Upgrade elasticsearch-rest-client to 6.4.2
  Upgrade jackson-core to 2.9.7

Change-Id: Ia3e641679225e4897825e003e0ddb3ba764c0b50
2018-10-08 10:57:40 +09:00
David Pursehouse
0408166b7e Upgrade elasticsearch-rest-client to 6.4.2
This is a cherry-pick of stable-2.15 recently merged commit f69a822.
This pick assumes that Elasticsearch 6.x.y is still also maintained for
the stable-2.14 branch.

According to the release notes [1] this release does not include
any client fixes. This is just to keep up to date with the latest
version.

[1] https: //www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-6.4.2.html

Change-Id: I3fe434416537625f8963baec85bfabb7c735bed7
2018-10-04 11:47:24 -04:00
David Pursehouse
4e873c1ca4 Upgrade jackson-core to 2.9.7
There have been several releases since 2.6.6 including many bug
fixes and security fixes.

jackson-core is only used by the Elasticsearch integration; update
the BUILD file to explicitly restrict visibility to that package.

Change-Id: I27fc60caf51721d885776a9eea478c2ec0cea2cf
2018-10-04 11:47:24 -04:00
David Pursehouse
f69a822690 Upgrade elasticsearch-rest-client to 6.4.2
According to the release notes [1] this release does not include
any client fixes. This is just to keep up to date with the latest
version.

[1] https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-6.4.2.html

Change-Id: Idd395be966596e27f373c1e8a21c1484e8a382ba
2018-10-03 10:45:40 +09:00
Paladox
12c05a268f Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Update jruby to 9.1.17 and asciidoctorj to v1.5.7
  Elasticsearch: Ensure request URI is always prefixed with "/"
  AbstractElasticIndex: Factor out more variants of {post,perform}Request
  rest-api-projects: Fix "unterminated listing block" warning
  config-gerrit: Fix "invalid reference: database.h2.cachesize" warning
  Bazel: Specify name for downloaded file to http_file starlark rule
  Set version to 2.14.14-SNAPSHOT

Change-Id: I8a3bf774120fadea7c52871047b99631e2a798de
2018-09-26 18:58:16 +00:00
Paladox none
62417b11f9 Update jruby to 9.1.17 and asciidoctorj to v1.5.7
Since Bazel 0.16, the build is done with an embedded JRE using Java
version 9. This causes "illegal reflective access operation" warnings
during the documentation build, because the version of jruby (9.1.13)
doesn't support Java 9.

Support for Java 9 was added in jruby 9.1.14 [1]. The subsequent
releases also include bug fixes (see [2], [3], [4]).

Note that we don't upgrade to the latest (9.2.0).

Also upgrade asciidoctorj to the latest release, 1.5.7.

[1] http://jruby.org/2017/11/08/jruby-9-1-14-0.html
[2] http://jruby.org/2017/12/07/jruby-9-1-15-0.html
[3] http://jruby.org/2018/02/21/jruby-9-1-16-0.html
[4] http://jruby.org/2018/04/23/jruby-9-1-17-0.html

Bug: Issue 9766
Change-Id: I2f84612905761c4bdfddca807e92f54247ef6f6e
2018-09-26 13:59:12 +09:00
David Ostrovsky
9e7e9a1295 Bazel: Specify name for downloaded file to http_file starlark rule
In I44ca2ecfea6 native http_file was replaced with Starlark rule. During
this migration the original file name was lost and hard coded to file
named "downloaded". The closure_js_library expects files with .js suffix
as source files, so that we had to add an intermediate rename step to
make it work gain.

In context of this feature request: [1] downloaded_file_path was added
to the http_file rule: [2] so that we can use it now and can remove the
intermediate renaming step.

The aformentioned fix was included in 0.17.1 and we already have that
version as the minimum required Bazel version, so that we can clean that
up now.

[1] https://github.com/bazelbuild/bazel/issues/5633
[2] https://github.com/bazelbuild/bazel/pull/5647

Change-Id: Ia00e5d7b4eb9c18be808b290ac299e658ab33b9a
2018-09-25 08:37:23 +02:00
David Pursehouse
d4782a5d6b Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Upgrade elasticsearch-rest-client to 6.4.1
  Upgrade JGit to 4.7.4.201809180905-r

Change-Id: Id4c018afce67bc124809cc03276ec35500d06d48
2018-09-20 08:44:46 +09:00
David Pursehouse
08f5fd823a Upgrade elasticsearch-rest-client to 6.4.1
Change-Id: I6ababa146a93fcd23481b5f3ce2d55dc4486cdf3
2018-09-19 15:14:38 +09:00
David Pursehouse
edb53f796a Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  ElasticContainer: Use Elasticsearch 6.4.1 for V6_4 tests
  AbstractDaemonTest: Don't delete common server path too early
  Fix toolchain definitions for bazel 0.17.1
  Bazel: Bump baseline to 0.17.1

Change-Id: Ied727b76e0bc13ab8cb8d20372514edacc56e70f
2018-09-19 14:17:05 +09:00
David Ostrovsky
57cf163527 Bazel: Bump baseline to 0.17.1
New Bazel version is using JDK 9 javac. That will allow us to target
JDK 9 in Gerrit build.

Change-Id: I86666a9fda21c55852c64373bca2131ef0572c72
2018-09-18 20:56:42 +02:00
David Pursehouse
0012691460 Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Add support for Elasticsearch 6.4.0
  Upgrade elasticsearch-rest-client to 6.4.0
  ElasticVersion: Say 'Unsupported' rather than 'Invalid'

Change-Id: Id68197d3f4a43e19711581366ed234cb420957d9
2018-09-04 15:35:35 +09:00
David Pursehouse
f624784344 Upgrade elasticsearch-rest-client to 6.4.0
In this version several variants of the RestClient's performRequest
method are deprecated [1].

Adjust the implementation to use the recommended variant instead.

[1] https://www.elastic.co/guide/en/elasticsearch/reference/6.x/breaking_64_rest_client_changes.html

Change-Id: Ib09ab0a0800ed6957060c6e04352605ac5424062
2018-09-04 10:03:08 +09:00
David Pursehouse
727b108d2a Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  InitSshd: Use correct flag to set empty passphrase
  SshSession: Specify charset in constructor of Scanner
  Specify charset in constructors of InputStreamReader
  Update JGit dependencies to fix building from source

Change-Id: I994d9d26bb7a1b1333a6380fb81126c1e8dc026d
2018-08-31 12:37:23 +09:00
Gert van Dijk
9932a88865 Update JGit dependencies to fix building from source
Depends on [1] which harmonizes JGit's dependency names to align with
the names used in Gerrit since change I1e75690fe. Without [2], the
build will fail with errors like:

  "no such package '@commons_compress//jar'"

Also move the 'hamcrest-library' dependency out of WORKSPACE into the
jgit rules where it will be added conditionally.

[1] https://git.eclipse.org/r/#/c/128354/

Change-Id: I33be13e7f36ec2bcacbb9eb0983c88c6f3082097
2018-08-30 15:39:36 +09:00
David Pursehouse
0d06b081bb Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Fix http_archive rule in WORKSPACE
  ConfigInfoImpl: Return raw byte value for effective value
  TransferConfig: Move getEffectiveMaxObjectSizeLimit to ProjectState

Change-Id: Ib58995f7f6db32e2585c285b3d3dceb6b358848f
2018-08-21 14:05:58 +09:00
Edwin Kempin
6a3fa83072 Fix http_archive rule in WORKSPACE
Building the Eclipse project on Mac failed for me with:

ERROR: /Users/ekempin/git/gerrit/WORKSPACE:15:1: //external:io_bazel_rules_closure: no such attribute 'url' in 'http_archive' rule
ERROR: /Users/ekempin/git/gerrit/WORKSPACE:15:1: //external:io_bazel_rules_closure: missing value for mandatory attribute 'urls' in 'http_archive' rule

Change-Id: I03620a3eaf74138c15ff205dbcb349fcb7845f46
Signed-off-by: Edwin Kempin <ekempin@google.com>
2018-08-21 12:23:28 +09:00
David Pursehouse
41d902c39f Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Fix partially hidden plugin configuration in the UI
  Upgrade PostgreSQL JDBC driver

Change-Id: If39e7b17462979c21eb00085b81a2c4b5953652b
2018-08-08 21:40:49 +01:00
Hector Oswaldo Caballero
72c2560619 Upgrade PostgreSQL JDBC driver
Besides the usual bug fixes and optimizations, the more recent versions
implement missing features like being able to set network timeouts to
avoid connections hung due to network disruptions [1].

[1] https://github.com/pgjdbc/pgjdbc/pull/849

Change-Id: Idb8b0376fc24b1d050b72057303c551d36fa931b
2018-08-06 09:04:11 -04:00
David Pursehouse
39dcd91570 Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Minor improvements in receive.maxObjectSizeLimit documentation
  Bazel: Consume rules_closure from HEAD
  Bump auto-value to 1.6.2

Change-Id: I401942a40c5001300f77f9437d342001cd42e619
2018-08-02 15:07:21 +02:00
David Ostrovsky
4b8fff2d06 Bazel: Consume rules_closure from HEAD
Now, that both changes were merged, consume rules_closure from HEAD
and avoid patching it during the build: [1].

[1] d1c92e34f2
Change-Id: I5afeccb17e4ef76b2ec86f9f8b7f2741bf8d4e93
2018-08-01 22:48:43 +02:00
David Ostrovsky
5531347e56 Bump auto-value to 1.6.2
This upgrade is needed to support JDK9, that was fixed in this
commit: [1].

[1] f04406c1f1

Change-Id: Ic7464964dc7e21946aac4b4a786107a0df51ae2a
2018-08-01 22:35:35 +02:00
David Pursehouse
cfdb2aed40 Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Set version to 2.14.11
  Upgrade elasticsearch-rest-client to 6.3.2
  StalenessChecker: URLDecode project name before checking staleness
  AbstractQueryChangesTest: Add a test with project name that requires URL encoding
  Upgrade Dropwizard Metrics to 4.0.3
  Upgrade JGit to 4.7.2.201807261330-r
  Fix typos in documentation of 'List Files' REST API element

Change-Id: Ie19c82d34971264780d636843ccd76438f23a76e
2018-07-30 17:12:55 +02:00
David Pursehouse
53f91d99f5 Upgrade elasticsearch-rest-client to 6.3.2
This version includes several bug fixes, but most are related to
the server rather than the client. This upgrade is only to make
sure we're using the latest version.

Refer to the release notes [1] for details.

Also update the test container to test against version 6.3.2.

[1] https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-6.3.2.html

Change-Id: I80e65f4fe267cf487fddb759b3914e54e31164f3
2018-07-27 14:03:07 +01:00
David Pursehouse
6cbf49c7ab Upgrade Dropwizard Metrics to 4.0.3
There are no specific fixes that we need in this version - in fact
most of the changes are related to tests - so this upgrade is only
to align to the latest version.

Change-Id: I6e01398a05859b411fdbcd7db388e3061f866f53
2018-07-27 11:00:27 +01:00
David Pursehouse
e978e864e6 Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  GerritServer: save gerrit.config before site init
  ReindexIT: remove unnecessary method throws clause
  RestSession#postWithHeader: Make parameter order consistent with #putWithHeader
  Bump guice version to 4.2.0

Change-Id: Ibdedb3281414a140b214cb8c9006754cff542d25
2018-07-22 09:48:32 +01:00
David Ostrovsky
c3536a0650 Bump guice version to 4.2.0
The new version provides better support for Java 9 and improves
performance. Multibindings artifact is now included in the guice
core artifact. The full release notes is here: [1].

[1] https://github.com/google/guice/wiki/Guice42

Change-Id: I208d53ce1cf9b99ed8f03ae34470e95c3b8f71ce
(cherry picked from commit 1fa7774d237d0ea864b9f03b6551fd1ebef0c619)
2018-07-19 08:42:40 +09:00
David Ostrovsky
a0e9277984 Bump commons-io version to 2.2
This dependency is not used in gerrit core. The only reason it's
included in WORKSPACE is because core replication plugin depends on it
and there is no way in Bazel to consume external dependency in core
plugin without defining this dependency in WORKSPACE file.

It turns out, that gitblit-plugin also depends on commons-io, but on the
newer version. Sync the versions to the same version used by gitblit.

Change-Id: Iae3545df95b23439d3c7fd385bfeae482d6d60ac
(cherry picked from commit 6488535f737cdce5feeca2550ce402d803d4d5a9)
2018-07-10 06:25:16 +00:00
David Pursehouse
aa309c3ba6 Merge "Bump commons-io version to 2.2" into stable-2.15 2018-07-10 06:22:40 +00:00
David Ostrovsky
6488535f73 Bump commons-io version to 2.2
This dependency is not used in gerrit core. The only reason it's
included in WORKSPACE is because core replication plugin depends on it
and there is no way in Bazel to consume external dependency in core
plugin without defining this dependency in WORKSPACE file.

It turns out, that gitblit-plugin also depends on commons-io, but on the
newer version. Sync the versions to the same version used by gitblit.

Change-Id: Iae3545df95b23439d3c7fd385bfeae482d6d60ac
2018-07-08 14:22:49 +02:00
David Pursehouse
e178d5ec4c Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Add documentation for the change report formatter interface
  CommitValidators: Fix repeated "Change-Id" in error message
  ChangeReportFormatter: Convert Input to use AutoValue.Builder
  Introduce Change Report formatter extension point
  Update elasticsearch-rest-client to 6.3.1
  user-review-ui: Fix typo

Change-Id: I93b87a5ca9b9ea9f272122c8661780673e533f67
2018-07-07 09:41:15 +09:00
David Pursehouse
8ed3478235 Update elasticsearch-rest-client to 6.3.1
Also update the test container to use version 6.3.1.

Change-Id: I78d24ba8ba1a8612276a78ab3549b37cd53708d2
2018-07-06 12:13:39 +09:00
David Pursehouse
bb27c35796 Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Update Bower to 1.8.2
  SystemLog: Use logger's built-in formatting
  Upgrade elasticsearch-rest-client to 6.3.0

Change-Id: Ib374fc8b23adb3bb9d4187ed88cf94582c69c900
2018-06-27 09:50:59 +09:00
David Pursehouse
a21222d3e2 Upgrade elasticsearch-rest-client to 6.3.0
Support for 6.3.0 was added in 2.14.9 but we overlooked upgrading
the REST client to the same version.

Change-Id: Ifc681fa07759715cc876e71dbfc9490b2b096c9d
2018-06-25 23:18:57 +00:00
Hugo Arès
877b49ae8d Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
  Elasticsearch: Adapt version discovery for version 6
  AbstractIndexTests#assertQuery: Rename to assertChangeQuery
  ProjectConfig#saveLabelSections: Save "branch" values
  Upgrade testcontainers to version 1.8.0

Change-Id: I073b569e2cdb551030c1d5e233005417f4f5f16c
2018-06-15 09:19:14 -04:00