From 8d45bcfc6284747739277becaac3bfa2b2df8906 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 23 Apr 2019 16:49:09 +0100 Subject: [PATCH] Add full deps for tycho, including eclipse itself to avoid mutual dependency on the eclipse module --- koschei.cfg | 346 ++++++++++++++++++--------------------------------- tycho.yaml | 352 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 397 insertions(+), 301 deletions(-) diff --git a/koschei.cfg b/koschei.cfg index 79eb841..92aa23d 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -12,10 +12,10 @@ config = { "bootstrap": False, "full_refs": False, - "default_ref": "f30", + "default_ref": "tycho", "include_build_deps": True, "closure": False, - "filter_unused": True, + "filter_unused": False, "topo_sort": True, "api": [ @@ -35,250 +35,152 @@ config = { "includes": [ ], "excludes": [ - # Packages from javapackages-tools module - "ant", - "ant-contrib", - "antlr", - "aopalliance", - "apache-commons-beanutils", - "apache-commons-cli", - "apache-commons-codec", - "apache-commons-collections", - "apache-commons-compress", - "apache-commons-exec", - "apache-commons-io", - "apache-commons-jxpath", - "apache-commons-lang", - "apache-commons-lang3", - "apache-commons-logging", - "apache-commons-net", - "apache-commons-parent", - "apache-ivy", - "apache-parent", - "apache-resource-bundles", - "aqute-bnd", - "assertj-core", - "atinject", - "bcel", - "beust-jcommander", - "bsf", - "bsh", - "byaccj", - "cal10n", - "cdi-api", - "cglib", - "easymock", - "exec-maven-plugin", - "felix-osgi-compendium", - "felix-osgi-core", - "felix-osgi-foundation", - "felix-parent", - "felix-utils", - "forge-parent", - "fusesource-pom", - "geronimo-annotation", - "geronimo-jms", - "geronimo-jpa", - "geronimo-parent-poms", - "glassfish-annotation-api", - "glassfish-el", - "glassfish-jsp-api", - "glassfish-legal", - "glassfish-master-pom", - "glassfish-servlet-api", - "google-guice", - "guava20", - "hamcrest", - "hawtjni", - "httpcomponents-client", - "httpcomponents-core", - "httpcomponents-project", - "isorelax", - "jakarta-commons-httpclient", - "jakarta-oro", - "jansi", - "jansi-native", - "java_cup", - "javacc", - "javacc-maven-plugin", - "javamail", - "javapackages-tools", - "javassist", - "jaxen", - "jboss-interceptors-1.2-api", - "jboss-parent", - "jdepend", - "jdependency", - "jdom", - "jdom2", - "jflex", - "jline", - "jsch", - "jsoup", - "jsr-305", - "jtidy", - "junit", - "jvnet-parent", - "jzlib", - "log4j12", - "maven", - "maven-antrun-plugin", - "maven-archiver", - "maven-artifact-resolver", - "maven-artifact-transfer", - "maven-assembly-plugin", - "maven-clean-plugin", - "maven-common-artifact-filters", - "maven-compiler-plugin", - "maven-dependency-analyzer", - "maven-dependency-plugin", - "maven-dependency-tree", - "maven-doxia", - "maven-doxia-sitetools", - "maven-enforcer", - "maven-file-management", - "maven-filtering", - "maven-install-plugin", - "maven-invoker", - "maven-invoker-plugin", - "maven-jar-plugin", - "maven-parent", - "maven-plugin-build-helper", - "maven-plugin-bundle", - "maven-plugin-testing", - "maven-plugin-tools", - "maven-plugins-pom", - "maven-remote-resources-plugin", - "maven-reporting-api", - "maven-reporting-impl", - "maven-resolver", - "maven-resources-plugin", - "maven-script-interpreter", - "maven-shade-plugin", - "maven-shared", - "maven-shared-incremental", - "maven-shared-io", - "maven-shared-utils", - "maven-source-plugin", - "maven-surefire", - "maven-verifier", - "maven-wagon", - "maven2", - "mockito", - "modello", - "mojo-parent", - "munge-maven-plugin", - "objectweb-asm", - "objectweb-pom", - "objenesis", - "os-maven-plugin", - "osgi-annotation", - "osgi-compendium", - "osgi-core", - "plexus-ant-factory", - "plexus-archiver", - "plexus-bsh-factory", - "plexus-build-api", - "plexus-cipher", - "plexus-classworlds", - "plexus-cli", - "plexus-compiler", - "plexus-component-api", - "plexus-component-factories-pom", - "plexus-components-pom", - "plexus-containers", - "plexus-i18n", - "plexus-interactivity", - "plexus-interpolation", - "plexus-io", - "plexus-languages", - "plexus-pom", - "plexus-resources", - "plexus-sec-dispatcher", - "plexus-utils", - "plexus-velocity", - "powermock", - "qdox", - "regexp", - "sisu", - "sisu-mojos", - "slf4j", - "sonatype-oss-parent", - "sonatype-plugins-parent", - "spec-version-maven-plugin", - "spice-parent", - "testng", - "velocity", - "weld-parent", - "xalan-j2", - "xbean", - "xerces-j2", - "xml-commons-apis", - "xml-commons-resolver", - "xmlunit", - "xmvn", # Additional Runtime Exclusions "apache-commons-configuration", - "apache-commons-el", - "apache-sshd", - "args4j", "avalon-framework", "avalon-logkit", - "batik", "dain-snappy", - "eclipse", - "eclipse-ecf", - "eclipse-emf", - "eclipse-jgit", - "ed25519-java", "extra166y", - "felix-gogo-command", - "felix-gogo-runtime", - "felix-gogo-shell", - "felix-scr", "fop", - "glassfish-jsp", - "google-gson", "gpars", "groovy", - "icu4j", - "javaewah", "jcsp", - "jetty", - "junit5", - "kxml", - "lucene", "maven-javadoc-plugin", "multiverse", "netty-tcnative", "netty3", - "opentest4j", "parboiled", "pdfbox", "pegdown", - "sac", - "sat4j", - "univocity-parsers", - "xmlgraphics-commons", - "xpp3", "xstream", - "xz-java", # Additional Buildtime Exclusions - "apiguardian", - "base64coder", - "bouncycastle", + "aalto-xml", + "aesh", + "antlr3", + "antlr32", + "apacheds", + "apache-commons-dbcp", + "apache-commons-pool", + "avro", + "bookkeeper", + "buildnumber-maven-plugin", "byte-buddy", - "cli-parser", + "bytelist", + "classmate", + "curator", + "eclipselink-persistence-api", + "ehcache-core", + "fastutil", "felix-bundlerepository", + "geronimo-validation", + "geronimo-interceptor", + "gnu-getopt", "guava", + "hadoop", + "hibernate3", + "hibernate-jpa-2.0-api", + "hibernate-validator", + "hppc", + "jackson", + "jboss-annotations-1.2-api", + "jboss-classfilewriter", + "jboss-ejb-3.2-api", + "jboss-el-3.0-api", + "jboss-logging", + "jboss-logging-tools", + "jboss-marshalling", + "jboss-remoting", + "jboss-remoting-jmx", + "jboss-sasl", + "jboss-transaction-1.1-api", + "jcodings", + "jctools", + "jdeparser", + "jersey1", + "jets3t", + "jffi", + "jgroups", + "jna", + "jnr-constants", + "jnr-enxio", + "jnr-ffi", + "jnr-netdb", + "jnr-posix", + "jnr-x86asm", + "joda-time", + "jsr-311", + "kohsuke-pom", + "leveldb-java", + "leveldbjni", + "log4j", + "maven-mapping", + "metrics", + "mx4j", + "netty", + "objectweb-asm3", + "protobuf", + "protoparser", + "resteasy", + "rhino", + "scala", + "snappy-java", + "stax2-api", + "stream-lib", + "stringtemplate", + "stringtemplate4", + "wildfly-common", + "xnio", + # eclipse (without contributor_tools and tests) + "apache-commons-fileupload", + "eclipse-egit", + # eclipse-ecf (without providers) + "dnsjava", + "irclib", + # batik (jp_minimal) + "jython", + # mustache-java (jp_minimal) "jackson-dataformats-text", + "cli-parser", + # tesla-polyglot (jp_minimal) "mvn(org.codehaus.gmavenplus:gmavenplus-plugin)", - "mvn(org.openjdk.jmh:jmh-core)", - "mvn(org.openjdk.jmh:jmh-generator-annprocess)", - "mvn(org.yaml:snakeyaml)", + "mvn(org.codehaus.groovy:groovy)", "snakeyaml", + "base64coder", + # lucene (jp_minimal) + "antlr4", + "morfologik-stemming", + "nekohtml", + "randomizedtesting", + "spatial4j", + # jetty (jp_minimal) + "geronimo-jaspic-spec", + "glassfish-transaction-api", + "glassfish-websocket-api", + "infinispan", + "jboss-websocket-1.0-api", + "jetty-alpn", + "jetty-alpn-api", + "jetty-artifact-remote-resources", + "jetty-assembly-descriptors", + "jetty-distribution-remote-resources", + "jetty-parent", + "jetty-schemas", + "jetty-test-helper", + "jetty-test-policy", + "jetty-toolchain", + "jnr-unixsocket", + "maven-war-plugin", + "mongo-java-driver", + "protostream", "springframework", + "tomcat", + "tomcat-taglibs-standard", + "weld-api", + "weld-core", ], + "module_excludes": { + ("javapackages-tools", "201801"), + }, "frozen_refs": [ ], "stream_override": { @@ -286,16 +188,14 @@ config = { "1.3": "[201801]", }, "platform": { - "1.3": "[f28]", + "1.3": "[f31]", }, }, "macros": { "_with_bootstrap": 1, "_with_jp_minimal": 1, - "_without_groovy": 1, - "_without_junit5": 1, - "_without_snakeyaml": 1, + "_without_jgit_eclipse_features": 1, }, "summary": "Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven", diff --git a/tycho.yaml b/tycho.yaml index 4072253..99debd6 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -30,10 +30,11 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] - platform: [f28] + platform: [f31] + tycho: [1.3] requires: javapackages-tools: [201801] - platform: [] + platform: [f31] profiles: default: rpms: @@ -42,145 +43,312 @@ data: api: rpms: - cbi-plugins + - takari-tycho-support - tycho - tycho-extras - filter: - rpms: - - auto - - auto-javadoc - - cbi-plugins-javadoc - - decentxml-javadoc - - eclipse-m2e-workspace-javadoc - - jackson-annotations-javadoc - - jackson-core-javadoc - - jackson-databind-javadoc - - javapoet-javadoc - - mustache-java-javadoc - - mustache-java-maven-plugin - - replacer-javadoc - - takari-archiver-javadoc - - takari-incrementalbuild-javadoc - - takari-lifecycle-javadoc - - takari-plugin-testing-javadoc - - tesla-polyglot - - tesla-polyglot-atom - - tesla-polyglot-groovy - - tesla-polyglot-javadoc - - tesla-polyglot-maven-plugin - - tesla-polyglot-translate-plugin - - tesla-polyglot-xml - - tesla-polyglot-yaml - - tycho-extras-javadoc - - tycho-javadoc buildopts: rpms: macros: | %_with_bootstrap 1 %_with_jp_minimal 1 - %_without_groovy 1 - %_without_junit5 1 - %_without_snakeyaml 1 + %_without_jgit_eclipse_features 1 components: rpms: + apache-commons-el: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + Build dependency of eclipse. + apache-sshd: + buildorder: 20 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-jgit. + Build dependency of eclipse, eclipse-jgit. + args4j: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-jgit. + Build dependency of eclipse-jgit. auto: buildorder: 20 - ref: f30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of cbi-plugins. Build dependency of cbi-plugins. + batik: + buildorder: 20 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + Build dependency of eclipse. + bouncycastle: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-jgit. + Build dependency of apache-sshd, eclipse-jgit. cbi-plugins: - buildorder: 30 - ref: f30 + buildorder: 50 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + Build dependency of eclipse. decentxml: buildorder: 10 - ref: f30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of cbi-plugins, tycho. Build dependency of cbi-plugins, tycho. ecj: buildorder: 10 - ref: f30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-lifecycle, tycho. - Build dependency of tycho. + Build dependency of glassfish-jsp, tycho. + eclipse: + buildorder: 120 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-emf, takari-lifecycle, + tycho. + Build dependency of eclipse, eclipse-ecf, eclipse-emf, + jetty, takari-lifecycle, tycho. + eclipse-ecf: + buildorder: 110 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + Build dependency of eclipse. + eclipse-emf: + buildorder: 110 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + Build dependency of eclipse, eclipse-ecf. + eclipse-jgit: + buildorder: 30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of tycho-extras. + Build dependency of eclipse-jgit, tycho-extras. + eclipse-license: + buildorder: 50 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Build dependency of eclipse, eclipse-ecf. eclipse-m2e-workspace: buildorder: 10 - ref: f30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-lifecycle, takari-plugin-testing. Build dependency of takari-lifecycle, takari-plugin-testing. + ed25519-java: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-jgit. + Build dependency of apache-sshd, eclipse-jgit. fasterxml-oss-parent: - buildorder: 1 - ref: f30 + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jackson-parent. Build dependency of jackson-parent. - jackson-annotations: + felix-gogo-command: + buildorder: 30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + Build dependency of eclipse. + felix-gogo-parent: buildorder: 10 - ref: f30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Build dependency of felix-gogo-command, + felix-gogo-runtime, felix-gogo-shell. + felix-gogo-runtime: + buildorder: 20 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse, felix-gogo-command, + felix-gogo-shell. + Build dependency of eclipse, felix-gogo-command, + felix-gogo-shell, felix-scr. + felix-gogo-shell: + buildorder: 30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + Build dependency of eclipse. + felix-scr: + buildorder: 30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + Build dependency of eclipse. + glassfish-jsp: + buildorder: 20 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + Build dependency of eclipse. + google-gson: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-jgit, takari-lifecycle. + Build dependency of eclipse-jgit, takari-lifecycle. + icu4j: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + Build dependency of eclipse. + jackson-annotations: + buildorder: 30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jackson-databind. Build dependency of jackson-databind. jackson-bom: - buildorder: 10 - ref: f30 + buildorder: 30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Build dependency of jackson-core, jackson-databind. jackson-core: - buildorder: 15 - ref: f30 + buildorder: 40 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jackson-databind, mustache-java. Build dependency of jackson-databind, mustache-java. jackson-databind: - buildorder: 20 - ref: f30 + buildorder: 50 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of mustache-java. Build dependency of mustache-java. jackson-parent: - buildorder: 5 - ref: f30 + buildorder: 20 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jackson-bom. Build dependency of jackson-annotations, jackson-bom. + javaewah: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse-jgit. + Build dependency of eclipse-jgit. javapoet: buildorder: 10 - ref: f30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of auto, takari-incrementalbuild. Build dependency of auto, takari-incrementalbuild, takari-lifecycle. + jetty: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse, eclipse-jgit. + Build dependency of eclipse, eclipse-jgit. + kxml: + buildorder: 20 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of felix-scr. + Build dependency of felix-scr. + lucene: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + Build dependency of eclipse. mustache-java: - buildorder: 30 - ref: f30 + buildorder: 60 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-lifecycle. Build dependency of takari-lifecycle. replacer: - buildorder: 1 - ref: f29 + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Build dependency of jackson-core, jackson-databind. + sac: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + Build dependency of eclipse. + sat4j: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of eclipse. + Build dependency of eclipse. takari-archiver: buildorder: 10 - ref: f30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-lifecycle. Build dependency of takari-lifecycle. takari-incrementalbuild: buildorder: 20 - ref: f30 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-lifecycle. Build dependency of takari-lifecycle. takari-lifecycle: - buildorder: 40 - ref: f30 + buildorder: 70 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-pom. Build dependency of eclipse-m2e-workspace, @@ -188,42 +356,70 @@ data: takari-lifecycle, takari-plugin-testing, takari-pom, tesla-polyglot. takari-plugin-testing: - buildorder: 20 - ref: f30 + buildorder: 90 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Build dependency of takari-incrementalbuild, takari-lifecycle. takari-pom: - buildorder: 50 - ref: f30 + buildorder: 80 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-tycho-support. Build dependency of takari-archiver, takari-incrementalbuild, takari-lifecycle, takari-plugin-testing, takari-tycho-support, tesla-polyglot. - #takari-tycho-support: - #buildorder: 60 - #ref: f30 - #rationale: > - #Module API. + takari-tycho-support: + buildorder: 90 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. tesla-polyglot: - buildorder: 10 - ref: f30 + buildorder: 90 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of tycho-extras. Build dependency of tycho-extras. tycho: - buildorder: 20 - ref: f30 + buildorder: 40 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. Runtime dependency of cbi-plugins, takari-tycho-support, tycho-extras. - Build dependency of cbi-plugins, takari-tycho-support, - tycho, tycho-extras. + Build dependency of cbi-plugins, eclipse, eclipse-ecf, + eclipse-emf, eclipse-jgit, eclipse-license, + takari-tycho-support, tycho, tycho-extras. tycho-extras: - buildorder: 30 - ref: f30 + buildorder: 100 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. + Build dependency of eclipse, eclipse-ecf, eclipse-emf. + xml-maven-plugin: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Build dependency of eclipse. + xmlgraphics-commons: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of batik, eclipse. + Build dependency of batik, eclipse. + xpp3: + buildorder: 10 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Runtime dependency of felix-scr, kxml. + Build dependency of eclipse-ecf, felix-scr, kxml.