motiejus
/
jgit
1
Fork 0
Code Releases Activity

Don't install 3rd party dependency bundles via features 

Instead provide them only in the p2 repository. This way they are
available when installing from the jgit p2 repository but we are not
enforcing the version we bring but can also use the version available in
Eclipse if it matches our requirements.

Bug: 514326
Bug: 566475
Change-Id: I3e8d0bad12cfb0c1003ade3e6f13e9af35626f14
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2020-10-02 21:54:53 +02:00
parent 485e4f9cf1
commit 4380921d66
8 changed files with 133 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
View File

@ -36,25 +36,4 @@
version="0.0.0"
unpack="false"/>
<plugin
id="javaewah"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.compress"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.slf4j.api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

21
org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
View File

@ -34,25 +34,4 @@
fragment="true"
unpack="false"/>
<plugin
id="org.bouncycastle.bcpg"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.bouncycastle.bcpkix"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.bouncycastle.bcprov"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

21
org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
View File

@ -33,25 +33,4 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.httpcomponents.httpcore"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.httpcomponents.httpclient"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.codec"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

7
org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
View File

@ -40,11 +40,4 @@
version="0.0.0"
unpack="false"/>
<plugin
id="com.google.gson"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

21
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
View File

@ -54,25 +54,4 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.compress"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.kohsuke.args4j"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javaewah"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

133
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
View File

@ -39,6 +39,138 @@
<bundle id="org.eclipse.jgit.ui" version="0.0.0">
<category name="JGit-additional-bundles"/>
</bundle>
<bundle id="com.google.gson">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="com.google.gson.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="com.jcraft.jsch">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="com.jcraft.jsch.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="com.jcraft.jzlib">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="com.jcraft.jzlib.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="javaewah">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="javaewah.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="javax.servlet">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="javax.servlet.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="net.i2p.crypto.eddsa">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="net.i2p.crypto.eddsa.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.ant">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.ant.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.commons.codec">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.commons.codec.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.commons.compress">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.commons.compress.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.commons.logging">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.commons.logging.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.httpcomponents.httpclient">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.httpcomponents.httpclient.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.httpcomponents.httpcore">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.httpcomponents.httpcore.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.log4j">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.log4j.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.sshd.osgi">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.sshd.osgi.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.sshd.sftp">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.sshd.sftp.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.bouncycastle.bcpg">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.bouncycastle.bcpg.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.bouncycastle.bcpkix">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.bouncycastle.bcpkix.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.bouncycastle.bcprov">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.bouncycastle.bcprov.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.kohsuke.args4j">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.kohsuke.args4j.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.slf4j.api">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.slf4j.api.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.slf4j.binding.log4j12">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.slf4j.binding.log4j12.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.tukaani.xz">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.tukaani.xz.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<category-def name="JGit" label="Java implementation of Git">
<description>
Java implementation of Git
@ -49,4 +181,5 @@
Java implementation of Git - additional bundles
</description>
</category-def>
<category-def name="JGit-dependency-bundles" label="JGit dependency bundles"/>
</site>

21
org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
View File

@ -33,25 +33,4 @@
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"/>
<plugin
id="net.i2p.crypto.eddsa"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

14
org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
View File

@ -34,18 +34,4 @@
fragment="true"
unpack="false"/>
<plugin
id="com.jcraft.jsch"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.jcraft.jzlib"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>