Merge branch 'stable-5.0'

* stable-5.0:
  Teach UploadPack "filter" in protocol v2 fetch
  Refactor test of capabilities output
  Refactor v2 advertisement into own function
  Refactor parsing of "filter" into its own method
  Disallow unknown args to "fetch" in protocol v2
  Teach UploadPack shallow fetch in protocol v2
  Refactor unshallowCommits to local variable
  Add protocol v2 support in http
  Give info/refs services more control over response

Change-Id: I1683902222e076e1091795e94790a264550afb7b
Signed-off-by: Jonathan Nieder <jrn@google.com>

diff --cc org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 446e353031e5a917c2b44e97dec7455b57c3264a,e7795eb5060cb9d2698acb76cb66827bc7a6678d..0bb805051507aeb30c61b0a0d72aa5aef17800cf
--- 1/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@@ -25,25 -25,26 +25,26 @@@ Import-Package: javax.servlet;version="
   org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
   org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
   org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
 - org.eclipse.jgit.errors;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.http.server;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.http.server.glue;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.http.server.resolver;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.internal;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.internal.storage.dfs;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.internal.storage.file;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.internal.storage.reftable;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.junit;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.junit.http;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.lib;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.nls;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.revwalk;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.storage.file;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.transport;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.transport.http;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.transport.http.apache;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.transport.resolver;version="[5.0.0,5.1.0)",
 - org.eclipse.jgit.util;version="[5.0.0,5.1.0)",
 + org.eclipse.jgit.errors;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.http.server;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.http.server.glue;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.http.server.resolver;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.internal;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.internal.storage.dfs;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.internal.storage.file;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.internal.storage.reftable;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.junit;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.junit.http;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.lib;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.nls;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.revwalk;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.storage.file;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.transport;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.transport.http;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.transport.http.apache;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.transport.resolver;version="[5.1.0,5.2.0)",
 + org.eclipse.jgit.util;version="[5.1.0,5.2.0)",
+  org.hamcrest;version="[1.1.0,2.0.0)",
   org.hamcrest.core;version="[1.1.0,2.0.0)",
   org.junit;version="[4.12,5.0.0)",
   org.junit.runner;version="[4.12,5.0.0)",

diff --cc org.eclipse.jgit.http.test/pom.xml
Simple merge