tree befdd76a883ec60465c8f6389b5591ee6eeba35a
parent 79932b08a7dbf9a6d03ad6d0fb2fa9b6b1405aaf
parent 12a6287c62d873f20587e7d288f75b75e72e9a53
author David Pursehouse <dpursehouse@collab.net> 1541669007 +0900
committer David Pursehouse <dpursehouse@collab.net> 1541669007 +0900

Merge branch 'stable-2.16'

* stable-2.16:
  Add missing @Override annotation on setDynamicBean
  Release 2.16-rc3
  Fix broken sentence in description of unchanged file marker
  Document when 'U' for unchanged files is used in file list on change screen
  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
  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: I054b451abb7974812316559b4c55d99ddf41cc5d