2021-07-30 12:15:11 +02:00
|
|
|
From a6efa36a04bee412b06af2823281ff9b78827ebf Mon Sep 17 00:00:00 2001
|
2020-07-01 13:57:40 +02:00
|
|
|
From: Mat Booth <mat.booth@redhat.com>
|
2021-07-30 12:15:11 +02:00
|
|
|
Date: Fri, 29 Jan 2021 18:35:25 +0000
|
|
|
|
|
Subject: [PATCH 2/2] Don't embed versions of third-party libs, use feature
|
2020-07-01 13:57:40 +02:00
|
|
|
requirements instead
|
|
|
|
|
|
|
|
|
|
---
|
2021-07-30 12:15:11 +02:00
|
|
|
.../feature.xml | 24 +++----------------
|
|
|
|
|
.../feature.xml | 2 ++
|
|
|
|
|
2 files changed, 5 insertions(+), 21 deletions(-)
|
2020-07-01 13:57:40 +02:00
|
|
|
|
|
|
|
|
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
|
2021-07-30 12:15:11 +02:00
|
|
|
index 92d171f..ca1f6de 100644
|
2020-07-01 13:57:40 +02:00
|
|
|
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
|
|
|
|
|
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
|
2021-07-30 12:15:11 +02:00
|
|
|
@@ -24,6 +24,9 @@
|
|
|
|
|
|
2020-07-01 13:57:40 +02:00
|
|
|
<requires>
|
|
|
|
|
<import plugin="com.jcraft.jsch"/>
|
|
|
|
|
+ <import plugin="org.apache.commons.logging"/>
|
|
|
|
|
+ <import plugin="org.apache.sshd.osgi"/>
|
|
|
|
|
+ <import plugin="org.apache.sshd.sftp"/>
|
2021-07-30 12:15:11 +02:00
|
|
|
<import plugin="org.eclipse.jgit" version="5.11.0" match="equivalent"/>
|
2020-07-01 13:57:40 +02:00
|
|
|
</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
|
2021-07-30 12:15:11 +02:00
|
|
|
index 48660d5..843896f 100644
|
2020-07-01 13:57:40 +02:00
|
|
|
--- 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
|
2021-07-30 12:15:11 +02:00
|
|
|
@@ -24,6 +24,8 @@
|
2020-07-01 13:57:40 +02:00
|
|
|
|
|
|
|
|
<requires>
|
2021-07-30 12:15:11 +02:00
|
|
|
<import feature="org.eclipse.jgit" version="5.11.0" match="equivalent"/>
|
2020-07-01 13:57:40 +02:00
|
|
|
+ <import plugin="org.apache.sshd.osgi"/>
|
|
|
|
|
+ <import plugin="org.apache.sshd.sftp"/>
|
|
|
|
|
</requires>
|
|
|
|
|
|
|
|
|
|
<plugin
|
|
|
|
|
--
|
2021-07-30 12:15:11 +02:00
|
|
|
2.28.0
|
2020-07-01 13:57:40 +02:00
|
|
|
|
