Merge branch 'stable-5.4' into stable-5.5

* stable-5.4:
  Fix API problem filters
  Fix unclosed resource warning in SmartOutputStream
  JschConfigSessionFactory: fix boxing warning
  SshSupport#runSshCommand: don't throw exception in finally block
  Don't override already managed maven-compiler-plugin version
  Remove unused import from CreateFileSnapshotBenchmark
  Remove duplicate ignore_optional_problems entry in .classpath
  Update maven-site-plugin used by benchmark module to 3.8.2
  Add dependency to enable site generation for benchmark module
  Ignore warnings for generated source code in
org.eclipse.jgit.benchmark
  Fix MBean registration
  Enhance WindowCache statistics

Change-Id: I78902d5feecb2c09134b64ec2f3b48b2c3bab37d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

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

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

diff --cc org.eclipse.jgit/.settings/.api_filters
index 2d520817603e077c474e0f4383cb332e6a9dae1b,7930b135be3a4d1e574c67b1ba8118fea85fc1c0..58ec3cb4186910c0d8eaba3bf1f350f0a2e2c646
--- 1/org.eclipse.jgit/.settings/.api_filters
--- 2/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -73,6 -84,121 +79,15 @@@
              </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="org.eclipse.jgit.storage.pack.PackConfig"/>
 -                <message_argument value="DEFAULT_MINSIZE_PREVENT_RACY_PACK"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.storage.pack.PackConfig"/>
 -                <message_argument value="DEFAULT_WAIT_PREVENT_RACY_PACK"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.1.8"/>
 -                <message_argument value="DEFAULT_MINSIZE_PREVENT_RACY_PACK"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.1.8"/>
 -                <message_argument value="DEFAULT_WAIT_PREVENT_RACY_PACK"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.1.8"/>
 -                <message_argument value="doWaitPreventRacyPack(long)"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.1.8"/>
 -                <message_argument value="getMinSizePreventRacyPack()"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.1.8"/>
 -                <message_argument value="isWaitPreventRacyPack()"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.1.8"/>
 -                <message_argument value="setMinSizePreventRacyPack(long)"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.1.8"/>
 -                <message_argument value="setWaitPreventRacyPack(boolean)"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/storage/pack/PackStatistics.java" type="org.eclipse.jgit.storage.pack.PackStatistics$Accumulator">
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.storage.pack.PackStatistics.Accumulator"/>
 -                <message_argument value="treesTraversed"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/transport/HttpConfig.java" type="org.eclipse.jgit.transport.HttpConfig">
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.HttpConfig"/>
 -                <message_argument value="COOKIE_FILE_CACHE_LIMIT_KEY"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.HttpConfig"/>
 -                <message_argument value="COOKIE_FILE_KEY"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.HttpConfig"/>
 -                <message_argument value="SAVE_COOKIES_KEY"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/transport/Transport.java" type="org.eclipse.jgit.transport.Transport">
 -        <filter id="421654647">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.Transport"/>
 -                <message_argument value="getFilterBlobLimit()"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="421654647">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.Transport"/>
 -                <message_argument value="setFilterBlobLimit(long)"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/transport/UploadPack.java" type="org.eclipse.jgit.transport.UploadPack">
 -        <filter id="421654647">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.UploadPack"/>
 -                <message_argument value="getFilterBlobLimit()"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
+     <resource path="src/org/eclipse/jgit/storage/file/WindowCacheStats.java" type="org.eclipse.jgit.storage.file.WindowCacheStats">
+         <filter id="337809484">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.storage.file.WindowCacheStats"/>
+                 <message_argument value="4"/>
+                 <message_argument value="8"/>
+             </message_arguments>
+         </filter>
+     </resource>
      <resource path="src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java" type="org.eclipse.jgit.treewalk.WorkingTreeIterator">
          <filter id="1142947843">
              <message_arguments>
@@@ -149,15 -269,42 +164,23 @@@
              </message_arguments>
          </filter>
      </resource>
 -    <resource path="src/org/eclipse/jgit/util/FileUtils.java" type="org.eclipse.jgit.util.FileUtils">
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.1.8"/>
 -                <message_argument value="touch(Path)"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/util/HttpSupport.java" type="org.eclipse.jgit.util.HttpSupport">
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.util.HttpSupport"/>
 -                <message_argument value="HDR_COOKIE"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.util.HttpSupport"/>
 -                <message_argument value="HDR_SET_COOKIE"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.util.HttpSupport"/>
 -                <message_argument value="HDR_SET_COOKIE2"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
+     <resource path="src/org/eclipse/jgit/util/Monitoring.java" type="org.eclipse.jgit.util.Monitoring">
+         <filter id="1109393411">
+             <message_arguments>
+                 <message_argument value="5.1.13"/>
+                 <message_argument value="org.eclipse.jgit.util.Monitoring"/>
+             </message_arguments>
+         </filter>
+     </resource>
 +    <resource path="src/org/eclipse/jgit/util/References.java" type="org.eclipse.jgit.util.References">
 +        <filter id="1108344834">
 +            <message_arguments>
 +                <message_argument value="5.4"/>
 +                <message_argument value="5.5"/>
 +                <message_argument value="org.eclipse.jgit.util.References"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
      <resource path="src/org/eclipse/jgit/util/SimpleLruCache.java" type="org.eclipse.jgit.util.SimpleLruCache">
          <filter id="1109393411">
              <message_arguments>

diff --cc pom.xml
Simple merge