From ebf600dc9f6bcb65b9b48c6c273544e74428c286 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 11 Jul 2024 15:48:05 -0700 Subject: [PATCH] ssh: Remove .orig file This temporal file sneaked into the repo in [1]. [1] https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/1196934 Change-Id: I840244fb237f592bd6ed3075d61085d125d32d7e --- .../META-INF/MANIFEST.MF.orig | 104 ------------------ 1 file changed, 104 deletions(-) delete mode 100644 org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig deleted file mode 100644 index e83582843e..0000000000 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig +++ /dev/null @@ -1,104 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Automatic-Module-Name: org.eclipse.jgit.junit.ssh -Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.qualifier -Bundle-Localization: OSGI-INF/l10n/plugin -Bundle-Vendor: %Bundle-Vendor -Bundle-ActivationPolicy: lazy -<<<<<<< HEAD -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.apache.sshd.common;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.common.file.virtualfs;version="[2.12.0,2.13.0)", - org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)", - org.apache.sshd.common.io;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex;version="[2.12.0,2.13.0)", - org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)", - org.apache.sshd.common.session;version="[2.12.0,2.13.0)", - org.apache.sshd.common.signature;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.threads;version="[2.12.0,2.13.0)", - org.apache.sshd.core;version="[2.12.0,2.13.0)", - org.apache.sshd.server;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.gss;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.keyboard;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.password;version="[2.12.0,2.13.0)", - org.apache.sshd.server.command;version="[2.12.0,2.13.0)", - org.apache.sshd.server.session;version="[2.12.0,2.13.0)", - org.apache.sshd.server.shell;version="[2.12.0,2.13.0)", - org.apache.sshd.server.subsystem;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp.server;version="[2.12.0,2.13.0)", -||||||| parent of 9724f9467f (Update org.apache.sshd to 2.13.1) -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.apache.sshd.common;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.common.file.virtualfs;version="[2.12.0,2.13.0)", - org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)", - org.apache.sshd.common.io;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex;version="[2.12.0,2.13.0)", - org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)", - org.apache.sshd.common.session;version="[2.12.0,2.13.0)", - org.apache.sshd.common.signature;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.threads;version="[2.12.0,2.13.0)", - org.apache.sshd.core;version="[2.12.0,2.13.0)", - org.apache.sshd.server;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.gss;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.keyboard;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.password;version="[2.12.0,2.13.0)", - org.apache.sshd.server.command;version="[2.12.0,2.13.0)", - org.apache.sshd.server.session;version="[2.12.0,2.13.0)", - org.apache.sshd.server.shell;version="[2.12.0,2.13.0)", - org.apache.sshd.server.subsystem;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp.server;version="[2.12.0,2.13.0)", -======= -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.apache.sshd.common;version="[2.13.0,2.14.0)", - org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", - org.apache.sshd.common.file.virtualfs;version="[2.13.0,2.14.0)", - org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", - org.apache.sshd.common.io;version="[2.13.0,2.14.0)", - org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", - org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", - org.apache.sshd.common.session;version="[2.13.0,2.14.0)", - org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.buffer;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.logging;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.threads;version="[2.13.0,2.14.0)", - org.apache.sshd.core;version="[2.13.0,2.14.0)", - org.apache.sshd.server;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth.gss;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth.keyboard;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth.password;version="[2.13.0,2.14.0)", - org.apache.sshd.server.command;version="[2.13.0,2.14.0)", - org.apache.sshd.server.session;version="[2.13.0,2.14.0)", - org.apache.sshd.server.shell;version="[2.13.0,2.14.0)", - org.apache.sshd.server.subsystem;version="[2.13.0,2.14.0)", - org.apache.sshd.sftp;version="[2.13.0,2.14.0)", - org.apache.sshd.sftp.server;version="[2.13.0,2.14.0)", ->>>>>>> 9724f9467f (Update org.apache.sshd to 2.13.1) - org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", - org.junit;version="[4.13,5.0.0)", - org.junit.experimental.theories;version="[4.13,5.0.0)", - org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.0.0" -- 2.39.5