diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2022-11-20 20:09:02 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-11-20 20:09:56 +0100 |
| commit | fec271c11bb38aa7c80d251d4651536570977195 (patch) | |
| tree | 21e8f2e0d729ad2186f425da4fd705daac91a735 | |
| parent | 97ad9bdae6c1d3a6aafdb6d5e3355a4bab530caf (diff) | |
| download | jgit-fec271c11bb38aa7c80d251d4651536570977195.tar.gz jgit-fec271c11bb38aa7c80d251d4651536570977195.zip | |
Silence API errors
Change-Id: I07c42fe9417edb0570dd475a7e935112a878a93b
4 files changed, 31 insertions, 43 deletions
diff --git a/org.eclipse.jgit.http.server/.settings/.api_filters b/org.eclipse.jgit.http.server/.settings/.api_filters index 116c7eab91..2c32c9864b 100644 --- a/org.eclipse.jgit.http.server/.settings/.api_filters +++ b/org.eclipse.jgit.http.server/.settings/.api_filters @@ -8,18 +8,4 @@ </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> 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 f97f5d7d7c..a6f18310d6 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -4,8 +4,6 @@ <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> @@ -18,10 +16,11 @@ </message_arguments> </filter> </resource> - <resource path="src/org/eclipse/jgit/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig"> - <filter id="336658481"> + <resource path="src/org/eclipse/jgit/lib/ObjectDatabase.java" type="org.eclipse.jgit.lib.ObjectDatabase"> + <filter id="336695337"> <message_arguments> - <message_argument value="NoRemoteRepositoryException(URIish, String, Throwable)"/> + <message_argument value="org.eclipse.jgit.lib.ObjectDatabase"/> + <message_argument value="getApproximateObjectCount()"/> </message_arguments> </filter> </resource> @@ -39,22 +38,6 @@ </message_arguments> </filter> </resource> - <resource path="src/org/eclipse/jgit/lib/ObjectDatabase.java" type="org.eclipse.jgit.lib.ObjectDatabase"> - <filter id="336695337"> - <message_arguments> - <message_argument value="org.eclipse.jgit.lib.ObjectDatabase"/> - <message_argument value="getApproximateObjectCount()"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/lib/TypedConfigGetter.java" type="org.eclipse.jgit.lib.TypedConfigGetter"> - <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_arguments> - </filter> - </resource> <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger"> <filter id="338792546"> <message_arguments> @@ -75,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> @@ -91,14 +82,6 @@ </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> |