From: Matthias Sohn <matthias.sohn@sap.com>
Date: Mon, 24 Dec 2018 23:49:46 +0000 (+0100)
Subject: Merge branch 'stable-4.10' into stable-4.11
X-Git-Tag: v4.11.6.201812241910-r~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F52%2F134452%2F3;p=jgit.git

Merge branch 'stable-4.10' into stable-4.11

* stable-4.10:
  Prepare 4.9.9-SNAPSHOT builds
  JGit v4.9.8.201812241815-r
  UploadPack: Test filtering by AdvertiseRefsHook in stateless transports
  Prepare 4.7.8-SNAPSHOT builds
  JGit v4.7.7.201812240805-r
  Fix feature versions imported by feature org.eclipse.jgit.pgm
  Prepare 4.5.6-SNAPSHOT builds
  JGit v4.5.5.201812240535-r
  Call AdvertiseRefsHook before validating wants

Change-Id: I937e9a4547fc10e4de7c887163022d1ab0322d64
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---

affbb99271b7307c2e30795b561fb08a850f56c1
diff --cc org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 5af6bd7275,9d5e805f8d..390b8cccef
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@@ -25,26 -25,28 +25,28 @@@ 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="[4.10.1,4.11.0)",
 - org.eclipse.jgit.http.server;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.http.server.glue;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.http.server.resolver;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.internal;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.internal.storage.dfs;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.internal.storage.file;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.internal.storage.reftable;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.junit;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.junit.http;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.lib;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.nls;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.revwalk;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.storage.file;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.transport;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.transport.http;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.transport.http.apache;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.transport.resolver;version="[4.10.1,4.11.0)",
 - org.eclipse.jgit.util;version="[4.10.1,4.11.0)",
 + org.eclipse.jgit.errors;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.http.server;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.http.server.glue;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.http.server.resolver;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.internal;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.internal.storage.dfs;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.internal.storage.file;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.internal.storage.reftable;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.junit;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.junit.http;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.lib;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.nls;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.revwalk;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.storage.file;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.transport;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.transport.http;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.transport.http.apache;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.transport.resolver;version="[4.11.6,4.12.0)",
 + org.eclipse.jgit.util;version="[4.11.6,4.12.0)",
   org.hamcrest.core;version="[1.1.0,2.0.0)",
   org.junit;version="[4.12,5.0.0)",
+  org.junit.rules;version="[4.12,5.0.0)",
   org.junit.runner;version="[4.12,5.0.0)",
   org.junit.runners;version="[4.12,5.0.0)"
+ Require-Bundle: org.hamcrest.library;bundle-version="[1.1.0,2.0.0)"
diff --cc org.eclipse.jgit/.settings/.api_filters
index eb2ed7dabb,d30eafebbc..117e1f9e6f
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -3,10 -3,10 +3,16 @@@
      <resource path="META-INF/MANIFEST.MF">
          <filter id="924844039">
              <message_arguments>
 -                <message_argument value="4.10.1"/>
 -                <message_argument value="4.10.0"/>
 +                <message_argument value="4.11.2"/>
 +                <message_argument value="4.11.0"/>
 +            </message_arguments>
 +        </filter>
++        <filter id="924844039">
++            <message_arguments>
++                <message_argument value="4.11.6"/>
++                <message_argument value="4.11.0"/>
+             </message_arguments>
+         </filter>
      </resource>
      <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
          <filter id="1141899266">