From: Matthias Sohn Date: Thu, 9 Jan 2020 15:50:13 +0000 (+0100) Subject: Merge branch 'stable-5.6' X-Git-Tag: v5.7.0.202001151323-m1~4 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=db019c473edcf8cc96456f8c4ac07e42a7d2eefa;p=jgit.git 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 --- db019c473edcf8cc96456f8c4ac07e42a7d2eefa diff --cc org.eclipse.jgit.benchmarks/.classpath index 8b345f2237,438d155e31..94b727df07 --- a/org.eclipse.jgit.benchmarks/.classpath +++ b/org.eclipse.jgit.benchmarks/.classpath @@@ -22,4 -33,4 +33,4 @@@ -- ++ diff --cc org.eclipse.jgit/.settings/.api_filters index 4e6e5ad0ce,2a71030e21..8eb127c688 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@@ -1,11 -1,159 +1,36 @@@ - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --cc org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index a5cf2ff6b4,b9af817213..c79455a540 --- a/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 f886d96c76,b7f6394df6..2c97659055 --- a/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 - * and other copyright owners as documented in the project's IP log. + * Copyright (C) 2018, David Pursehouse 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; /**