From a6efa36a04bee412b06af2823281ff9b78827ebf Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 29 Jan 2021 18:35:25 +0000
Subject: [PATCH 2/2] Don't embed versions of third-party libs, use feature
 requirements instead

---
 .../feature.xml                               | 24 +++----------------
 .../feature.xml                               |  2 ++
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
index 92d171f..ca1f6de 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
@@ -24,6 +24,9 @@
 
    <requires>
       <import plugin="com.jcraft.jsch"/>
+      <import plugin="org.apache.commons.logging"/>
+      <import plugin="org.apache.sshd.osgi"/>
+      <import plugin="org.apache.sshd.sftp"/>
       <import plugin="org.eclipse.jgit" version="5.11.0" match="equivalent"/>
    </requires>
 
@@ -55,25 +58,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.commons.logging"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.sshd.osgi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.sshd.sftp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
index 48660d5..843896f 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
@@ -24,6 +24,8 @@
 
    <requires>
       <import feature="org.eclipse.jgit" version="5.11.0" match="equivalent"/>
+      <import plugin="org.apache.sshd.osgi"/>
+      <import plugin="org.apache.sshd.sftp"/>
    </requires>
 
    <plugin
-- 
2.28.0