From: Matthias Sohn <matthias.sohn@sap.com>
Date: Wed, 16 Nov 2022 09:15:30 +0000 (+0100)
Subject: Merge branch 'stable-6.3'
X-Git-Tag: v6.4.0.202211160543-m3~1^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0fb9d26eff27f3843a389e3b41e8331fee412a6c;p=jgit.git

Merge branch 'stable-6.3'

* stable-6.3:
  [benchmarks] Remove profiler configuration
  Add SHA1 benchmark
  [benchmarks] Set version of maven-compiler-plugin to 3.8.1
  Fix running JMH benchmarks
  Add option to allow using JDK's SHA1 implementation
  Fix API breakage caused by extracting WorkTreeUpdater
  Extract Exception -> HTTP status code mapping for reuse
  Don't handle internal git errors as an HTTP error
  Ignore IllegalStateException if JVM is already shutting down
  Allow to perform PackedBatchRefUpdate without locking loose refs

Change-Id: Ib58879be292c54a2a7f4936ac0986997985c822b
---

0fb9d26eff27f3843a389e3b41e8331fee412a6c
diff --cc org.eclipse.jgit/.settings/.api_filters
index 6992fa9148,1683f33d0c..0000000000
deleted file mode 100644,100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ /dev/null
@@@ -1,11 -1,28 +1,0 @@@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
--<component id="org.eclipse.jgit" version="2">
-     <resource path="src/org/eclipse/jgit/transport/Transport.java" type="org.eclipse.jgit.transport.Transport">
-         <filter id="336658481">
 -    <resource path="src/org/eclipse/jgit/transport/AwsRequestSignerV4.java" type="org.eclipse.jgit.transport.AwsRequestSignerV4">
 -        <filter id="1108344834">
--            <message_arguments>
-                 <message_argument value="org.eclipse.jgit.transport.Transport"/>
-                 <message_argument value="DEFAULT_PUSH_USE_BITMAPS"/>
 -                <message_argument value="5.13"/>
 -                <message_argument value="6.3"/>
 -                <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="1141899266">
 -            <message_arguments>
 -                <message_argument value="5.13"/>
 -                <message_argument value="6.3"/>
 -                <message_argument value="urlEncode(String, boolean)"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/util/Paths.java" type="org.eclipse.jgit.util.Paths">
 -        <filter id="337768515">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.util.Paths"/>
--            </message_arguments>
--        </filter>
--    </resource>
--</component>