]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.13' into stable-6.0 23/201423/1
authorMatthias Sohn <matthias.sohn@sap.com>
Thu, 20 Apr 2023 14:01:33 +0000 (16:01 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 20 Apr 2023 22:09:10 +0000 (00:09 +0200)
* stable-5.13:
  Add missing since tag for SshBasicTestBase
  Add missing since tag for SshTestHarness#publicKey2
  Silence API errors
  Prevent infinite loop rescanning the pack list on
PackMismatchException
  Remove blank in maven.config

Change-Id: Id37bee59ca3c7947604c54b6d4e7c02628a657fe

1  2 
org.eclipse.jgit/.settings/.api_filters

index 159736e7b8cda13add3e929dd68758efe68741b3,1d3917173b960a9863a9bc5a4f3c8dc45eee3133..fd91431feb961dc4a236fbd38b5d08af2ced90a2
@@@ -1,13 -1,19 +1,27 @@@
  <?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="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.1"/>
 +                <message_argument value="NoRemoteRepositoryException(URIish, String, Throwable)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
+     <resource path="src/org/eclipse/jgit/errors/PackMismatchException.java" type="org.eclipse.jgit.errors.PackMismatchException">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.9.1"/>
+                 <message_argument value="isPermanent()"/>
+             </message_arguments>
+         </filter>
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.9.1"/>
+                 <message_argument value="setPermanent(boolean)"/>
+             </message_arguments>
+         </filter>
+     </resource>
      <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
          <filter id="1142947843">
              <message_arguments>