motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-6.1' into stable-6.2 

* stable-6.1:
  Silence API errors
  Silence API errors
  Silence API warnings

Change-Id: Id3efa1b32710661cde63e93c5b8832785a805415
This commit is contained in:
Matthias Sohn 2022-11-20 20:10:37 +01:00
parent a24b22632f fec271c11b
commit 71f50e52af
7 changed files with 121 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.eclipse.jgit.junit/.settings/.api_filters Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jgit.junit" version="2">
<resource path="src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java" type="org.eclipse.jgit.junit.LocalDiskRepositoryTestCase">
<filter id="336658481">
<message_arguments>
<message_argument value="org.eclipse.jgit.junit.LocalDiskRepositoryTestCase"/>
<message_argument value="currentTest"/>
</message_arguments>
</filter>
<filter id="1142947843">
<message_arguments>
<message_argument value="6.0.1"/>
<message_argument value="currentTest"/>
</message_arguments>
</filter>
</resource>
</component>

2
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java
View File

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

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

@ -1,25 +1,18 @@
<?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"/>
<message_argument value="6.1"/>
<message_argument value="5.13.1"/>
<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">
<resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
<filter id="1142947843">
<message_arguments>
<message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/>
<message_argument value="UNSET_INT"/>
</message_arguments>
</filter>
<filter id="403804204">
<message_arguments>
<message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/>
<message_argument value="getIntInRange(Config, String, String, String, int, int, int)"/>
<message_argument value="5.13.2"/>
<message_argument value="SHA1_IMPLEMENTATION"/>
</message_arguments>
</filter>
</resource>
@ -32,6 +25,12 @@
</filter>
</resource>
<resource path="src/org/eclipse/jgit/lib/TypedConfigGetter.java" type="org.eclipse.jgit.lib.TypedConfigGetter">
<filter id="403767336">
<message_arguments>
<message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/>
<message_argument value="UNSET_INT"/>
</message_arguments>
</filter>
<filter id="403804204">
<message_arguments>
<message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/>
@ -59,6 +58,14 @@
</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/transport/BasePackPushConnection.java" type="org.eclipse.jgit.transport.BasePackPushConnection">
<filter id="338792546">
<message_arguments>
@ -75,4 +82,81 @@
</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 {
/**