From 56b25d75f62e161b92b128902a06ab46295f77fd Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mon, 9 Sep 2019 13:53:24 +0100
Subject: [PATCH] Bootstrap for 2019-09

---
 eclipse.yaml | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/eclipse.yaml b/eclipse.yaml
index 4273645..df1e844 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -12,12 +12,12 @@ data:
             - MIT
     dependencies:
         - buildrequires:
-              eclipse: [2019-06]
               tycho: [1.4]
+#              eclipse: [2019-09]
               platform: [-f28,-f29]
           requires:
-              ant: [1.10]
-              maven: [3.5]
+#              ant: [1.10]
+#              maven: [3.5]
               platform: [-f28,-f29]
     profiles:
         everything:
@@ -90,7 +90,6 @@ data:
                 - eclipse-testng
                 - eclipse-tm-terminal
                 - eclipse-tm-terminal-connectors
-                - eclipse-tm-terminal-rse
                 - eclipse-usage
                 - eclipse-webtools-common
                 - eclipse-webtools-dali
@@ -214,7 +213,6 @@ data:
             - eclipse-testng
             - eclipse-tm-terminal
             - eclipse-tm-terminal-connectors
-            - eclipse-tm-terminal-rse
             - eclipse-usage
             - eclipse-webtools-common
             - eclipse-webtools-dali
@@ -224,6 +222,7 @@ data:
     buildopts:
         rpms:
             macros: |
+                %_with_bootstrap 1
                 %_with_jp_minimal 1
                 %_without_javahl 1
                 %_without_spring 1
@@ -343,12 +342,12 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-linuxtools.
-            eclipse:
-                buildorder: 40
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Module API.
+                    #            eclipse:
+                    #                buildorder: 40
+                    #                ref: eclipse
+                    #                arches: [x86_64, ppc64le, aarch64, s390x]
+                    #                rationale: >
+                    #                    Module API.
             eclipse-abrt:
                 buildorder: 50
                 ref: eclipse
@@ -370,12 +369,12 @@ data:
                 rationale: >
                     Module API.
                     Runtime dependency of eclipse-webtools.
-            eclipse-ecf:
-                buildorder: 30
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse.
+                    #            eclipse-ecf:
+                    #                buildorder: 30
+                    #                ref: eclipse
+                    #                arches: [x86_64, ppc64le, aarch64, s390x]
+                    #                rationale: >
+                    #                    Runtime dependency of eclipse.
             eclipse-egit:
                 buildorder: 50
                 ref: eclipse
@@ -390,12 +389,12 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-            eclipse-emf:
-                buildorder: 20
-                ref: tycho
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse, eclipse-ecf.
+                    #            eclipse-emf:
+                    #                buildorder: 20
+                    #                ref: eclipse
+                    #                arches: [x86_64, ppc64le, aarch64, s390x]
+                    #                rationale: >
+                    #                    Runtime dependency of eclipse, eclipse-ecf.
             eclipse-epp-logging:
                 buildorder: 40
                 ref: eclipse