aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2022-11-20 20:10:37 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2022-11-20 20:10:37 +0100
commit71f50e52aff2e35dd017a77e54c1fb2f6435a374 (patch)
tree947ddee7fbc266e9793b973ff4b5349c90775c94
parenta24b22632f34abd57fab503e10f2ba2fc0c20fbf (diff)
parentfec271c11bb38aa7c80d251d4651536570977195 (diff)
downloadjgit-71f50e52aff2e35dd017a77e54c1fb2f6435a374.tar.gz
jgit-71f50e52aff2e35dd017a77e54c1fb2f6435a374.zip
Merge branch 'stable-6.1' into stable-6.2
* stable-6.1: Silence API errors Silence API errors Silence API warnings Change-Id: Id3efa1b32710661cde63e93c5b8832785a805415
Diffstat
-rw-r--r--org.eclipse.jgit.junit/.settings/.api_filters17
-rw-r--r--org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java2
-rw-r--r--org.eclipse.jgit/.settings/.api_filters110
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/errors/NoRemoteRepositoryException.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/AwsRequestSignerV4.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/util/sha1/SHA1.java2
7 files changed, 121 insertions, 16 deletions
diff --git a/org.eclipse.jgit.junit/.settings/.api_filters b/org.eclipse.jgit.junit/.settings/.api_filters
new file mode 100644
index 0000000000..a17a72f403
--- /dev/null
+++ b/org.eclipse.jgit.junit/.settings/.api_filters
@@ -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>
diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java
index a3c5b1202d..59662cec95 100644
--- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java
+++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java
@@ -87,6 +87,8 @@ public abstract class LocalDiskRepositoryTestCase {
/**
* The current test name.
+ *
+ * @since 6.0.1
*/
@Rule
public TestName currentTest = new TestName();
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index 00b89a4b3d..a6f18310d6 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -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>
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 {
/**
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 19:30:30 +0000