From 2a981c10df960c89990773b559da2f1742a334ba Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 11 Jun 2019 00:32:54 +0100 Subject: [PATCH] Add webtools, testng and m2e deps. --- clone_rpms.sh | 3 +- eclipse.yaml | 188 +++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 173 insertions(+), 18 deletions(-) diff --git a/clone_rpms.sh b/clone_rpms.sh index 0558d91..b21c525 100755 --- a/clone_rpms.sh +++ b/clone_rpms.sh @@ -7,10 +7,11 @@ module=$(basename $script_location) mkdir -p rpms pushd rpms 2>&1 >/dev/null +rm -f need_branch for pkg in $(grep -B1 --no-group-separator buildorder ../$module.yaml | grep -v buildorder | sed -e 's/:$//') ; do if [ ! -d "$pkg" ] ; then fedpkg clone $pkg - (cd $pkg ; fedpkg switch-branch master ; fedpkg switch-branch $module) + (cd $pkg ; if ! fedpkg switch-branch $module ; then echo $pkg >> ../need_branch ; fi) fi done diff --git a/eclipse.yaml b/eclipse.yaml index f5894a8..42981ef 100644 --- a/eclipse.yaml +++ b/eclipse.yaml @@ -262,20 +262,40 @@ data: %_without_remote 1 %_without_photran_support 1 %_without_reflections 1 + %_without_okcurl 1 components: rpms: + aether-connector-okhttp: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core. antlr32: buildorder: 20 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-pydev, jython, sqljet. + apache-commons-collections: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core, + eclipse-webtools, plexus-velocity, velocity. apache-commons-compress: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of docker-client-java, eclipse-jgit, jython. + apache-commons-discovery: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools. apache-commons-el: buildorder: 10 ref: eclipse @@ -293,7 +313,8 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of docker-client-java, eclipse-mylyn. + Runtime dependency of docker-client-java, eclipse-m2e-core, + eclipse-mylyn, eclipse-webtools, velocity. apache-sshd: buildorder: 10 ref: eclipse @@ -305,13 +326,19 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-jgit. + Runtime dependency of closure-compiler, eclipse-jgit. base64coder: buildorder: 10 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of snakeyaml. + beust-jcommander: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of testng. batik: buildorder: 20 ref: eclipse @@ -329,7 +356,14 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of docker-client-java, eclipse-jgit, jython. + Runtime dependency of docker-client-java, eclipse-jgit, + jython, okhttp. + closure-compiler: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools. docker-client-java: buildorder: 50 ref: eclipse @@ -355,6 +389,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + Runtime dependency of eclipse-webtools. eclipse-egit: buildorder: 40 ref: eclipse @@ -382,7 +417,7 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. - Runtime dependency of eclipse-dtp, eclipse-subclipse. + Runtime dependency of eclipse-dtp, eclipse-subclipse, eclipse-webtools. eclipse-jgit: buildorder: 30 ref: eclipse @@ -398,6 +433,19 @@ data: rationale: > Module API. Runtime dependency of eclipse-cdt. + eclipse-m2e-core: + buildorder: 50 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + Runtime dependency of eclipse-testng. + eclipse-m2e-workspace: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core. eclipse-mpc: buildorder: 10 ref: eclipse @@ -409,6 +457,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > + Module API. Runtime dependency of eclipse-abrt, eclipse-egit, eclipse-egit-github, eclipse-epp-logging, eclipse-subclipse. @@ -437,6 +486,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + eclipse-testng: + buildorder: 60 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. eclipse-tm-terminal: buildorder: 50 ref: eclipse @@ -450,6 +505,13 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + eclipse-webtools: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. + Runtime dependency of eclipse-m2e-core. ed25519-java: buildorder: 10 ref: eclipse @@ -517,6 +579,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-cdt, eclipse-ptp, glassfish-jaxb. + glassfish-jaxrpc-api: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools. glassfish-jsp: buildorder: 30 ref: eclipse @@ -540,8 +608,9 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, eclipse-cdt, eclipse-egit-github, - eclipse-epp-logging, eclipse-jgit, eclipse-mylyn. + Runtime dependency of closure-compiler, eclipse, eclipse-cdt, eclipse-egit-github, + eclipse-epp-logging, eclipse-jgit, eclipse-m2e-core, eclipse-mylyn, eclipse-testng, + eclipse-webtools, testng-remote. icu4j: buildorder: 10 ref: eclipse @@ -595,6 +664,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-mylyn. + java_cup: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools. javaewah: buildorder: 10 ref: eclipse @@ -613,6 +688,19 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of glassfish-hk2. + jchardet: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core, + maven-archetype. + jctools: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of jython, netty. jersey: buildorder: 40 ref: eclipse @@ -620,18 +708,13 @@ data: rationale: > Runtime dependency of docker-client-java, eclipse-linuxtools. - jctools: - buildorder: 20 - ref: eclipse - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Runtime dependency of jython, netty. jetty: buildorder: 20 ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, eclipse-jgit. + Runtime dependency of eclipse, eclipse-jgit, + eclipse-m2e-core, eclipse-webtools. jffi: buildorder: 10 ref: eclipse @@ -700,6 +783,12 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of svnkit. + json_simple: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-webtools. jython: buildorder: 40 ref: eclipse @@ -723,7 +812,20 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, eclipse-dtp, eclipse-mylyn. + Runtime dependency of eclipse, eclipse-dtp, + eclipse-m2e-core, eclipse-mylyn, maven-indexer. + maven-archetype: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core. + maven-indexer: + buildorder: 20 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core. nekohtml: buildorder: 10 ref: eclipse @@ -741,7 +843,27 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, jersey, jnr-ffi, jython. + Runtime dependency of eclipse, eclipse-m2e-core, jersey, 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, + eclipse-m2e-core, okhttp. + protobuf: + buildorder: 10 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of closure-compiler. rxtx: buildorder: 10 ref: eclipse @@ -771,7 +893,7 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-pydev. + Runtime dependency of eclipse-pydev, eclipse-testng, testng. sqljet: buildorder: 30 ref: eclipse @@ -796,12 +918,37 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse-linuxtools. + testng: + buildorder: 30 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-testng, testng-remote. + testng-remote: + buildorder: 40 + ref: eclipse + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-testng. trilead-ssh2: buildorder: 10 ref: eclipse 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 + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-m2e-core, + eclipse-webtools, maven-archetype, plexus-velocity. ws-commons-util: buildorder: 10 ref: eclipse @@ -813,7 +960,14 @@ data: ref: eclipse arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-dtp. + Runtime dependency of eclipse-dtp, 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: eclipse