From e7d6078cee0d6e65b078b8f5afe11f4844871bfd Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 23 May 2019 21:45:50 +0100
Subject: [PATCH] Avoid the need to have jgit present for tycho.

---
 koschei.cfg |  1 -
 tycho.yaml  | 55 ++++++-----------------------------------------------
 2 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/koschei.cfg b/koschei.cfg
index 92aa23d..67385de 100644
--- a/koschei.cfg
+++ b/koschei.cfg
@@ -195,7 +195,6 @@ config = {
     "macros": {
         "_with_bootstrap": 1,
         "_with_jp_minimal": 1,
-        "_without_jgit_eclipse_features": 1,
     },
 
     "summary": "Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven",
diff --git a/tycho.yaml b/tycho.yaml
index e7e13f8..83ff520 100644
--- a/tycho.yaml
+++ b/tycho.yaml
@@ -50,7 +50,6 @@ data:
         rpms:
             macros: |
                 %_with_jp_minimal 1
-                %_without_jgit_eclipse_features 1
                 %_without_contrib_tools 1
     components:
         rpms:
@@ -61,20 +60,6 @@ data:
                 rationale: >
                     Runtime dependency of eclipse.
                     Build dependency of eclipse.
-            apache-sshd:
-                buildorder: 20
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-jgit.
-                    Build dependency of eclipse, eclipse-jgit.
-            args4j:
-                buildorder: 10
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-jgit.
-                    Build dependency of eclipse-jgit.
             auto:
                 buildorder: 20
                 ref: tycho
@@ -89,13 +74,6 @@ data:
                 rationale: >
                     Runtime dependency of eclipse.
                     Build dependency of eclipse.
-            bouncycastle:
-                buildorder: 10
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-jgit.
-                    Build dependency of apache-sshd, eclipse-jgit.
             cbi-plugins:
                 buildorder: 50
                 ref: tycho
@@ -140,13 +118,6 @@ data:
                 rationale: >
                     Runtime dependency of eclipse.
                     Build dependency of eclipse, eclipse-ecf.
-            eclipse-jgit:
-                buildorder: 30
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of tycho-extras.
-                    Build dependency of eclipse-jgit, tycho-extras.
             eclipse-license:
                 buildorder: 50
                 ref: tycho
@@ -162,13 +133,6 @@ data:
                          takari-plugin-testing.
                     Build dependency of takari-lifecycle,
                          takari-plugin-testing.
-            ed25519-java:
-                buildorder: 10
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-jgit.
-                    Build dependency of apache-sshd, eclipse-jgit.
             fasterxml-oss-parent:
                 buildorder: 10
                 ref: tycho
@@ -225,8 +189,8 @@ data:
                 ref: tycho
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-jgit, takari-lifecycle.
-                    Build dependency of eclipse-jgit, takari-lifecycle.
+                    Runtime dependency of takari-lifecycle.
+                    Build dependency of takari-lifecycle.
             icu4j:
                 buildorder: 10
                 ref: tycho
@@ -268,13 +232,6 @@ data:
                 rationale: >
                     Runtime dependency of jackson-bom.
                     Build dependency of jackson-annotations, jackson-bom.
-            javaewah:
-                buildorder: 10
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-jgit.
-                    Build dependency of eclipse-jgit.
             javapoet:
                 buildorder: 10
                 ref: tycho
@@ -288,8 +245,8 @@ data:
                 ref: tycho
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse, eclipse-jgit.
-                    Build dependency of eclipse, eclipse-jgit.
+                    Runtime dependency of eclipse.
+                    Build dependency of eclipse.
             kxml:
                 buildorder: 20
                 ref: tycho
@@ -394,8 +351,8 @@ data:
                     Runtime dependency of cbi-plugins,
                          takari-tycho-support, tycho-extras.
                     Build dependency of cbi-plugins, eclipse, eclipse-ecf,
-                         eclipse-emf, eclipse-jgit, eclipse-license,
-                         takari-tycho-support, tycho, tycho-extras.
+                         eclipse-emf, eclipse-license, takari-tycho-support,
+                         tycho, tycho-extras.
             tycho-extras:
                 buildorder: 90
                 ref: tycho