Merge branch 'stable-5.6'

* stable-5.6:
  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: I4a77c602bfffed60535d0b8fc251a552b128068d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --cc org.eclipse.jgit.benchmarks/.classpath
index 8b345f223736d83b99c547390cf5b29e2c259a74,438d155e3184d4a4ce77f8d66407a4f927b7c0d0..94b727df070668d9ee71a40aa04ff28df48c0199
--- 1/org.eclipse.jgit.benchmarks/.classpath
--- 2/org.eclipse.jgit.benchmarks/.classpath
+++ b/org.eclipse.jgit.benchmarks/.classpath
@@@ -22,4 -33,4 +33,4 @@@
                </attributes>
        </classpathentry>
        <classpathentry kind="output" path="target/classes"/>
--</classpath>
++</classpath>

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

diff --cc org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/SmartOutputStream.java
Simple merge

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

diff --cc org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/WindowCacheGetTest.java
Simple merge

diff --cc org.eclipse.jgit/.settings/.api_filters
index 4e6e5ad0ce981ee59f6f5cc2c6ff04a6a1a4cd8b,2a71030e210af49cb3f91982b39302a4de8fa177..8eb127c68828f5d7e909b20c816299e5b7438ff9
--- 1/org.eclipse.jgit/.settings/.api_filters
--- 2/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,11 -1,159 +1,36 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <component id="org.eclipse.jgit" version="2">
 -    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.jgit.transport.BaseReceivePack">
 -        <filter id="305324134">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/>
 -                <message_argument value="org.eclipse.jgit_5.6.1"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/lib/Config.java" type="org.eclipse.jgit.lib.Config">
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.5.2"/>
 -                <message_argument value="getBaseConfig()"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
+     <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.1.13"/>
+                 <message_argument value="CONFIG_JMX_SECTION"/>
+             </message_arguments>
+         </filter>
+     </resource>
 -    <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.5.2"/>
 -                <message_argument value="XDG_CONFIG_HOME"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/revwalk/ReachabilityChecker.java" type="org.eclipse.jgit.revwalk.ReachabilityChecker">
 -        <filter id="403804204">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.revwalk.ReachabilityChecker"/>
 -                <message_argument value="areAllReachable(Collection&lt;RevCommit&gt;, Stream&lt;RevCommit&gt;)"/>
 -            </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/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="offloadedPackfileSize"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.storage.pack.PackStatistics.Accumulator"/>
 -                <message_argument value="offloadedPackfiles"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/transport/AbstractAdvertiseRefsHook.java" type="org.eclipse.jgit.transport.AbstractAdvertiseRefsHook">
 -        <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338792546">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.AbstractAdvertiseRefsHook"/>
 -                <message_argument value="advertiseRefs(BaseReceivePack)"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/transport/AdvertiseRefsHook.java" type="org.eclipse.jgit.transport.AdvertiseRefsHook">
 -        <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="403804204">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.AdvertiseRefsHook"/>
 -                <message_argument value="advertiseRefs(ReceivePack)"/>
 -            </message_arguments>
 -        </filter>
 -        <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="405901410">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.AdvertiseRefsHook"/>
 -                <message_argument value="advertiseRefs(BaseReceivePack)"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/transport/AdvertiseRefsHookChain.java" type="org.eclipse.jgit.transport.AdvertiseRefsHookChain">
 -        <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338792546">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.AdvertiseRefsHookChain"/>
 -                <message_argument value="advertiseRefs(BaseReceivePack)"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/transport/ReceiveCommand.java" type="org.eclipse.jgit.transport.ReceiveCommand">
 -        <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338792546">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.ReceiveCommand"/>
 -                <message_argument value="execute(BaseReceivePack)"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
      <resource path="src/org/eclipse/jgit/transport/ReceivePack.java" type="org.eclipse.jgit.transport.ReceivePack">
 -        <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338792546">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.ReceivePack"/>
 -                <message_argument value="getLockMessageProcessName()"/>
 -            </message_arguments>
 -        </filter>
 -        <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338849923">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.ReceivePack"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="421572723">
 +        <filter id="336658481">
              <message_arguments>
                  <message_argument value="org.eclipse.jgit.transport.ReceivePack"/>
 -                <message_argument value="enableCapabilities()"/>
 +                <message_argument value="connectivityChecker"/>
              </message_arguments>
          </filter>
      </resource>
 -    <resource path="src/org/eclipse/jgit/util/QuotedString.java" type="org.eclipse.jgit.util.QuotedString">
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.util.QuotedString"/>
 -                <message_argument value="GIT_PATH_MINIMAL"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/util/SystemReader.java" type="org.eclipse.jgit.util.SystemReader">
 -        <filter id="336695337">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.util.SystemReader"/>
 -                <message_argument value="openJGitConfig(Config, FS)"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.5.2"/>
 -                <message_argument value="getJGitConfig()"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.5.2"/>
 -                <message_argument value="openJGitConfig(Config, FS)"/>
 -            </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>
  </component>

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
index a5cf2ff6b4024f04c144befd868df425b56890f4,b9af817213958a3a11a87b48e02169087c46dc99..c79455a54055fb75211741c49df4a58540f5cb17
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
@@@ -474,27 -508,9 +474,33 @@@ public final class ConfigConstants 
         */
        public static final String CONFIG_KEY_MIN_RACY_THRESHOLD = "minRacyThreshold";
  
 +      /**
 +       * The "extensions" section
 +       * @since 5.7
 +       */
 +      public static final String CONFIG_EXTENSIONS_SECTION = "extensions";
 +
 +      /**
 +       * The extensions.refStorage key
 +       * @since 5.7
 +       */
 +      public static final String CONFIG_KEY_REFSTORAGE = "refStorage";
 +
 +      /**
 +       * The "reftable" refStorage format
 +       * @since 5.7
 +       */
 +      public static final String CONFIG_REFSTORAGE_REFTABLE = "reftable";
 +
 +      /**
 +       * The "reftree" refStorage format
 +       * @since 5.7
 +       */
 +      public static final String CONFIG_REFSTORAGE_REFTREE = "reftree";
++
+       /**
+        * The "jmx" section
+        * @since 5.1.13
+        */
+       public static final String CONFIG_JMX_SECTION = "jmx";
  }

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheStats.java
index f886d96c76b49d9fd8ee01b54df7c063789757c7,b7f6394df684bec4b63adc4a9f6e23eb506731fc..2c97659055fd2acd21d80820a8cb15e548aaea75
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheStats.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheStats.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheStats.java
@@@ -1,15 -1,49 +1,16 @@@
  /*
 - * Copyright (C) 2018, David Pursehouse <david.pursehouse@gmail.com>
 - * and other copyright owners as documented in the project's IP log.
 + * Copyright (C) 2018, David Pursehouse <david.pursehouse@gmail.com> and others
   *
 - * This program and the accompanying materials are made available
 - * under the terms of the Eclipse Distribution License v1.0 which
 - * accompanies this distribution, is reproduced below, and is
 - * available at http://www.eclipse.org/org/documents/edl-v10.php
 + * This program and the accompanying materials are made available under the
 + * terms of the Eclipse Distribution License v. 1.0 which is available at
 + * https://www.eclipse.org/org/documents/edl-v10.php.
   *
 - * All rights reserved.
 - *
 - * Redistribution and use in source and binary forms, with or
 - * without modification, are permitted provided that the following
 - * conditions are met:
 - *
 - * - Redistributions of source code must retain the above copyright
 - *   notice, this list of conditions and the following disclaimer.
 - *
 - * - Redistributions in binary form must reproduce the above
 - *   copyright notice, this list of conditions and the following
 - *   disclaimer in the documentation and/or other materials provided
 - *   with the distribution.
 - *
 - * - Neither the name of the Eclipse Foundation, Inc. nor the
 - *   names of its contributors may be used to endorse or promote
 - *   products derived from this software without specific prior
 - *   written permission.
 - *
 - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
 - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
 - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 + * SPDX-License-Identifier: BSD-3-Clause
   */
- 
  package org.eclipse.jgit.storage.file;
  
+ import javax.management.MXBean;
+ 
  import org.eclipse.jgit.internal.storage.file.WindowCache;
  
  /**

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/util/SshSupport.java
Simple merge

diff --cc pom.xml
Simple merge