diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2020-06-03 13:51:46 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-06-03 13:51:46 +0200 |
| commit | e9f4cb1cbad3f8e1d6980507688f2ab0a823e08c (patch) | |
| tree | 9ee6cee8fd99a752a0ab64a4f8ffe737674f41c5 /org.eclipse.jgit.packaging/org.eclipse.jgit.repository | |
| parent | 7861f82029100641742c623404fd9b3d12d0eeb4 (diff) | |
| download | jgit-e9f4cb1cbad3f8e1d6980507688f2ab0a823e08c.tar.gz jgit-e9f4cb1cbad3f8e1d6980507688f2ab0a823e08c.zip | |
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
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.repository')
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml index 5ff46c317e..abda695639 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -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> |