summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2016-02-12 02:06:04 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2016-02-12 02:13:13 +0100
commit363fc1ff5ba44635086d24884e5556cc0cc4352b (patch)
tree066763c16ed045b4af0ae6b8dce9c1b4e8490198
parent975aa8868591ea49e3d8033a0fe224c09e67aec9 (diff)
downloadjgit-363fc1ff5ba44635086d24884e5556cc0cc4352b.tar.gz
jgit-363fc1ff5ba44635086d24884e5556cc0cc4352b.zip
Fix packaging of lfs bundles
- pgm feature needs to include the lfs feature - add the lfs feature to the jgit p2 repository Change-Id: I6781d4e9d131b373c9f191d785495e88b906c671 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml5
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml3
2 files changed, 8 insertions, 0 deletions
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
index 03c9fed59e..ae30f08615 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
@@ -26,8 +26,13 @@
id="org.eclipse.jgit"
version="0.0.0"/>
+ <includes
+ id="org.eclipse.jgit.lfs"
+ version="0.0.0"/>
+
<requires>
<import feature="org.eclipse.jgit" version="4.3.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit.lfs" version="4.3.0" match="equivalent"/>
</requires>
<plugin
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 15d10e6c30..c2bfc92c3c 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
@@ -24,6 +24,9 @@
<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.lfs_0.0.0.qualifier.jar" id="org.eclipse.jgit.lfs" version="0.0.0">
+ <category name="JGit"/>
+ </feature>
<category-def name="JGit" label="JGit">
<description>
JGit