motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-6.0' into stable-6.1 

* stable-6.0:
  Silence API errors
  Silence API warnings

Change-Id: I2b8336652e60dec97666582cf9331c8505729473
This commit is contained in:
Matthias Sohn 2022-11-20 20:08:42 +01:00
parent 77e2f4bd27 41b33a16b8
commit 97ad9bdae6
6 changed files with 121 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.eclipse.jgit.http.server/.settings/.api_filters
View File

@ -8,4 +8,18 @@
</message_arguments>
</filter>
</resource>
<resource path="src/org/eclipse/jgit/http/server/GitServlet.java" type="org.eclipse.jgit.http.server.GitServlet">
<filter id="1142947843">
<message_arguments>
<message_argument value="5.9.1"/>
<message_argument value="setReceivePackErrorHandler(ReceivePackErrorHandler)"/>
</message_arguments>
</filter>
<filter id="1142947843">
<message_arguments>
<message_argument value="5.9.1"/>
<message_argument value="setUploadPackErrorHandler(UploadPackErrorHandler)"/>
</message_arguments>
</filter>
</resource>
</component>

103
org.eclipse.jgit/.settings/.api_filters
View File

@ -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>

2
org.eclipse.jgit/src/org/eclipse/jgit/errors/NoRemoteRepositoryException.java
View File

@ -39,7 +39,7 @@ public NoRemoteRepositoryException(URIish uri, String s) {
* 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);

2
org.eclipse.jgit/src/org/eclipse/jgit/transport/AwsRequestSignerV4.java
View File

@ -40,7 +40,7 @@
* "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 {

2
org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java
View File

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

2
org.eclipse.jgit/src/org/eclipse/jgit/util/sha1/SHA1.java
View File

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