From 1a0d93fc5b84f8d0e430d8c88f5a197ff0eb30c3 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 24 Mar 2020 15:57:34 +0000 Subject: [PATCH] * Drop some obsoleted pakages * Build against tycho 1.6 * Build from master branch in some cases --- eclipse.yaml | 133 ++++++++++++++++++--------------------------------- 1 file changed, 47 insertions(+), 86 deletions(-) diff --git a/eclipse.yaml b/eclipse.yaml index d4effe7..4c329bd 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -12,7 +12,7 @@ data: - MIT dependencies: - buildrequires: - tycho: ["1.5"] + tycho: ["1.6"] platform: ["-f28", "-f29"] requires: platform: ["-f28", "-f29"] @@ -25,10 +25,10 @@ data: - eclipse-cdt-llvm - eclipse-cdt-native - eclipse-cdt-qt + - eclipse-cdt-terminal - eclipse-ecf-core - eclipse-ecf-runtime - eclipse-egit - - eclipse-egit-github - eclipse-emf-core - eclipse-emf-runtime - eclipse-emf-xsd @@ -36,7 +36,6 @@ data: - eclipse-gef - eclipse-jdt - eclipse-jgit - - eclipse-launchbar - eclipse-linuxtools - eclipse-linuxtools-changelog - eclipse-linuxtools-docker @@ -73,8 +72,6 @@ data: - eclipse-remote - eclipse-subclipse - eclipse-swt - - eclipse-tm-terminal - - eclipse-tm-terminal-connectors - eclipse-usage - eclipse-webtools-common - eclipse-webtools-dali @@ -84,7 +81,6 @@ data: java: rpms: - eclipse-egit - - eclipse-egit-github - eclipse-jdt - eclipse-jgit - eclipse-m2e-core @@ -102,10 +98,9 @@ data: - eclipse-cdt-docker - eclipse-cdt-llvm - eclipse-cdt-qt + - eclipse-cdt-terminal - eclipse-egit - - eclipse-egit-github - eclipse-jgit - - eclipse-launchbar - eclipse-linuxtools-changelog - eclipse-linuxtools-gcov - eclipse-linuxtools-gprof @@ -127,10 +122,10 @@ data: - eclipse-cdt-llvm - eclipse-cdt-native - eclipse-cdt-qt + - eclipse-cdt-terminal - eclipse-ecf-core - eclipse-ecf-runtime - eclipse-egit - - eclipse-egit-github - eclipse-emf-core - eclipse-emf-runtime - eclipse-emf-xsd @@ -138,7 +133,6 @@ data: - eclipse-gef - eclipse-jdt - eclipse-jgit - - eclipse-launchbar - eclipse-linuxtools - eclipse-linuxtools-changelog - eclipse-linuxtools-docker @@ -175,8 +169,6 @@ data: - eclipse-remote - eclipse-subclipse - eclipse-swt - - eclipse-tm-terminal - - eclipse-tm-terminal-connectors - eclipse-usage - eclipse-webtools-common - eclipse-webtools-dali @@ -190,13 +182,11 @@ data: %_with_jp_minimal 1 %_without_javahl 1 %_without_spring 1 - %_without_mylyn_epub 1 %_without_tests 1 %_without_reflections 1 %_without_okcurl 1 %_without_snappy 1 %_without_hsqldb 1 - %_without_groovy 1 components: rpms: aether-connector-okhttp: @@ -216,8 +206,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-m2e-core, - eclipse-webtools, plexus-velocity, velocity. + Runtime dependency of eclipse-m2e-core, plexus-velocity, velocity. apache-commons-compress: buildorder: 10 ref: eclipse @@ -232,7 +221,7 @@ data: Runtime dependency of eclipse-webtools. apache-commons-jxpath: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. @@ -242,22 +231,22 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of docker-client-java, eclipse-m2e-core, - eclipse-mylyn, eclipse-webtools, velocity. + eclipse-mylyn, velocity. apache-sshd: buildorder: 20 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jgit. args4j: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jgit. batik: buildorder: 20 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. @@ -269,7 +258,7 @@ data: Runtime dependency of jersey. bouncycastle: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of apache-sshd, docker-client-java, @@ -281,7 +270,7 @@ data: rationale: > Runtime dependency of eclipse-linuxtools. eclipse-cdt: - buildorder: 70 + buildorder: 60 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -290,38 +279,25 @@ data: eclipse-remote. eclipse-egit: buildorder: 50 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Module API. - Runtime dependency of eclipse-egit-github, eclipse-tm-terminal. - eclipse-egit-github: - buildorder: 60 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + Runtime dependency of eclipse-cdt. eclipse-gef: buildorder: 40 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. Runtime dependency of eclipse-linuxtools, eclipse-subclipse, eclipse-webtools. eclipse-jgit: buildorder: 40 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-egit, eclipse-egit-github. - eclipse-launchbar: - buildorder: 50 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Module API. - Runtime dependency of eclipse-cdt. + Runtime dependency of eclipse-egit. eclipse-linuxtools: buildorder: 90 ref: eclipse @@ -336,13 +312,13 @@ data: Module API. eclipse-m2e-workspace: buildorder: 40 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-m2e-core. eclipse-mpc: buildorder: 90 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. @@ -352,16 +328,15 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-egit, eclipse-egit-github, - eclipse-linuxtools, eclipse-subclipse. + Runtime dependency of eclipse-linuxtools, eclipse-subclipse. eclipse-pydev: buildorder: 50 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. eclipse-remote: - buildorder: 80 + buildorder: 70 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -373,13 +348,6 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - eclipse-tm-terminal: - buildorder: 60 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Module API. - Runtime dependency of eclipse-cdt, eclipse-remote. eclipse-usage: buildorder: 90 ref: eclipse @@ -395,38 +363,38 @@ data: Runtime dependency of eclipse-m2e-core. ed25519-java: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of apache-sshd, jgit. felix-gogo-command: buildorder: 20 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. felix-gogo-runtime: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, felix-gogo-command, felix-gogo-shell. felix-gogo-shell: buildorder: 20 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. felix-scr: buildorder: 30 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. freemarker: - buildorder: 10 - ref: eclipse + buildorder: 50 + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-cdt. @@ -459,7 +427,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-cdt, eclipse-webtools. + Runtime dependency of eclipse-cdt. glassfish-jaxb-api: buildorder: 10 ref: eclipse @@ -474,13 +442,13 @@ data: Runtime dependency of eclipse-webtools. glassfish-jsp: buildorder: 30 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. glassfish-jsp-api: buildorder: 20 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, glassfish-jsp. @@ -492,14 +460,14 @@ data: Runtime dependency of eclipse, glassfish-jsp-api, jetty. google-gson: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, eclipse-cdt, eclipse-egit-github, jgit, + Runtime dependency of eclipse, eclipse-cdt, jgit, eclipse-m2e-core, eclipse-mylyn, eclipse-webtools. icu4j: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, jython. @@ -564,7 +532,7 @@ data: Runtime dependency of eclipse-webtools. javaewah: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jgit. @@ -602,7 +570,7 @@ data: eclipse-linuxtools. jetty: buildorder: 20 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, jgit, @@ -615,7 +583,7 @@ data: Runtime dependency of jnr-ffi, jython. jgit: buildorder: 30 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. @@ -690,7 +658,7 @@ data: Runtime dependency of eclipse-pydev. lucene: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, eclipse-m2e-core, @@ -721,8 +689,8 @@ data: rationale: > Runtime dependency of glassfish-hk2. nekohtml: - buildorder: 80 - ref: eclipse + buildorder: 70 + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-linuxtools. @@ -771,21 +739,15 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Build dependency of jackson-core, jackson-databind. - rxtx: - buildorder: 10 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of eclipse-tm-terminal. sac: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. sat4j: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. @@ -820,7 +782,7 @@ data: rationale: > Runtime dependency of eclipse-subclipse. swt-chart: - buildorder: 80 + buildorder: 70 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -842,11 +804,10 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-m2e-core, - eclipse-webtools, maven-archetype, plexus-velocity. + Runtime dependency of eclipse-m2e-core, maven-archetype, plexus-velocity. ws-commons-util: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-pydev, xmlrpc. @@ -864,7 +825,7 @@ data: Runtime dependency of eclipse-webtools. xmlgraphics-commons: buildorder: 10 - ref: eclipse + ref: master arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of batik.