diff --git a/eclipse.yaml b/eclipse.yaml
index f66c7d3..46672c3 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -13,11 +13,11 @@ data:
     dependencies:
         - buildrequires:
               tycho: [1.4]
-#              eclipse: [latest]
+              eclipse: [latest]
               platform: [-f28,-f29]
           requires:
-#              ant: [1.10]
-#              maven: [3.5]
+              ant: [1.10]
+              maven: [3.5]
               platform: [-f28,-f29]
     profiles:
         everything:
@@ -62,6 +62,7 @@ data:
                 - eclipse-m2e-core
                 - eclipse-m2e-egit
                 - eclipse-m2e-mavenarchiver
+                - eclipse-m2e-mavendev
                 - eclipse-m2e-tycho
                 - eclipse-m2e-workspace
                 - eclipse-m2e-wtp
@@ -109,6 +110,7 @@ data:
                 - eclipse-m2e-core
                 - eclipse-m2e-egit
                 - eclipse-m2e-mavenarchiver
+                - eclipse-m2e-mavendev
                 - eclipse-m2e-tycho
                 - eclipse-m2e-workspace
                 - eclipse-mpc
@@ -185,6 +187,7 @@ data:
             - eclipse-m2e-core
             - eclipse-m2e-egit
             - eclipse-m2e-mavenarchiver
+            - eclipse-m2e-mavendev
             - eclipse-m2e-tycho
             - eclipse-m2e-workspace
             - eclipse-m2e-wtp
@@ -222,7 +225,6 @@ data:
     buildopts:
         rpms:
             macros: |
-                %_with_bootstrap 1
                 %_with_jp_minimal 1
                 %_without_javahl 1
                 %_without_spring 1
@@ -342,12 +344,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
@@ -369,12 +371,12 @@ data:
                 rationale: >
                     Module API.
                     Runtime dependency of eclipse-webtools.
-#           eclipse-ecf:
-#               buildorder: 30
-#               ref: eclipse
-#               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
@@ -389,12 +391,12 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-#           eclipse-emf:
-#               buildorder: 20
-#               ref: eclipse
-#               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
@@ -450,8 +452,8 @@ data:
                 rationale: >
                     Module API.
                     Runtime dependency of eclipse-m2e-apt, eclipse-m2e-mavenarchiver,
-                         eclipse-m2e-buildhelper, eclipse-m2e-egit, eclipse-m2e-tycho,
-                         eclipse-m2e-wtp, eclipse-testng.
+                         eclipse-m2e-mavendev, eclipse-m2e-buildhelper, eclipse-m2e-egit,
+                         eclipse-m2e-tycho, eclipse-m2e-wtp, eclipse-testng.
             eclipse-m2e-egit:
                 buildorder: 70
                 ref: eclipse
@@ -464,7 +466,13 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-m2e-wtp.
+                    Runtime dependency of eclipse-m2e-mavendev, eclipse-m2e-wtp.
+            eclipse-m2e-mavendev:
+                buildorder: 80
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
             eclipse-m2e-tycho:
                 buildorder: 70
                 ref: eclipse