diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2022-11-20 19:54:44 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-11-20 19:54:44 +0100 |
| commit | 12f48276bd5e76419db716a84d1fafefd4050827 (patch) | |
| tree | ab4987ac0f7fbb4cfd9d125b4abeb8f44565b500 /org.eclipse.jgit | |
| parent | f1909615d3d351b6c0b956e25a4a224b6b999d90 (diff) | |
| parent | aa9f736c33caeb2ead30baa534e40daf1ab67caf (diff) | |
| download | jgit-12f48276bd5e76419db716a84d1fafefd4050827.tar.gz jgit-12f48276bd5e76419db716a84d1fafefd4050827.zip | |
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13:
Silence API warnings
Change-Id: If5ab988a0e177c37b125e0b10625e506eeb2a74f
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 81 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/sha1/SHA1.java | 2 |
2 files changed, 81 insertions, 2 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index ec04c60edc..6af84d0b44 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,7 +1,15 @@ <?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"> + <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="5.13"/> <message_argument value="6.0"/> @@ -9,4 +17,73 @@ </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/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 { /** |