diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-04-21 00:11:40 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-04-21 00:11:40 +0200 |
| commit | e59ade2a6f88cbe18466924f76867e2cc167b233 (patch) | |
| tree | a95a4ab22b4d722bad6785ce1eb0f768a5103e93 /org.eclipse.jgit.junit.ssh | |
| parent | 20b7e9435b9aeed7953d84a3ed9cb713593102b2 (diff) | |
| parent | 40daa780ef00f999b9e95417a9ee15355d591955 (diff) | |
| download | jgit-e59ade2a6f88cbe18466924f76867e2cc167b233.tar.gz jgit-e59ade2a6f88cbe18466924f76867e2cc167b233.zip | |
Merge branch 'stable-6.0' into stable-6.1
* stable-6.0:
Add missing since tag for SshBasicTestBase
Add missing since tag for SshTestHarness#publicKey2
Silence API errors
Prevent infinite loop rescanning the pack list on PackMismatchException
Remove blank in maven.config
Change-Id: Ia01c5ac5259b8820afb823d97bee247b5a5fb14a
Diffstat (limited to 'org.eclipse.jgit.junit.ssh')
3 files changed, 30 insertions, 0 deletions
diff --git a/org.eclipse.jgit.junit.ssh/.settings/.api_filters b/org.eclipse.jgit.junit.ssh/.settings/.api_filters new file mode 100644 index 0000000000..44c9dfae49 --- /dev/null +++ b/org.eclipse.jgit.junit.ssh/.settings/.api_filters @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.jgit.junit.ssh" version="2"> + <resource path="src/org/eclipse/jgit/junit/ssh/SshTestHarness.java" type="org.eclipse.jgit.junit.ssh.SshTestHarness"> + <filter id="336658481"> + <message_arguments> + <message_argument value="org.eclipse.jgit.junit.ssh.SshTestHarness"/> + <message_argument value="publicKey2"/> + </resource> + <resource path="META-INF/MANIFEST.MF"> + <filter id="923795461"> + <message_arguments> + <message_argument value="5.11.2"/> + <message_argument value="5.10.0"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/junit/ssh/SshTestBase.java" type="org.eclipse.jgit.junit.ssh.SshTestBase"> + <filter id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.junit.ssh.SshTestBase"/> + <message_argument value="testSshWithConfig()"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshBasicTestBase.java b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshBasicTestBase.java index f9ca0b8923..da84b0ea7d 100644 --- a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshBasicTestBase.java +++ b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshBasicTestBase.java @@ -22,6 +22,8 @@ import org.junit.Test; * Some minimal cloning and fetching tests. Concrete subclasses can implement * the abstract operations from {@link SshTestHarness} to run with different SSH * implementations. + * + * @since 5.11 */ public abstract class SshBasicTestBase extends SshTestHarness { diff --git a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java index 90d981b772..a28d5ebd98 100644 --- a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java +++ b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java @@ -76,6 +76,9 @@ public abstract class SshTestHarness extends RepositoryTestCase { protected File publicKey1; + /** + * @since 5.10 + */ protected File publicKey2; protected SshTestGitServer server; |