Merge branch 'stable-6.0' into stable-6.1

* stable-6.0:
  Silence API errors
  Silence API warnings

Change-Id: I2b8336652e60dec97666582cf9331c8505729473

diff --cc org.eclipse.jgit.http.server/.settings/.api_filters
index 2c32c9864b9c2060309b8f5b4056412927391e79,951a53bf383cd795982c7b0c804e4de30d236ef0..116c7eab91b330ce081177a7e3af92c45eff4a0d
--- 1/org.eclipse.jgit.http.server/.settings/.api_filters
--- 2/org.eclipse.jgit.http.server/.settings/.api_filters
+++ b/org.eclipse.jgit.http.server/.settings/.api_filters
@@@ -1,11 -1,17 +1,25 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <component id="org.eclipse.jgit.http.server" version="2">
 +    <resource path="src/org/eclipse/jgit/http/server/UploadPackErrorHandler.java" type="org.eclipse.jgit.http.server.UploadPackErrorHandler">
 +        <filter id="1210056707">
 +            <message_arguments>
 +                <message_argument value="6.1.1"/>
 +                <message_argument value="statusCodeForThrowable(Throwable)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
+     <resource path="src/org/eclipse/jgit/http/server/GitServlet.java" type="org.eclipse.jgit.http.server.GitServlet">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.9.1"/>
+                 <message_argument value="setReceivePackErrorHandler(ReceivePackErrorHandler)"/>
+             </message_arguments>
+         </filter>
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.9.1"/>
+                 <message_argument value="setUploadPackErrorHandler(UploadPackErrorHandler)"/>
+             </message_arguments>
+         </filter>
+     </resource>
  </component>

diff --cc org.eclipse.jgit/.settings/.api_filters
index 00b89a4b3d5fb755b5f5310b9be2e551b4a0408e,d9840c700a006d3bdcd477ae1ea7173ee79a404d..f97f5d7d7cc628716de2ad1ebfefbac6ab066da3
--- 1/org.eclipse.jgit/.settings/.api_filters
--- 2/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,78 -1,113 +1,179 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <component id="org.eclipse.jgit" version="2">
      <resource path="src/org/eclipse/jgit/errors/NoRemoteRepositoryException.java" type="org.eclipse.jgit.errors.NoRemoteRepositoryException">
-         <filter id="1141899266">
+         <filter id="1142947843">
              <message_arguments>
+                 <message_argument value="5.13.1"/>
 +                <message_argument value="5.13"/>
 +                <message_argument value="6.1"/>
                  <message_argument value="NoRemoteRepositoryException(URIish, String, Throwable)"/>
              </message_arguments>
          </filter>
      </resource>
 -                <message_argument value="5.13"/>
 -                <message_argument value="6.0"/>
+     <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.13.2"/>
+                 <message_argument value="SHA1_IMPLEMENTATION"/>
+             </message_arguments>
+         </filter>
+     </resource>
+     <resource path="src/org/eclipse/jgit/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig">
+         <filter id="336658481">
+             <message_arguments>
+                 <message_argument value="NoRemoteRepositoryException(URIish, String, Throwable)"/>
+             </message_arguments>
+         </filter>
+     </resource>
 +    <resource path="src/org/eclipse/jgit/lib/TypedConfigGetter.java" type="org.eclipse.jgit.lib.TypedConfigGetter">
 +        <filter id="403767336">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/>
 +                <message_argument value="UNSET_INT"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="403804204">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/>
 +                <message_argument value="getIntInRange(Config, String, String, String, int, int, int)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/lib/ObjectDatabase.java" type="org.eclipse.jgit.lib.ObjectDatabase">
 +        <filter id="336695337">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.lib.ObjectDatabase"/>
 +                <message_argument value="getApproximateObjectCount()"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/lib/TypedConfigGetter.java" type="org.eclipse.jgit.lib.TypedConfigGetter">
 +        <filter id="403804204">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/>
 +                <message_argument value="getIntInRange(Config, String, String, String, int, int, int)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
 +        <filter id="338792546">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
 +                <message_argument value="addCheckoutMetadata(String, Attributes)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="338792546">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
 +                <message_argument value="addToCheckout(String, DirCacheEntry, Attributes)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="338792546">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
 +                <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean, Attributes)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/transport/BasePackPushConnection.java" type="org.eclipse.jgit.transport.BasePackPushConnection">
 +        <filter id="338792546">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.transport.BasePackPushConnection"/>
 +                <message_argument value="noRepository()"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/transport/PushConfig.java" type="org.eclipse.jgit.transport.PushConfig">
 +        <filter id="338722907">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.transport.PushConfig"/>
 +                <message_argument value="PushConfig()"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
+     <resource path="src/org/eclipse/jgit/transport/AwsRequestSignerV4.java" type="org.eclipse.jgit.transport.AwsRequestSignerV4">
+         <filter id="1109393411">
+             <message_arguments>
+                 <message_argument value="5.13.1"/>
+                 <message_argument value="org.eclipse.jgit.transport.AwsRequestSignerV4"/>
+             </message_arguments>
+         </filter>
+     </resource>
+     <resource path="src/org/eclipse/jgit/util/HttpSupport.java" type="org.eclipse.jgit.util.HttpSupport">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.13.1"/>
+                 <message_argument value="urlEncode(String, boolean)"/>
+             </message_arguments>
+         </filter>
+     </resource>
+     <resource path="src/org/eclipse/jgit/util/sha1/SHA1.java" type="org.eclipse.jgit.util.sha1.SHA1">
+         <filter id="337764418">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="digest()"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="digest(MutableObjectId)"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="hasCollision()"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="reset()"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="setDetectCollision(boolean)"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="toObjectId()"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="update(byte)"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="update(byte[])"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="update(byte[], int, int)"/>
+             </message_arguments>
+         </filter>
+     </resource>
+     <resource path="src/org/eclipse/jgit/util/sha1/SHA1.java" type="org.eclipse.jgit.util.sha1.SHA1$Sha1Implementation">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.13.2"/>
+                 <message_argument value="Sha1Implementation"/>
+             </message_arguments>
+         </filter>
+     </resource>
  </component>