From f8be476f00a96758fe0914a2af8a55a49c042889 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Tue, 14 Jul 2020 14:03:43 +0100
Subject: [PATCH] Drop ok* stack and switch more packaged to master branch

---
 eclipse.yaml | 36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/eclipse.yaml b/eclipse.yaml
index 4969e0f..41396ae 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -164,12 +164,6 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, eclipse-ecf.
-            aether-connector-okhttp:
-                buildorder: 30
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-m2e-core.
             antlr32:
                 buildorder: 20
                 ref: master
@@ -223,7 +217,7 @@ data:
                 ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of apache-sshd, jgit, jython, okhttp.
+                    Runtime dependency of apache-sshd, jgit, jython.
             eclipse-cdt:
                 buildorder: 60
                 ref: eclipse
@@ -285,7 +279,7 @@ data:
                     Module API.
             eclipse-remote:
                 buildorder: 70
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
@@ -304,7 +298,7 @@ data:
                     Module API.
             eclipse-webtools:
                 buildorder: 50
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
@@ -421,7 +415,7 @@ data:
                     Build dependency of jctools.
             jchardet:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-m2e-core,
@@ -469,13 +463,13 @@ data:
                 ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of jnr-enxio, jnr-posix, jython.
+                    Runtime dependency of jnr-posix, jython.
             jnr-ffi:
                 buildorder: 20
                 ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of jnr-enxio, jnr-netdb, jnr-posix, jython.
+                    Runtime dependency of jnr-netdb, jnr-posix, jython.
             jnr-netdb:
                 buildorder: 30
                 ref: master
@@ -526,7 +520,7 @@ data:
                     Runtime dependency of eclipse-m2e-core.
             maven-invoker:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-m2e-core,
@@ -549,20 +543,6 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, eclipse-m2e-core, jnr-ffi, jython.
-            okhttp:
-                buildorder: 20
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of aether-connector-okhttp,
-                         eclipse-m2e-core.
-            okio:
-                buildorder: 10
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of aether-connector-okhttp,
-                         okhttp.
             plexus-build-api:
                 buildorder: 10
                 ref: master
@@ -590,7 +570,7 @@ data:
                     Runtime dependency of eclipse.
             sequence-library:
                 buildorder: 10
-                ref: eclipse
+                ref: master
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of svnkit.