diff --git a/jgit-apache-sshd-2.7.0.patch b/jgit-apache-sshd-2.7.0.patch
index 51d0f97..46df517 100644
--- a/jgit-apache-sshd-2.7.0.patch
+++ b/jgit-apache-sshd-2.7.0.patch
@@ -30,31 +30,31 @@ diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.junit.ssh/META-INF/MANI
 - org.apache.sshd.server.subsystem;version="[2.6.0,2.7.0)",
 - org.apache.sshd.sftp;version="[2.6.0,2.7.0)",
 - org.apache.sshd.sftp.server;version="[2.6.0,2.7.0)",
-+Import-Package: org.apache.sshd.common",
-+ org.apache.sshd.common.config.keys",
-+ org.apache.sshd.common.file.virtualfs",
-+ org.apache.sshd.common.helpers",
-+ org.apache.sshd.common.io",
-+ org.apache.sshd.common.kex",
-+ org.apache.sshd.common.keyprovider",
-+ org.apache.sshd.common.session",
-+ org.apache.sshd.common.signature",
-+ org.apache.sshd.common.util.buffer",
-+ org.apache.sshd.common.util.logging",
-+ org.apache.sshd.common.util.security",
-+ org.apache.sshd.common.util.threads",
-+ org.apache.sshd.core",
-+ org.apache.sshd.server",
-+ org.apache.sshd.server.auth",
-+ org.apache.sshd.server.auth.gss",
-+ org.apache.sshd.server.auth.keyboard",
-+ org.apache.sshd.server.auth.password",
-+ org.apache.sshd.server.command",
-+ org.apache.sshd.server.session",
-+ org.apache.sshd.server.shell",
-+ org.apache.sshd.server.subsystem",
-+ org.apache.sshd.sftp",
-+ org.apache.sshd.sftp.server",
++Import-Package: org.apache.sshd.common;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.config.keys;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.file.virtualfs;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.helpers;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.io;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.kex;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.keyprovider;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.session;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.signature;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.buffer;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.logging;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.security;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.threads;version="[2.7.0,3.0.0)",
++ org.apache.sshd.core;version="[2.7.0,3.0.0)",
++ org.apache.sshd.server;version="[2.7.0,3.0.0)",
++ org.apache.sshd.server.auth;version="[2.7.0,3.0.0)",
++ org.apache.sshd.server.auth.gss;version="[2.7.0,3.0.0)",
++ org.apache.sshd.server.auth.keyboard;version="[2.7.0,3.0.0)",
++ org.apache.sshd.server.auth.password;version="[2.7.0,3.0.0)",
++ org.apache.sshd.server.command;version="[2.7.0,3.0.0)",
++ org.apache.sshd.server.session;version="[2.7.0,3.0.0)",
++ org.apache.sshd.server.shell;version="[2.7.0,3.0.0)",
++ org.apache.sshd.server.subsystem;version="[2.7.0,3.0.0)",
++ org.apache.sshd.sftp;version="[2.7.0,3.0.0)",
++ org.apache.sshd.sftp.server;version="[2.7.0,3.0.0)",
   org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)",
   org.eclipse.jgit.api;version="[5.11.0,5.12.0)",
   org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)",
@@ -110,51 +110,51 @@ diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache/META-INF/MAN
 - org.apache.sshd.sftp;version="[2.6.0,2.7.0)",
 - org.apache.sshd.sftp.client;version="[2.6.0,2.7.0)",
 - org.apache.sshd.sftp.common;version="[2.6.0,2.7.0)",
-+ org.apache.sshd.agent",
-+ org.apache.sshd.client",
-+ org.apache.sshd.client.auth",
-+ org.apache.sshd.client.auth.keyboard",
-+ org.apache.sshd.client.auth.password",
-+ org.apache.sshd.client.auth.pubkey",
-+ org.apache.sshd.client.channel",
-+ org.apache.sshd.client.config.hosts",
-+ org.apache.sshd.client.config.keys",
-+ org.apache.sshd.client.future",
-+ org.apache.sshd.client.keyverifier",
-+ org.apache.sshd.client.session",
-+ org.apache.sshd.client.session.forward",
-+ org.apache.sshd.common",
-+ org.apache.sshd.common.auth",
-+ org.apache.sshd.common.channel",
-+ org.apache.sshd.common.compression",
-+ org.apache.sshd.common.config.keys",
-+ org.apache.sshd.common.config.keys.loader",
-+ org.apache.sshd.common.config.keys.loader.openssh.kdf",
-+ org.apache.sshd.common.digest",
-+ org.apache.sshd.common.forward",
-+ org.apache.sshd.common.future",
-+ org.apache.sshd.common.helpers",
-+ org.apache.sshd.common.io",
-+ org.apache.sshd.common.kex",
-+ org.apache.sshd.common.keyprovider",
-+ org.apache.sshd.common.mac",
-+ org.apache.sshd.common.random",
-+ org.apache.sshd.common.session",
-+ org.apache.sshd.common.session.helpers",
-+ org.apache.sshd.common.signature",
-+ org.apache.sshd.common.util",
-+ org.apache.sshd.common.util.buffer",
-+ org.apache.sshd.common.util.closeable",
-+ org.apache.sshd.common.util.io",
-+ org.apache.sshd.common.util.io.resource",
-+ org.apache.sshd.common.util.logging",
-+ org.apache.sshd.common.util.net",
-+ org.apache.sshd.common.util.security",
-+ org.apache.sshd.core",
-+ org.apache.sshd.server.auth",
-+ org.apache.sshd.sftp",
-+ org.apache.sshd.sftp.client",
-+ org.apache.sshd.sftp.common",
++ org.apache.sshd.agent;version="[2.7.0,3.0.0)",
++ org.apache.sshd.client;version="[2.7.0,3.0.0)",
++ org.apache.sshd.client.auth;version="[2.7.0,3.0.0)",
++ org.apache.sshd.client.auth.keyboard;version="[2.7.0,3.0.0)",
++ org.apache.sshd.client.auth.password;version="[2.7.0,3.0.0)",
++ org.apache.sshd.client.auth.pubkey;version="[2.7.0,3.0.0)",
++ org.apache.sshd.client.channel;version="[2.7.0,3.0.0)",
++ org.apache.sshd.client.config.hosts;version="[2.7.0,3.0.0)",
++ org.apache.sshd.client.config.keys;version="[2.7.0,3.0.0)",
++ org.apache.sshd.client.future;version="[2.7.0,3.0.0)",
++ org.apache.sshd.client.keyverifier;version="[2.7.0,3.0.0)",
++ org.apache.sshd.client.session;version="[2.7.0,3.0.0)",
++ org.apache.sshd.client.session.forward;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.auth;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.channel;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.compression;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.config.keys;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.config.keys.loader;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.digest;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.forward;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.future;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.helpers;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.io;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.kex;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.keyprovider;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.mac;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.random;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.session;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.session.helpers;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.signature;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.buffer;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.closeable;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.io;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.io.resource;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.logging;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.net;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.security;version="[2.7.0,3.0.0)",
++ org.apache.sshd.core;version="[2.7.0,3.0.0)",
++ org.apache.sshd.server.auth;version="[2.7.0,3.0.0)",
++ org.apache.sshd.sftp;version="[2.7.0,3.0.0)",
++ org.apache.sshd.sftp.client;version="[2.7.0,3.0.0)",
++ org.apache.sshd.sftp.common;version="[2.7.0,3.0.0)",
   org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)",
   org.eclipse.jgit.errors;version="[5.11.0,5.12.0)",
   org.eclipse.jgit.fnmatch;version="[5.11.0,5.12.0)",
@@ -216,18 +216,18 @@ diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache.test/META-IN
 - org.apache.sshd.core;version="[2.6.0,2.7.0)",
 - org.apache.sshd.server;version="[2.6.0,2.7.0)",
 - org.apache.sshd.server.forward;version="[2.6.0,2.7.0)",
-+Import-Package: org.apache.sshd.client.config.hosts",
-+ org.apache.sshd.common",
-+ org.apache.sshd.common.auth",
-+ org.apache.sshd.common.config.keys",
-+ org.apache.sshd.common.helpers",
-+ org.apache.sshd.common.keyprovider",
-+ org.apache.sshd.common.session",
-+ org.apache.sshd.common.util.net",
-+ org.apache.sshd.common.util.security",
-+ org.apache.sshd.core",
-+ org.apache.sshd.server",
-+ org.apache.sshd.server.forward",
++Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.auth;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.config.keys;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.helpers;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.keyprovider;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.session;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.net;version="[2.7.0,3.0.0)",
++ org.apache.sshd.common.util.security;version="[2.7.0,3.0.0)",
++ org.apache.sshd.core;version="[2.7.0,3.0.0)",
++ org.apache.sshd.server;version="[2.7.0,3.0.0)",
++ org.apache.sshd.server.forward;version="[2.7.0,3.0.0)",
   org.eclipse.jgit.api;version="[5.11.0,5.12.0)",
   org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)",
   org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.11.0,5.12.0)",