]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.3' into stable-5.4 36/155536/1
authorMatthias Sohn <matthias.sohn@sap.com>
Thu, 9 Jan 2020 10:38:28 +0000 (11:38 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 9 Jan 2020 10:38:28 +0000 (11:38 +0100)
* stable-5.3:
  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: I1b560b36d169cfa02cc5450ad0fa0bd85f9f42d8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
org.eclipse.jgit.benchmarks/pom.xml
org.eclipse.jgit.packaging/pom.xml
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
pom.xml

Simple merge
Simple merge
index 842fc873d4fd23437580177a2dab070f57b9b04e,abdf35004453db23256a0ac62238c7bfdff1ec57..7930b135be3a4d1e574c67b1ba8118fea85fc1c0
              </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/SimpleLruCache.java" type="org.eclipse.jgit.util.SimpleLruCache">
          <filter id="1109393411">
              <message_arguments>
diff --cc pom.xml
Simple merge