From d1b9267b6dd35941ef7b74042b72df4a0a9425d8 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Wed, 4 Dec 2019 14:29:26 -0500 Subject: [PATCH 1/3] ElasticV6QueryChangesTest: Add deps to fix build Since commit 53c6c2d, that class was failing the test build. Add the missing dependencies to the BUILD file for this V6 case, similar to what was already done for V7. Change-Id: I67ffead6daaeeaec19944b89c3e0b9b830d5b593 --- javatests/com/google/gerrit/elasticsearch/BUILD | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD index 328c791be8..b5378a4e93 100644 --- a/javatests/com/google/gerrit/elasticsearch/BUILD +++ b/javatests/com/google/gerrit/elasticsearch/BUILD @@ -31,6 +31,11 @@ ELASTICSEARCH_DEPS = [ "//lib/jgit/org.eclipse.jgit:jgit", ] +HTTP_TEST_DEPS = [ + "//lib/httpcomponents:httpasyncclient", + "//lib/httpcomponents:httpclient", +] + QUERY_TESTS_DEP = "//javatests/com/google/gerrit/server/query/%s:abstract_query_tests" TYPES = [ @@ -67,7 +72,7 @@ ELASTICSEARCH_TAGS = [ size = "large", srcs = [src], tags = ELASTICSEARCH_TAGS, - deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name], + deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + HTTP_TEST_DEPS, ) for name, src in ELASTICSEARCH_TESTS_V6.items()] [junit_tests( @@ -75,10 +80,7 @@ ELASTICSEARCH_TAGS = [ size = "large", srcs = [src], tags = ELASTICSEARCH_TAGS, - deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + [ - "//lib/httpcomponents:httpasyncclient", - "//lib/httpcomponents:httpclient", - ], + deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + HTTP_TEST_DEPS, ) for name, src in ELASTICSEARCH_TESTS_V7.items()] junit_tests( From f3580232936b311ad9dda6dadc208a3a29b63ee3 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 5 Dec 2019 08:45:31 +0900 Subject: [PATCH 2/3] Update replication plugin to get fixes for IT flakiness 84d5082 ReplicationIT: Increase timeout for tests a35edff ReplicationIT: Retry/timeout on assertion of replication tasks count Bug: Issue 11843 Change-Id: I1e35f2c981ef88000ed6094fa887998cff599560 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index 5e3cbc8e7e..84d508247c 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 5e3cbc8e7e45172790e777ec0576b08b65934b09 +Subproject commit 84d508247c619b9e1871d7ce47517334bb0240c1 From d490398d02b34c6be4fe0bd5bfbbb06dea3dcb96 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 5 Dec 2019 09:27:30 +0900 Subject: [PATCH 3/3] Upgrade JGit to v5.6.0.201912041214-rc1 Include the following changes: a7e454bc5 - JGit v5.6.0.201912041214-rc1 4ea42bc81 - Prepare 5.6.0-SNAPSHOT builds 6c9aa82f7 - JGit v5.6.0.201911271000-m3 5897bc430 - ReceivePack: Open visibility for some methods 533a81db9 - JGit pgm: Format blame output to match canonical git 59f9d206c - Make blame work correctly on merge conflicts 7554bdfad - Bazel: Use java_plugin and java_binary from @rules_java in jmh.bzl 2c5ed560c - Bazel: Add missing newlines at end of BUILD files 8041b71c7 - Upgrade maven-enforcer-plugin to 3.0.0-M3 ffb979bef - Add missing license header to ReftableDatabase 3e01123a5 - Add missing license header to UploadPackRefSortingForReachabilityTest 3d4c95293 - [spotbugs] Fix potential NPE in FSTest 74487ffa1 - Remove unused import in CreateFileSnapshotBenchmark 9cb8e2f31 - RepositoryCache: don't require HEAD in git repositories e0744891f - FileRepository: cleanup refs outside refs/ on reftable conversion fd51cd159 - Update Orbit to S20191118194249 for 2019-12 M3 75038afc8 - Silence API error for new method in ReachabilityChecker f2ccc4213 - UploadPackTest: Fix unused parameter in checkUnadvertisedIfUnallowed f5f5c80bf - BitmappedReachabilityChecker: Use only one bitmap for the whole check 989a927a5 - checkNotAdvertisedWants: Be lazy converting Ref to RevCommit a0204a472 - ReachabilityChecker: Receive a Stream instead of a Collection 2ff0c0aba - UploadPack: Prioritize references for non-advertised wants checks fa1566f40 - ReceivePack: Fix name hiding of 'atomic' member e9c21fca5 - ReceivePack: Remove unnecessarily nested else-clause f8e60ce1c - Simplify comparator code 8fcba48b7 - Fix typo in Javadoc 0356613f4 - pgm: add write stats to BenchmarkReftable a8f4bf6ab - pgm: add command to convert repo to reftable 38586d54d - file: implement FileReftableDatabase 7b73d5eec - Fix Maven missing version warning 7ab7ec00c - Use Java 8 source and target in Maven a6bdcace3 - ReceivePack: Reduce visibility of methods 830e7bf67 - Suppress API error raised for constant added in 345e2648 cb85f7be8 - TopoSortGenerator: simplify first-parent handling 1daf6f13a - RewriteGenerator: avoid adding null parent 345e2648d - DiffFormatter: support core.quotePath = false a227dc3ba - IndexDiff/SubmoduleWalk: make the RepositoryBuilder configurable 7a3b93cbe - IndexDiff/SubmoduleWalk: handle submodule..ignore correctly 63fba337b - Run Eclipse formatter on BatchRefUpdateTest 74bfec411 - Move KetchSystem.delay to FileUtils. Change-Id: I82d728f4583e7c6b85643ebdc008e4a161c2e781 --- modules/jgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jgit b/modules/jgit index 63fc6970cc..a7e454bc51 160000 --- a/modules/jgit +++ b/modules/jgit @@ -1 +1 @@ -Subproject commit 63fc6970cc51b712608d93e7cba0b85bb559ac52 +Subproject commit a7e454bc51d359c2d46b19fd559f770cad8fd7d4