|
 |
5f4f402 |
From 6875e01ca3e26b430b54c6bbcc40dd1adf35dfe3 Mon Sep 17 00:00:00 2001
|
|
|
5f4f402 |
From: Mat Booth <mat.booth@redhat.com>
|
|
|
5f4f402 |
Date: Fri, 7 Dec 2018 10:17:02 +0000
|
|
|
5f4f402 |
Subject: [PATCH 2/3] Don't embed versions of third-party libs, use feature
|
|
|
5f4f402 |
requirements instead
|
|
|
5f4f402 |
|
|
|
5f4f402 |
---
|
|
|
5f4f402 |
.../org.eclipse.jgit.feature/feature.xml | 59 +++----------------
|
|
|
5f4f402 |
.../feature.xml | 16 +----
|
|
|
5f4f402 |
.../feature.xml | 24 +-------
|
|
|
5f4f402 |
.../org.eclipse.jgit.lfs.feature/feature.xml | 8 +--
|
|
|
5f4f402 |
.../org.eclipse.jgit.pgm.feature/feature.xml | 24 +-------
|
|
|
5f4f402 |
.../feature.xml | 24 +-------
|
|
|
5f4f402 |
6 files changed, 21 insertions(+), 134 deletions(-)
|
|
|
5f4f402 |
|
|
|
5f4f402 |
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
|
|
|
5f4f402 |
index ce03e05..f32b48b 100644
|
|
|
5f4f402 |
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
|
|
|
5f4f402 |
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
|
|
|
5f4f402 |
@@ -22,6 +22,15 @@
|
|
|
5f4f402 |
<discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/>
|
|
|
5f4f402 |
</url>
|
|
|
b1c8e10 |
|
|
|
5f4f402 |
+ <requires>
|
|
|
5f4f402 |
+ <import plugin="com.googlecode.javaewah.JavaEWAH" />
|
|
|
5f4f402 |
+ <import plugin="com.jcraft.jsch" />
|
|
|
5f4f402 |
+ <import plugin="com.jcraft.jzlib"/>
|
|
|
5f4f402 |
+ <import plugin="org.apache.commons.compress" />
|
|
|
5f4f402 |
+ <import plugin="slf4j.api" />
|
|
|
5f4f402 |
+ <import plugin="slf4j.simple" />
|
|
|
5f4f402 |
+ </requires>
|
|
|
5f4f402 |
+
|
|
|
b1c8e10 |
|
|
|
5f4f402 |
id="org.eclipse.jgit"
|
|
|
b1c8e10 |
download-size="0"
|
|
|
5f4f402 |
@@ -36,54 +45,4 @@
|
|
|
b1c8e10 |
version="0.0.0"
|
|
|
5f4f402 |
unpack="false"/>
|
|
|
5f4f402 |
|
|
|
5f4f402 |
-
|
|
|
5f4f402 |
- id="com.jcraft.jsch"
|
|
|
5f4f402 |
- download-size="0"
|
|
|
5f4f402 |
- install-size="0"
|
|
|
5f4f402 |
- version="0.0.0"
|
|
|
b1c8e10 |
- unpack="false"/>
|
|
|
b1c8e10 |
-
|
|
|
b1c8e10 |
-
|
|
|
5f4f402 |
- id="javaewah"
|
|
|
b1c8e10 |
- download-size="0"
|
|
|
b1c8e10 |
- install-size="0"
|
|
|
b1c8e10 |
- version="0.0.0"
|
|
|
b1c8e10 |
- unpack="false"/>
|
|
|
b1c8e10 |
-
|
|
|
b1c8e10 |
-
|
|
|
5f4f402 |
- id="org.apache.commons.compress"
|
|
|
b1c8e10 |
- download-size="0"
|
|
|
b1c8e10 |
- install-size="0"
|
|
|
b1c8e10 |
- version="0.0.0"
|
|
|
5f4f402 |
- unpack="false"/>
|
|
|
5f4f402 |
-
|
|
|
5f4f402 |
-
|
|
|
5f4f402 |
- id="org.slf4j.api"
|
|
|
5f4f402 |
- download-size="0"
|
|
|
5f4f402 |
- install-size="0"
|
|
|
5f4f402 |
- version="0.0.0"
|
|
|
5f4f402 |
- unpack="false"/>
|
|
|
5f4f402 |
-
|
|
|
5f4f402 |
-
|
|
|
5f4f402 |
- id="org.slf4j.impl.log4j12"
|
|
|
5f4f402 |
- download-size="0"
|
|
|
5f4f402 |
- install-size="0"
|
|
|
5f4f402 |
- version="0.0.0"
|
|
|
5f4f402 |
- fragment="true"
|
|
|
5f4f402 |
- unpack="false"/>
|
|
|
5f4f402 |
-
|
|
|
5f4f402 |
-
|
|
|
5f4f402 |
- id="org.apache.log4j"
|
|
|
5f4f402 |
- download-size="0"
|
|
|
5f4f402 |
- install-size="0"
|
|
|
5f4f402 |
- version="0.0.0"
|
|
|
5f4f402 |
- unpack="false"/>
|
|
|
5f4f402 |
-
|
|
|
5f4f402 |
-
|
|
|
5f4f402 |
- id="com.jcraft.jzlib"
|
|
|
5f4f402 |
- download-size="0"
|
|
|
5f4f402 |
- install-size="0"
|
|
|
5f4f402 |
- version="0.0.0"
|
|
|
5f4f402 |
- unpack="false"/>
|
|
|
5f4f402 |
-
|
|
|
b1c8e10 |
</feature>
|
|
|
5f4f402 |
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
|
|
|
5f4f402 |
index 5780db5..addf7b9 100644
|
|
|
5f4f402 |
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
|
|
|
5f4f402 |
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
|
|
 |
5240563 |
@@ -24,6 +24,8 @@
|
|
|
5240563 |
|
|
|
5240563 |
<requires>
|
|
|
5240563 |
<import plugin="org.eclipse.jgit"/>
|
|
|
5240563 |
+ <import plugin="org.apache.httpcomponents.httpclient" />
|
|
|
5240563 |
+ <import plugin="org.apache.httpcomponents.httpcore" />
|
|
|
5240563 |
</requires>
|
|
|
b1c8e10 |
|
|
|
b1c8e10 |
|
|
|
5f4f402 |
@@ -33,18 +35,4 @@
|
|
|
b1c8e10 |
version="0.0.0"
|
|
|
5f4f402 |
unpack="false"/>
|
|
|
5f4f402 |
|
|
|
b1c8e10 |
-
|
|
|
5240563 |
- id="org.apache.httpcomponents.httpcore"
|
|
|
b1c8e10 |
- download-size="0"
|
|
|
b1c8e10 |
- install-size="0"
|
|
|
b1c8e10 |
- version="0.0.0"
|
|
|
b1c8e10 |
- unpack="false"/>
|
|
|
b1c8e10 |
-
|
|
|
b1c8e10 |
-
|
|
|
5240563 |
- id="org.apache.httpcomponents.httpclient"
|
|
|
b1c8e10 |
- download-size="0"
|
|
|
b1c8e10 |
- install-size="0"
|
|
|
b1c8e10 |
- version="0.0.0"
|
|
|
5f4f402 |
- unpack="false"/>
|
|
|
5f4f402 |
-
|
|
|
5240563 |
</feature>
|
|
|
5f4f402 |
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
|
|
|
5f4f402 |
index d55fd5a..d034cc7 100644
|
|
|
5f4f402 |
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
|
|
|
5f4f402 |
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
|
|
|
5f4f402 |
@@ -24,6 +24,9 @@
|
|
|
5f4f402 |
|
|
|
5240563 |
<requires>
|
|
|
5f4f402 |
<import plugin="com.jcraft.jsch"/>
|
|
|
5f4f402 |
+ <import plugin="org.apache.commons.logging" />
|
|
|
5f4f402 |
+ <import plugin="org.apache.sshd.core" />
|
|
|
5f4f402 |
+ <import plugin="org.apache.sshd.sftp" />
|
|
|
5240563 |
</requires>
|
|
|
5240563 |
|
|
|
5240563 |
|
|
|
5f4f402 |
@@ -54,25 +57,4 @@
|
|
|
5240563 |
version="0.0.0"
|
|
|
5240563 |
unpack="false"/>
|
|
|
5240563 |
|
|
|
b1c8e10 |
-
|
|
|
5f4f402 |
- id="org.apache.commons.logging"
|
|
|
b1c8e10 |
- download-size="0"
|
|
|
b1c8e10 |
- install-size="0"
|
|
|
b1c8e10 |
- version="0.0.0"
|
|
|
b1c8e10 |
- unpack="false"/>
|
|
|
b1c8e10 |
-
|
|
|
b1c8e10 |
-
|
|
|
5f4f402 |
- id="org.apache.sshd.core"
|
|
|
b1c8e10 |
- download-size="0"
|
|
|
b1c8e10 |
- install-size="0"
|
|
|
b1c8e10 |
- version="0.0.0"
|
|
|
b1c8e10 |
- unpack="false"/>
|
|
|
b1c8e10 |
-
|
|
|
b1c8e10 |
-
|
|
|
5f4f402 |
- id="org.apache.sshd.sftp"
|
|
|
b1c8e10 |
- download-size="0"
|
|
|
b1c8e10 |
- install-size="0"
|
|
|
b1c8e10 |
- version="0.0.0"
|
|
|
b1c8e10 |
- unpack="false"/>
|
|
|
b1c8e10 |
-
|
|
|
b1c8e10 |
</feature>
|
|
|
5f4f402 |
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
|
|
|
5f4f402 |
index bb916e4..2d1201c 100644
|
|
|
5f4f402 |
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
|
|
|
5f4f402 |
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
|
|
|
5f4f402 |
@@ -24,6 +24,7 @@
|
|
|
5f4f402 |
|
|
|
5f4f402 |
<requires>
|
|
|
5f4f402 |
<import plugin="org.eclipse.jgit"/>
|
|
|
5f4f402 |
+ <import plugin="com.google.gson" />
|
|
|
5f4f402 |
</requires>
|
|
|
b1c8e10 |
|
|
|
b1c8e10 |
|
|
|
5f4f402 |
@@ -40,11 +41,4 @@
|
|
|
b1c8e10 |
version="0.0.0"
|
|
|
5f4f402 |
unpack="false"/>
|
|
|
5f4f402 |
|
|
|
b1c8e10 |
-
|
|
|
5f4f402 |
- id="com.google.gson"
|
|
|
b1c8e10 |
- download-size="0"
|
|
|
b1c8e10 |
- install-size="0"
|
|
|
b1c8e10 |
- version="0.0.0"
|
|
|
b1c8e10 |
- unpack="false"/>
|
|
|
b1c8e10 |
-
|
|
|
5f4f402 |
</feature>
|
|
|
5f4f402 |
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
|
|
|
5f4f402 |
index 43e688e..b9c93e0 100644
|
|
|
5f4f402 |
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
|
|
|
5f4f402 |
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
|
|
|
5f4f402 |
@@ -34,6 +34,9 @@
|
|
|
5f4f402 |
<import feature="org.eclipse.jgit" version="5.2.0" match="equivalent"/>
|
|
|
5f4f402 |
<import feature="org.eclipse.jgit.lfs" version="5.2.0" match="equivalent"/>
|
|
|
5f4f402 |
<import feature="org.eclipse.jgit.ssh.apache" version="5.2.0" match="equivalent"/>
|
|
|
5f4f402 |
+ <import plugin="com.googlecode.javaewah.JavaEWAH" />
|
|
|
5f4f402 |
+ <import plugin="org.apache.commons.compress" />
|
|
|
5f4f402 |
+ <import plugin="org.kohsuke.args4j" />
|
|
|
5f4f402 |
</requires>
|
|
|
5f4f402 |
|
|
|
5f4f402 |
|
|
|
5f4f402 |
@@ -50,25 +53,4 @@
|
|
|
5f4f402 |
version="0.0.0"
|
|
|
5f4f402 |
unpack="false"/>
|
|
|
5f4f402 |
|
|
|
b1c8e10 |
-
|
|
|
5f4f402 |
- id="org.apache.commons.compress"
|
|
|
b1c8e10 |
- download-size="0"
|
|
|
b1c8e10 |
- install-size="0"
|
|
|
b1c8e10 |
- version="0.0.0"
|
|
|
5240563 |
- unpack="false"/>
|
|
|
5240563 |
-
|
|
|
b1c8e10 |
-
|
|
|
5f4f402 |
- id="org.kohsuke.args4j"
|
|
|
b1c8e10 |
- download-size="0"
|
|
|
b1c8e10 |
- install-size="0"
|
|
|
b1c8e10 |
- version="0.0.0"
|
|
|
b1c8e10 |
- unpack="false"/>
|
|
|
b1c8e10 |
-
|
|
|
b1c8e10 |
-
|
|
|
5f4f402 |
- id="javaewah"
|
|
|
b1c8e10 |
- download-size="0"
|
|
|
b1c8e10 |
- install-size="0"
|
|
|
b1c8e10 |
- version="0.0.0"
|
|
|
b1c8e10 |
- unpack="false"/>
|
|
|
b1c8e10 |
-
|
|
|
5f4f402 |
</feature>
|
|
|
5f4f402 |
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
|
|
|
5f4f402 |
index 3e12d53..e05202e 100644
|
|
|
5f4f402 |
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
|
|
|
5f4f402 |
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
|
|
|
5f4f402 |
@@ -24,6 +24,9 @@
|
|
|
5f4f402 |
|
|
|
5f4f402 |
<requires>
|
|
|
5f4f402 |
<import plugin="org.eclipse.jgit"/>
|
|
|
5f4f402 |
+ <import plugin="org.apache.sshd.core" />
|
|
|
5f4f402 |
+ <import plugin="org.apache.sshd.sftp" />
|
|
|
5f4f402 |
+ <import plugin="net.i2p.crypto.eddsa" />
|
|
|
5f4f402 |
</requires>
|
|
|
5f4f402 |
|
|
|
5f4f402 |
|
|
|
5f4f402 |
@@ -33,25 +36,4 @@
|
|
|
5f4f402 |
version="0.0.0"
|
|
|
5f4f402 |
unpack="false"/>
|
|
|
5f4f402 |
|
|
|
b1c8e10 |
-
|
|
|
5f4f402 |
- id="org.apache.sshd.core"
|
|
|
5240563 |
- download-size="0"
|
|
|
5240563 |
- install-size="0"
|
|
|
5240563 |
- version="0.0.0"
|
|
|
5240563 |
- unpack="false"/>
|
|
|
5240563 |
-
|
|
|
5240563 |
-
|
|
|
5f4f402 |
- id="org.apache.sshd.sftp"
|
|
|
b1c8e10 |
- download-size="0"
|
|
|
b1c8e10 |
- install-size="0"
|
|
|
b1c8e10 |
- version="0.0.0"
|
|
|
2a9142b |
- unpack="false"/>
|
|
|
2a9142b |
-
|
|
|
5240563 |
-
|
|
|
5f4f402 |
- id="net.i2p.crypto.eddsa"
|
|
|
5240563 |
- download-size="0"
|
|
|
5240563 |
- install-size="0"
|
|
|
5240563 |
- version="0.0.0"
|
|
|
5f4f402 |
- unpack="false"/>
|
|
|
5f4f402 |
-
|
|
|
b1c8e10 |
</feature>
|
|
|
5f4f402 |
--
|
|
|
5f4f402 |
2.19.1
|
|
|
5f4f402 |
|