diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2022-11-20 20:22:24 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-11-20 20:22:24 +0100 |
commit | 246981c850d285895ebd76c05b7f9924e1a6144c (patch) | |
tree | 995bca959a5947d297dc4335af50fba6e41e3e0f /org.eclipse.jgit | |
parent | 1cd9a1f804fce2278cd6f8bfaf9b9a27310f5f8c (diff) | |
parent | af87046e5609097ad9d9e722b202ccefffb404a5 (diff) | |
download | jgit-246981c850d285895ebd76c05b7f9924e1a6144c.tar.gz jgit-246981c850d285895ebd76c05b7f9924e1a6144c.zip |
Merge branch 'stable-6.2' into stable-6.3
* stable-6.2:
Remove unused imports
Suppress non-externalized String warnings
Remove unused API problem filters
Silence API errors
Silence API errors
Silence API warnings
Change-Id: I71aa9f890c5eb05849ad16a00b9974da5e51171e
Diffstat (limited to 'org.eclipse.jgit')
5 files changed, 5 insertions, 31 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 1683f33d0c..e69de29bb2 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.eclipse.jgit" version="2"> - <resource path="src/org/eclipse/jgit/transport/AwsRequestSignerV4.java" type="org.eclipse.jgit.transport.AwsRequestSignerV4"> - <filter id="1108344834"> - <message_arguments> - <message_argument value="5.13"/> - <message_argument value="6.3"/> - <message_argument value="org.eclipse.jgit.transport.AwsRequestSignerV4"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/util/HttpSupport.java" type="org.eclipse.jgit.util.HttpSupport"> - <filter id="1141899266"> - <message_arguments> - <message_argument value="5.13"/> - <message_argument value="6.3"/> - <message_argument value="urlEncode(String, boolean)"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/util/Paths.java" type="org.eclipse.jgit.util.Paths"> - <filter id="337768515"> - <message_arguments> - <message_argument value="org.eclipse.jgit.util.Paths"/> - </message_arguments> - </filter> - </resource> -</component> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/NoRemoteRepositoryException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/NoRemoteRepositoryException.java index 1dd976cec9..1fa411b4d5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/NoRemoteRepositoryException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/NoRemoteRepositoryException.java @@ -39,7 +39,7 @@ public class NoRemoteRepositoryException extends TransportException { * message * @param cause * root cause exception - * @since 5.13 + * @since 5.13.1 */ public NoRemoteRepositoryException(URIish uri, String s, Throwable cause) { super(uri, s, cause); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/AwsRequestSignerV4.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/AwsRequestSignerV4.java index 6b3d39721a..ab3013762b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/AwsRequestSignerV4.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/AwsRequestSignerV4.java @@ -40,7 +40,7 @@ import org.eclipse.jgit.util.HttpSupport; * "https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html">AWS * Signature Version 4</a> * - * @since 5.13 + * @since 5.13.1 */ public final class AwsRequestSignerV4 { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java index 663a3449e1..e3ba606346 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java @@ -196,7 +196,7 @@ public class HttpSupport { * them to "%2F"). * * @return The translated URL. - * @since 5.13 + * @since 5.13.1 */ public static String urlEncode(String url, boolean keepPathSlash) { String encoded; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/sha1/SHA1.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/sha1/SHA1.java index 87993d2bee..56e90d0636 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/sha1/SHA1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/sha1/SHA1.java @@ -27,6 +27,8 @@ import org.eclipse.jgit.util.SystemReader; public abstract class SHA1 { /** * SHA1 implementations available in JGit + * + * @since 5.13.2 */ public enum Sha1Implementation { /** |