diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2022-11-20 20:08:42 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-11-20 20:08:42 +0100 |
| commit | 97ad9bdae6c1d3a6aafdb6d5e3355a4bab530caf (patch) | |
| tree | 2e71c764e86e4fb6399e256c3fd048948c3ea0b1 /org.eclipse.jgit | |
| parent | 77e2f4bd27139ed0c1e855c4fb6a83c4b84af4be (diff) | |
| parent | 41b33a16b87dbc7246f81089ef58f4bb530e4b1d (diff) | |
| download | jgit-97ad9bdae6c1d3a6aafdb6d5e3355a4bab530caf.tar.gz jgit-97ad9bdae6c1d3a6aafdb6d5e3355a4bab530caf.zip | |
Merge branch 'stable-6.0' into stable-6.1
* stable-6.0:
Silence API errors
Silence API warnings
Change-Id: I2b8336652e60dec97666582cf9331c8505729473
Diffstat (limited to 'org.eclipse.jgit')
5 files changed, 107 insertions, 4 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 00b89a4b3d..f97f5d7d7c 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,14 +1,30 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jgit" version="2"> <resource path="src/org/eclipse/jgit/errors/NoRemoteRepositoryException.java" type="org.eclipse.jgit.errors.NoRemoteRepositoryException"> - <filter id="1141899266"> + <filter id="1142947843"> <message_arguments> + <message_argument value="5.13.1"/> <message_argument value="5.13"/> <message_argument value="6.1"/> <message_argument value="NoRemoteRepositoryException(URIish, String, Throwable)"/> </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.13.2"/> + <message_argument value="SHA1_IMPLEMENTATION"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig"> + <filter id="336658481"> + <message_arguments> + <message_argument value="NoRemoteRepositoryException(URIish, String, Throwable)"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/lib/TypedConfigGetter.java" type="org.eclipse.jgit.lib.TypedConfigGetter"> <filter id="403767336"> <message_arguments> @@ -75,4 +91,89 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/transport/AwsRequestSignerV4.java" type="org.eclipse.jgit.transport.AwsRequestSignerV4"> + <filter id="1109393411"> + <message_arguments> + <message_argument value="5.13.1"/> + <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="1142947843"> + <message_arguments> + <message_argument value="5.13.1"/> + <message_argument value="urlEncode(String, boolean)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/util/sha1/SHA1.java" type="org.eclipse.jgit.util.sha1.SHA1"> + <filter id="337764418"> + <message_arguments> + <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/> + <message_argument value="digest()"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/> + <message_argument value="digest(MutableObjectId)"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/> + <message_argument value="hasCollision()"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/> + <message_argument value="reset()"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/> + <message_argument value="setDetectCollision(boolean)"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/> + <message_argument value="toObjectId()"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/> + <message_argument value="update(byte)"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/> + <message_argument value="update(byte[])"/> + </message_arguments> + </filter> + <filter id="421650549"> + <message_arguments> + <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/> + <message_argument value="update(byte[], int, int)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/util/sha1/SHA1.java" type="org.eclipse.jgit.util.sha1.SHA1$Sha1Implementation"> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.13.2"/> + <message_argument value="Sha1Implementation"/> + </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 { /** |