diff --git a/eclipse.yaml b/eclipse.yaml
index c2f3715..bcff6e4 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -12,7 +12,6 @@ data:
             - MIT
     dependencies:
         - buildrequires:
-              tycho: ["1.6"]
               platform: ["-f28", "-f29", "-f30"]
           requires:
               platform: ["-f28", "-f29", "-f30"]
@@ -139,13 +138,11 @@ data:
     buildopts:
         rpms:
             macros: |
-                %_with_bootstrap 1
                 %_with_jp_minimal 1
                 %_without_javahl 1
                 %_without_spring 1
                 %_without_tests 1
                 %_without_reflections 1
-                %_without_okcurl 1
                 %_without_snappy 1
                 %_without_hsqldb 1
                 %_without_junit5 1
@@ -165,22 +162,16 @@ data:
                     Runtime dependency of eclipse-pydev, jython, sqljet.
             apache-commons-collections:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-m2e-core, plexus-velocity, velocity.
             apache-commons-compress:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of jgit, jython.
-            apache-commons-discovery:
-                buildorder: 10
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-webtools.
             apache-commons-jxpath:
                 buildorder: 10
                 ref: master
@@ -189,7 +180,7 @@ data:
                     Runtime dependency of eclipse.
             apache-commons-lang:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-m2e-core, velocity.
@@ -339,12 +330,6 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-cdt.
-            glassfish-annotation-api:
-                buildorder: 10
-                ref: master
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse.
             glassfish-el:
                 buildorder: 10
                 ref: master
@@ -353,13 +338,13 @@ data:
                     Runtime dependency of eclipse, glassfish-jsp-api.
             glassfish-jaxb:
                 buildorder: 20
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-cdt.
             glassfish-jaxb-api:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-cdt, glassfish-jaxb.
@@ -400,9 +385,15 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, jython.
+            jakarta-annotations:
+                buildorder: 10
+                ref: 98a08791842b18e2386f3288d04322abd3146248
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse.
             java_cup:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-webtools.
@@ -414,7 +405,7 @@ data:
                     Runtime dependency of jgit.
             javaparser:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Build dependency of jctools.
@@ -427,7 +418,7 @@ data:
                          maven-archetype.
             jctools:
                 buildorder: 20
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of jython, netty.
@@ -453,43 +444,43 @@ data:
                     Runtime dependency of eclipse-jgit.
             jline:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of jython.
             jna:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of jsch-agent-proxy, svnkit.
             jnr-constants:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of jnr-enxio, jnr-posix, jython.
             jnr-ffi:
                 buildorder: 20
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of jnr-enxio, jnr-netdb, jnr-posix, jython.
             jnr-netdb:
                 buildorder: 30
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of jython.
             jnr-posix:
                 buildorder: 30
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of jython.
             jnr-x86asm:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of jnr-ffi.
@@ -501,7 +492,7 @@ data:
                     Runtime dependency of svnkit.
             jython:
                 buildorder: 40
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-pydev.
@@ -564,13 +555,13 @@ data:
                          okhttp.
             plexus-build-api:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-m2e-core.
             plexus-velocity:
                 buildorder: 30
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-m2e-core,
@@ -601,7 +592,7 @@ data:
                     Runtime dependency of eclipse-pydev.
             sqljet:
                 buildorder: 30
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of svnkit.
@@ -629,15 +620,9 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of jsch-agent-proxy, svnkit.
-            uddi4j:
-                buildorder: 10
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-webtools, wsil4j.
             velocity:
                 buildorder: 20
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-m2e-core, maven-archetype, plexus-velocity.
@@ -647,18 +632,6 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-pydev, xmlrpc.
-            wsdl4j:
-                buildorder: 10
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-webtools, wsil4j.
-            wsil4j:
-                buildorder: 20
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-webtools.
             xmlgraphics-commons:
                 buildorder: 10
                 ref: master