Merge branch 'stable-6.3'

* stable-6.3:
  Remove unused imports
  Suppress non-externalized String warnings
  Remove unused API problem filters
  Silence API errors
  Silence API errors
  Silence API warnings

Change-Id: I6778c8266bc7e918c943dcabf23aa230f4e998d5
This commit is contained in:
Matthias Sohn 2022-11-20 20:24:14 +01:00
commit fe3908076e
8 changed files with 17 additions and 18 deletions

View File

@ -9,6 +9,8 @@
*/ */
package org.eclipse.jgit.benchmarks; package org.eclipse.jgit.benchmarks;
import static org.eclipse.jgit.transport.ReceiveCommand.Type.CREATE;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -23,7 +25,14 @@
import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.lib.*; import org.eclipse.jgit.lib.BatchRefUpdate;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryCache;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.lib.TextProgressMonitor;
import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.transport.ReceiveCommand; import org.eclipse.jgit.transport.ReceiveCommand;
@ -46,8 +55,6 @@
import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.Options;
import org.openjdk.jmh.runner.options.OptionsBuilder; import org.openjdk.jmh.runner.options.OptionsBuilder;
import static org.eclipse.jgit.transport.ReceiveCommand.Type.CREATE;
@State(Scope.Thread) @State(Scope.Thread)
public class GetRefsBenchmark { public class GetRefsBenchmark {

View File

@ -24,7 +24,6 @@
import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown; import org.openjdk.jmh.annotations.TearDown;
import org.openjdk.jmh.profile.StackProfiler;
import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.Runner;
import org.openjdk.jmh.runner.RunnerException; import org.openjdk.jmh.runner.RunnerException;
import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.Options;

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jgit.http.server" version="2">
<resource path="src/org/eclipse/jgit/http/server/UploadPackErrorHandler.java" type="org.eclipse.jgit.http.server.UploadPackErrorHandler">
<filter id="1210056707">
<message_arguments>
<message_argument value="6.1.1"/>
<message_argument value="statusCodeForThrowable(Throwable)"/>
</message_arguments>
</filter>
</resource>
</component>

View File

@ -87,6 +87,8 @@ public abstract class LocalDiskRepositoryTestCase {
/** /**
* The current test name. * The current test name.
*
* @since 6.0.1
*/ */
@Rule @Rule
public TestName currentTest = new TestName(); public TestName currentTest = new TestName();

View File

@ -39,7 +39,7 @@ public NoRemoteRepositoryException(URIish uri, String s) {
* message * message
* @param cause * @param cause
* root cause exception * root cause exception
* @since 5.13 * @since 5.13.1
*/ */
public NoRemoteRepositoryException(URIish uri, String s, Throwable cause) { public NoRemoteRepositoryException(URIish uri, String s, Throwable cause) {
super(uri, s, cause); super(uri, s, cause);

View File

@ -40,7 +40,7 @@
* "https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html">AWS * "https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html">AWS
* Signature Version 4</a> * Signature Version 4</a>
* *
* @since 5.13 * @since 5.13.1
*/ */
public final class AwsRequestSignerV4 { public final class AwsRequestSignerV4 {

View File

@ -196,7 +196,7 @@ public static void encode(StringBuilder urlstr, String key) {
* them to "%2F"). * them to "%2F").
* *
* @return The translated URL. * @return The translated URL.
* @since 5.13 * @since 5.13.1
*/ */
public static String urlEncode(String url, boolean keepPathSlash) { public static String urlEncode(String url, boolean keepPathSlash) {
String encoded; String encoded;

View File

@ -27,6 +27,8 @@
public abstract class SHA1 { public abstract class SHA1 {
/** /**
* SHA1 implementations available in JGit * SHA1 implementations available in JGit
*
* @since 5.13.2
*/ */
public enum Sha1Implementation { public enum Sha1Implementation {
/** /**