motiejus
/
jgit
1
Fork 0
Code Releases Activity

Fix jgit packaging 

- new jsch and gpg.bc fragments need to be included in their features
  as fragments and require only the jgit bundle (not the jgit feature)
- feature org.eclipse.jgit should no longer include bouncycastle
- add missing url for gpg.bc feature in category.xml
- don't mark features as patch features

Change-Id: I4a46e3fed319221a704b754347a6798b4b199fe4
This commit is contained in:
Matthias Sohn 2020-06-03 13:51:46 +02:00
parent 7861f82029
commit e9f4cb1cba
4 changed files with 15 additions and 34 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

@ -57,25 +57,4 @@
version="0.0.0"
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>

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

@ -23,7 +23,7 @@
</url>
<requires>
<import feature="org.eclipse.jgit" version="5.8.0" match="equivalent"/>
<import plugin="org.eclipse.jgit" version="5.8.0" match="equivalent"/>
</requires>
<plugin
@ -31,6 +31,7 @@
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin

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

@ -3,28 +3,31 @@
<description url="JGit">
This is a pure Java implementation of the Git version control system. The native Git version is also required in this version.
</description>
<feature url="features/org.eclipse.jgit_0.0.0.qualifier.jar" id="org.eclipse.jgit" version="0.0.0" patch="true">
<feature url="features/org.eclipse.jgit_0.0.0.qualifier.jar" id="org.eclipse.jgit" version="0.0.0">
<category name="JGit"/>
</feature>
<feature url="features/org.eclipse.jgit.pgm_0.0.0.qualifier.jar" id="org.eclipse.jgit.pgm" version="0.0.0" patch="true">
<feature url="features/org.eclipse.jgit.pgm_0.0.0.qualifier.jar" id="org.eclipse.jgit.pgm" version="0.0.0">
<category name="JGit"/>
</feature>
<feature url="features/org.eclipse.jgit.ssh.apache_0.0.0.qualifier.jar" id="org.eclipse.jgit.ssh.apache" version="0.0.0" patch="true">
<feature url="features/org.eclipse.jgit.ssh.apache_0.0.0.qualifier.jar" id="org.eclipse.jgit.ssh.apache" version="0.0.0">
<category name="JGit"/>
</feature>
<feature url="features/org.eclipse.jgit.source_0.0.0.qualifier.jar" id="org.eclipse.jgit.source" version="0.0.0" patch="true">
<feature url="features/org.eclipse.jgit.source_0.0.0.qualifier.jar" id="org.eclipse.jgit.source" version="0.0.0">
<category name="JGit"/>
</feature>
<feature url="features/org.eclipse.jgit.junit_0.0.0.qualifier.jar" id="org.eclipse.jgit.junit" version="0.0.0" patch="true">
<feature url="features/org.eclipse.jgit.junit_0.0.0.qualifier.jar" id="org.eclipse.jgit.junit" version="0.0.0">
<category name="JGit"/>
</feature>
<feature url="features/org.eclipse.jgit.http.apache_0.0.0.qualifier.jar" id="org.eclipse.jgit.http.apache" version="0.0.0" patch="true">
<feature url="features/org.eclipse.jgit.http.apache_0.0.0.qualifier.jar" id="org.eclipse.jgit.http.apache" version="0.0.0">
<category name="JGit"/>
</feature>
<feature url="features/org.eclipse.jgit.lfs_0.0.0.qualifier.jar" id="org.eclipse.jgit.lfs" version="0.0.0" patch="true">
<feature url="features/org.eclipse.jgit.lfs_0.0.0.qualifier.jar" id="org.eclipse.jgit.lfs" version="0.0.0">
<category name="JGit"/>
</feature>
<feature url="features/org.eclipse.jgit.ssh.jsch_0.0.0.qualifier.jar" id="org.eclipse.jgit.ssh.jsch" version="0.0.0" patch="true">
<feature url="features/org.eclipse.jgit.ssh.jsch_0.0.0.qualifier.jar" id="org.eclipse.jgit.ssh.jsch" version="0.0.0">
<category name="JGit"/>
</feature>
<feature url="features/org.eclipse.jgit.gpg.bc_0.0.0.qualifier.jar" id="org.eclipse.jgit.gpg.bc" version="0.0.0">
<category name="JGit"/>
</feature>
<bundle id="org.eclipse.jgit.ant" version="0.0.0">
@ -33,9 +36,6 @@
<bundle id="org.eclipse.jgit.archive" version="0.0.0">
<category name="JGit-additional-bundles"/>
</bundle>
<feature id="org.eclipse.jgit.gpg.bc" version="0.0.0">
<category name="JGit"/>
</feature>
<bundle id="org.eclipse.jgit.ui" version="0.0.0">
<category name="JGit-additional-bundles"/>
</bundle>

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

@ -23,7 +23,7 @@
</url>
<requires>
<import feature="org.eclipse.jgit" version="5.8.0" match="equivalent"/>
<import plugin="org.eclipse.jgit" version="5.8.0" match="equivalent"/>
</requires>
<plugin
@ -31,6 +31,7 @@
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin