From 832c273e85cf0cdcc787bf6b4a59e711b5056763 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 8 Feb 2019 18:11:33 +0000 Subject: [PATCH 01/56] Initial commit --- tycho.yaml | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 tycho.yaml diff --git a/tycho.yaml b/tycho.yaml new file mode 100644 index 0000000..edaa2db --- /dev/null +++ b/tycho.yaml @@ -0,0 +1,71 @@ +--- +document: modulemd +version: 2 +data: + summary: >- + Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven + description: >- + Tycho is a set of Maven plugins and extensions for building Eclipse plugins and + OSGI bundles with Maven. Eclipse plugins and OSGI bundles have their own metadata + for expressing dependencies, source folder locations, etc. that are normally found + in a Maven POM. Tycho uses native metadata for Eclipse plugins and OSGi bundles + and uses the POM to configure and drive the build. Tycho supports bundles, fragments, + features, update site projects and RCP applications. Tycho also knows how to run + JUnit test plugins using OSGi runtime and there is also support for sharing build + results using Maven artifact repositories. + + Tycho plugins introduce new packaging types and the corresponding lifecycle bindings + that allow Maven to use OSGi and Eclipse metadata during a Maven build. OSGi rules + are used to resolve project dependencies and package visibility restrictions are + honored by the OSGi-aware JDT-based compiler plugin. Tycho will use OSGi metadata + and OSGi rules to calculate project dependencies dynamically and injects them + into the Maven project model at build time. Tycho supports all attributes supported + by the Eclipse OSGi resolver (Require-Bundle, Import-Package, Eclipse-GenericRequire, + etc). Tycho will use proper classpath access rules during compilation. Tycho supports + all project types supported by PDE and will use PDE/JDT project metadata where + possible. One important design goal in Tycho is to make sure there is no duplication + of metadata between POM and OSGi metadata. + license: + module: + - MIT + dependencies: + - buildrequires: + javapackages-tools: [201801] + platform: [f30] + requires: + platform: [f30] + profiles: + default: + rpms: + - cbi-plugins + - tycho + - tycho-extras + api: + rpms: + - cbi-plugins + - tycho + - tycho-extras + filter: + rpms: + - cbi-plugins-javadoc + - tycho-javadoc + - tycho-extras-javadoc + buildopts: + rpms: + macros: | + %_with_bootstrap 1 + components: + rpms: + cbi-plugins: + buildorder: 10 + ref: master + rationale: Module API. + tycho: + buildorder: 10 + ref: master + rationale: Module API. + tycho-extras: + buildorder: 10 + ref: master + rationale: Module API. + From 988a8e2e113f89ccdbfa6f990b97f98409acdb1c Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 15 Feb 2019 10:13:45 +0000 Subject: [PATCH 02/56] Regenerate with runtime dependencies --- tycho.yaml | 169 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 102 insertions(+), 67 deletions(-) diff --git a/tycho.yaml b/tycho.yaml index edaa2db..259a903 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -2,70 +2,105 @@ document: modulemd version: 2 data: - summary: >- - Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven - description: >- - Tycho is a set of Maven plugins and extensions for building Eclipse plugins and - OSGI bundles with Maven. Eclipse plugins and OSGI bundles have their own metadata - for expressing dependencies, source folder locations, etc. that are normally found - in a Maven POM. Tycho uses native metadata for Eclipse plugins and OSGi bundles - and uses the POM to configure and drive the build. Tycho supports bundles, fragments, - features, update site projects and RCP applications. Tycho also knows how to run - JUnit test plugins using OSGi runtime and there is also support for sharing build - results using Maven artifact repositories. - - Tycho plugins introduce new packaging types and the corresponding lifecycle bindings - that allow Maven to use OSGi and Eclipse metadata during a Maven build. OSGi rules - are used to resolve project dependencies and package visibility restrictions are - honored by the OSGi-aware JDT-based compiler plugin. Tycho will use OSGi metadata - and OSGi rules to calculate project dependencies dynamically and injects them - into the Maven project model at build time. Tycho supports all attributes supported - by the Eclipse OSGi resolver (Require-Bundle, Import-Package, Eclipse-GenericRequire, - etc). Tycho will use proper classpath access rules during compilation. Tycho supports - all project types supported by PDE and will use PDE/JDT project metadata where - possible. One important design goal in Tycho is to make sure there is no duplication - of metadata between POM and OSGi metadata. - license: - module: - - MIT - dependencies: - - buildrequires: - javapackages-tools: [201801] - platform: [f30] - requires: - platform: [f30] - profiles: - default: - rpms: - - cbi-plugins - - tycho - - tycho-extras - api: - rpms: - - cbi-plugins - - tycho - - tycho-extras - filter: - rpms: - - cbi-plugins-javadoc - - tycho-javadoc - - tycho-extras-javadoc - buildopts: - rpms: - macros: | - %_with_bootstrap 1 - components: - rpms: - cbi-plugins: - buildorder: 10 - ref: master - rationale: Module API. - tycho: - buildorder: 10 - ref: master - rationale: Module API. - tycho-extras: - buildorder: 10 - ref: master - rationale: Module API. - + summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven + description: >- + Tycho is a set of Maven plugins and extensions for building Eclipse plugins and + OSGI bundles with Maven. Eclipse plugins and OSGI bundles have their own metadata + for expressing dependencies, source folder locations, etc. that are normally found + in a Maven POM. Tycho uses native metadata for Eclipse plugins and OSGi bundles + and uses the POM to configure and drive the build. Tycho supports bundles, fragments, + features, update site projects and RCP applications. Tycho also knows how to run + JUnit test plugins using OSGi runtime and there is also support for sharing build + results using Maven artifact repositories. + + Tycho plugins introduce new packaging types and the corresponding lifecycle bindings + that allow Maven to use OSGi and Eclipse metadata during a Maven build. OSGi rules + are used to resolve project dependencies and package visibility restrictions are + honored by the OSGi-aware JDT-based compiler plugin. Tycho will use OSGi metadata + and OSGi rules to calculate project dependencies dynamically and injects them + into the Maven project model at build time. Tycho supports all attributes supported + by the Eclipse OSGi resolver (Require-Bundle, Import-Package, Eclipse-GenericRequire, + etc). Tycho will use proper classpath access rules during compilation. Tycho supports + all project types supported by PDE and will use PDE/JDT project metadata where + possible. One important design goal in Tycho is to make sure there is no duplication + of metadata between POM and OSGi metadata. + license: + module: + - MIT + dependencies: + - buildrequires: + javapackages-tools: [201801] + platform: [f28] + requires: + javapackages-tools: [201801] + platform: [f28] + profiles: + default: + rpms: + - cbi-plugins + - tycho + - tycho-extras + api: + rpms: + - cbi-plugins + - tycho + - tycho-extras + filter: + rpms: + - auto + - auto-factory + - auto-javadoc + - cbi-plugins-javadoc + - decentxml-javadoc + - tesla-polyglot + - tesla-polyglot-atom + - 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_jp_minimal 1 + %_without_groovy 1 + components: + rpms: + auto: + buildorder: 10 + ref: master + rationale: > + Runtime dependency of cbi-plugins. + cbi-plugins: + buildorder: 30 + ref: master + rationale: > + Module API. + decentxml: + buildorder: 10 + ref: master + rationale: > + Runtime dependency of cbi-plugins, tycho. + ecj: + buildorder: 10 + ref: master + rationale: > + Runtime dependency of tycho. + tesla-polyglot: + buildorder: 10 + ref: master + rationale: > + Runtime dependency of tycho-extras. + tycho: + buildorder: 20 + ref: master + rationale: > + Module API. + Runtime dependency of cbi-plugins, tycho-extras. + tycho-extras: + buildorder: 30 + ref: master + rationale: > + Module API. From 5ab75f15898ca2f17c640c654cc064548e94c335 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 15 Feb 2019 14:48:52 +0000 Subject: [PATCH 03/56] Add javapoet BR for auto --- tycho.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tycho.yaml b/tycho.yaml index 259a903..8d44081 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -52,6 +52,8 @@ data: - auto-javadoc - cbi-plugins-javadoc - decentxml-javadoc + - javapoet + - javapoet-javadoc - tesla-polyglot - tesla-polyglot-atom - tesla-polyglot-javadoc @@ -88,6 +90,11 @@ data: ref: master rationale: > Runtime dependency of tycho. + javapoet: + buildorder: 10 + ref: master + rationale: > + Build dependency of auto. tesla-polyglot: buildorder: 10 ref: master From 9c4a1115fa7c91c033961efda194c9f2475711e2 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 15 Feb 2019 15:38:15 +0000 Subject: [PATCH 04/56] Fix build order of auto/javapoet --- tycho.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tycho.yaml b/tycho.yaml index 8d44081..9d6f77c 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -48,11 +48,9 @@ data: filter: rpms: - auto - - auto-factory - auto-javadoc - cbi-plugins-javadoc - decentxml-javadoc - - javapoet - javapoet-javadoc - tesla-polyglot - tesla-polyglot-atom @@ -91,10 +89,10 @@ data: rationale: > Runtime dependency of tycho. javapoet: - buildorder: 10 + buildorder: 0 ref: master rationale: > - Build dependency of auto. + Runtime dependency of auto. tesla-polyglot: buildorder: 10 ref: master From 69a948c6070fd4e9daf8715444cc216bd565e7d6 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 15 Feb 2019 16:49:25 +0000 Subject: [PATCH 05/56] Build with bootstrap flag --- tycho.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tycho.yaml b/tycho.yaml index 9d6f77c..da13482 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -48,12 +48,13 @@ data: filter: rpms: - auto + - auto-factory - auto-javadoc - cbi-plugins-javadoc - decentxml-javadoc - - javapoet-javadoc - tesla-polyglot - tesla-polyglot-atom + - tesla-polyglot-groovy - tesla-polyglot-javadoc - tesla-polyglot-maven-plugin - tesla-polyglot-translate-plugin @@ -64,6 +65,7 @@ data: buildopts: rpms: macros: | + %_with_bootstrap 1 %_with_jp_minimal 1 %_without_groovy 1 components: @@ -88,11 +90,6 @@ data: ref: master rationale: > Runtime dependency of tycho. - javapoet: - buildorder: 0 - ref: master - rationale: > - Runtime dependency of auto. tesla-polyglot: buildorder: 10 ref: master From a809f997d87acee543325feac9d252aac2467d0b Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 19 Feb 2019 18:36:38 +0000 Subject: [PATCH 06/56] Build tycho without Junit 5 support --- tycho.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tycho.yaml b/tycho.yaml index da13482..5567317 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -68,6 +68,7 @@ data: %_with_bootstrap 1 %_with_jp_minimal 1 %_without_groovy 1 + %_without_junit5 1 components: rpms: auto: From ef0c635bebdd7653e5d0391bfde0504bf220a677 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 20 Feb 2019 00:21:47 +0000 Subject: [PATCH 07/56] Add javapoet dependency of auto --- koschei.cfg | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tycho.yaml | 9 +- 2 files changed, 346 insertions(+), 2 deletions(-) create mode 100644 koschei.cfg diff --git a/koschei.cfg b/koschei.cfg new file mode 100644 index 0000000..5f7de13 --- /dev/null +++ b/koschei.cfg @@ -0,0 +1,339 @@ +# -*- python -*- +# vim: ft=python +config = { + "buildrequires": [ + "javapackages-tools", + "platform", + ], + "requires": [ + "javapackages-tools", + "platform", + ], + + "bootstrap": False, + "full_refs": False, + "default_ref": "master", + "include_build_deps": False, + "closure": False, + "filter_unused": True, + "topo_sort": True, + + "api": [ + "tycho", + "tycho-extras", + "cbi-plugins", + ], + "profiles": { + "default": [ + "tycho", + "tycho-extras", + "cbi-plugins", + ], + }, + "filter": [ + ], + "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 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", + ], + "frozen_refs": [ + ], + "stream_override": { + "javapackages-tools": { + "1.3": "[201801]", + }, + "platform": { + "1.3": "[f28]", + }, + }, + + "macros": { + "_with_bootstrap": 1, + "_with_jp_minimal": 1, + "_without_groovy": 1, + "_without_junit5": 1, + }, + + "summary": "Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven", + "description": """\ + Tycho is a set of Maven plugins and extensions for building Eclipse plugins and + OSGI bundles with Maven. Eclipse plugins and OSGI bundles have their own metadata + for expressing dependencies, source folder locations, etc. that are normally found + in a Maven POM. Tycho uses native metadata for Eclipse plugins and OSGi bundles + and uses the POM to configure and drive the build. Tycho supports bundles, fragments, + features, update site projects and RCP applications. Tycho also knows how to run + JUnit test plugins using OSGi runtime and there is also support for sharing build + results using Maven artifact repositories. + + Tycho plugins introduce new packaging types and the corresponding lifecycle bindings + that allow Maven to use OSGi and Eclipse metadata during a Maven build. OSGi rules + are used to resolve project dependencies and package visibility restrictions are + honored by the OSGi-aware JDT-based compiler plugin. Tycho will use OSGi metadata + and OSGi rules to calculate project dependencies dynamically and injects them + into the Maven project model at build time. Tycho supports all attributes supported + by the Eclipse OSGi resolver (Require-Bundle, Import-Package, Eclipse-GenericRequire, + etc). Tycho will use proper classpath access rules during compilation. Tycho supports + all project types supported by PDE and will use PDE/JDT project metadata where + possible. One important design goal in Tycho is to make sure there is no duplication + of metadata between POM and OSGi metadata. + """, + + "koji_config": { + "server": "https://koji.fedoraproject.org/kojihub", + "topurl": "https://kojipkgs.fedoraproject.org/", + "multicall_chunk_size": 1000, + "tag_name": "f30-build", + }, + "dependency": { + "repo_arch": "x86_64", + "resolve_for_arch": "x86_64", + "ignore_weak_deps": True, + "cache_l2_capacity": 2, + }, + "directories": { + "cachedir": "/tmp/maven-modulemd-gen", + }, + "logging": { + "version": 1, + "loggers": { + "": { + "level": "INFO", + "handlers": ["stderr"], + }, + }, + "handlers": { + "stderr": { + "class": "logging.StreamHandler", + "stream": "ext://sys.stderr" + }, + }, + }, +} diff --git a/tycho.yaml b/tycho.yaml index 5567317..d8e9fa4 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -48,10 +48,10 @@ data: filter: rpms: - auto - - auto-factory - auto-javadoc - cbi-plugins-javadoc - decentxml-javadoc + - javapoet-javadoc - tesla-polyglot - tesla-polyglot-atom - tesla-polyglot-groovy @@ -72,7 +72,7 @@ data: components: rpms: auto: - buildorder: 10 + buildorder: 20 ref: master rationale: > Runtime dependency of cbi-plugins. @@ -91,6 +91,11 @@ data: ref: master rationale: > Runtime dependency of tycho. + javapoet: + buildorder: 10 + ref: master + rationale: > + Runtime dependency of auto. tesla-polyglot: buildorder: 10 ref: master From df837b8793fe460d2c7e72ab6d638a0f6e9f47a7 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 15 Apr 2019 16:20:51 +0100 Subject: [PATCH 08/56] Additional build deps for tesla-polyglot (takari stack) --- koschei.cfg | 24 +++++++-- tycho.yaml | 140 +++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 148 insertions(+), 16 deletions(-) diff --git a/koschei.cfg b/koschei.cfg index 5f7de13..79eb841 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -12,8 +12,8 @@ config = { "bootstrap": False, "full_refs": False, - "default_ref": "master", - "include_build_deps": False, + "default_ref": "f30", + "include_build_deps": True, "closure": False, "filter_unused": True, "topo_sort": True, @@ -22,12 +22,12 @@ config = { "tycho", "tycho-extras", "cbi-plugins", + "takari-tycho-support", ], "profiles": { "default": [ "tycho", "tycho-extras", - "cbi-plugins", ], }, "filter": [ @@ -217,7 +217,7 @@ config = { "xml-commons-resolver", "xmlunit", "xmvn", - # Additional Exclusions + # Additional Runtime Exclusions "apache-commons-configuration", "apache-commons-el", "apache-sshd", @@ -263,6 +263,21 @@ config = { "xpp3", "xstream", "xz-java", + # Additional Buildtime Exclusions + "apiguardian", + "base64coder", + "bouncycastle", + "byte-buddy", + "cli-parser", + "felix-bundlerepository", + "guava", + "jackson-dataformats-text", + "mvn(org.codehaus.gmavenplus:gmavenplus-plugin)", + "mvn(org.openjdk.jmh:jmh-core)", + "mvn(org.openjdk.jmh:jmh-generator-annprocess)", + "mvn(org.yaml:snakeyaml)", + "snakeyaml", + "springframework", ], "frozen_refs": [ ], @@ -280,6 +295,7 @@ config = { "_with_jp_minimal": 1, "_without_groovy": 1, "_without_junit5": 1, + "_without_snakeyaml": 1, }, "summary": "Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven", diff --git a/tycho.yaml b/tycho.yaml index d8e9fa4..a5fbb80 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -37,12 +37,12 @@ data: profiles: default: rpms: - - cbi-plugins - tycho - tycho-extras api: rpms: - cbi-plugins + - takari-tycho-support - tycho - tycho-extras filter: @@ -51,7 +51,18 @@ data: - 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 @@ -69,46 +80,151 @@ data: %_with_jp_minimal 1 %_without_groovy 1 %_without_junit5 1 + %_without_snakeyaml 1 components: rpms: auto: buildorder: 20 - ref: master + ref: f30 rationale: > Runtime dependency of cbi-plugins. + Build dependency of cbi-plugins. cbi-plugins: buildorder: 30 - ref: master + ref: f30 rationale: > Module API. decentxml: buildorder: 10 - ref: master + ref: f30 rationale: > Runtime dependency of cbi-plugins, tycho. + Build dependency of cbi-plugins, tycho. ecj: buildorder: 10 - ref: master + ref: f30 rationale: > - Runtime dependency of tycho. + Runtime dependency of takari-lifecycle, tycho. + Build dependency of tycho. + eclipse-m2e-workspace: + buildorder: 10 + ref: f30 + rationale: > + Runtime dependency of takari-lifecycle, + takari-plugin-testing. + Build dependency of takari-lifecycle, + takari-plugin-testing. + fasterxml-oss-parent: + buildorder: 1 + ref: f30 + rationale: > + Runtime dependency of jackson-parent. + Build dependency of jackson-parent. + jackson-annotations: + buildorder: 10 + ref: f30 + rationale: > + Runtime dependency of jackson-databind. + Build dependency of jackson-databind. + jackson-bom: + buildorder: 10 + ref: f30 + rationale: > + Build dependency of jackson-core, jackson-databind. + jackson-core: + buildorder: 15 + ref: f30 + rationale: > + Runtime dependency of jackson-databind, mustache-java. + Build dependency of jackson-databind, mustache-java. + jackson-databind: + buildorder: 20 + ref: f30 + rationale: > + Runtime dependency of mustache-java. + Build dependency of mustache-java. + jackson-parent: + buildorder: 5 + ref: f30 + rationale: > + Runtime dependency of jackson-bom. + Build dependency of jackson-annotations, jackson-bom. javapoet: buildorder: 10 - ref: master + ref: f30 rationale: > - Runtime dependency of auto. + Runtime dependency of auto, takari-incrementalbuild. + Build dependency of auto, takari-incrementalbuild, + takari-lifecycle. + mustache-java: + buildorder: 30 + ref: f30 + rationale: > + Runtime dependency of takari-lifecycle. + Build dependency of takari-lifecycle. + replacer: + buildorder: 1 + ref: f29 + rationale: > + Build dependency of jackson-core, jackson-databind. + takari-archiver: + buildorder: 10 + ref: f30 + rationale: > + Runtime dependency of takari-lifecycle. + Build dependency of takari-lifecycle. + takari-incrementalbuild: + buildorder: 20 + ref: f30 + rationale: > + Runtime dependency of takari-lifecycle. + Build dependency of takari-lifecycle. + takari-lifecycle: + buildorder: 40 + ref: f30 + rationale: > + Runtime dependency of takari-pom. + Build dependency of eclipse-m2e-workspace, + takari-archiver, takari-incrementalbuild, + takari-lifecycle, takari-plugin-testing, takari-pom, + tesla-polyglot. + takari-plugin-testing: + buildorder: 20 + ref: f30 + rationale: > + Build dependency of takari-incrementalbuild, + takari-lifecycle. + takari-pom: + buildorder: 50 + ref: f30 + 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. tesla-polyglot: buildorder: 10 - ref: master + ref: f30 rationale: > Runtime dependency of tycho-extras. + Build dependency of tycho-extras. tycho: buildorder: 20 - ref: master + ref: f30 rationale: > Module API. - Runtime dependency of cbi-plugins, tycho-extras. + Runtime dependency of cbi-plugins, + takari-tycho-support, tycho-extras. + Build dependency of cbi-plugins, takari-tycho-support, + tycho, tycho-extras. tycho-extras: buildorder: 30 - ref: master + ref: f30 rationale: > Module API. From 94dc98a8056788a6f54cec4186fd582a990d44f0 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 16 Apr 2019 10:26:16 +0100 Subject: [PATCH 09/56] Relax platform requirement and disable takari-tycho-support for now --- tycho.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tycho.yaml b/tycho.yaml index a5fbb80..4072253 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -33,7 +33,7 @@ data: platform: [f28] requires: javapackages-tools: [201801] - platform: [f28] + platform: [] profiles: default: rpms: @@ -42,7 +42,6 @@ data: api: rpms: - cbi-plugins - - takari-tycho-support - tycho - tycho-extras filter: @@ -203,11 +202,11 @@ data: 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: 60 + #ref: f30 + #rationale: > + #Module API. tesla-polyglot: buildorder: 10 ref: f30 From 8d45bcfc6284747739277becaac3bfa2b2df8906 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 23 Apr 2019 16:49:09 +0100 Subject: [PATCH 10/56] 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. From 8105117b9cce11a1932c80a0dd700d7205ec2b17 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 23 Apr 2019 17:02:29 +0100 Subject: [PATCH 11/56] Remove build self-dependency --- tycho.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tycho.yaml b/tycho.yaml index 99debd6..7a304b1 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -31,10 +31,9 @@ data: - buildrequires: javapackages-tools: [201801] platform: [f31] - tycho: [1.3] requires: javapackages-tools: [201801] - platform: [f31] + platform: [] profiles: default: rpms: From 89899463d4a0d45a4781de1ad022258fc064fe43 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 23 Apr 2019 17:21:26 +0100 Subject: [PATCH 12/56] Remove platform requirement --- tycho.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho.yaml b/tycho.yaml index 7a304b1..d3208a4 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -30,7 +30,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] - platform: [f31] + platform: [] requires: javapackages-tools: [201801] platform: [] From c45bb054c9bc98ce01a44d9617507d22904c1d9c Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 24 Apr 2019 11:15:01 +0100 Subject: [PATCH 13/56] Improve bootstrap takari ordering --- tycho.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tycho.yaml b/tycho.yaml index d3208a4..60a31de 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -117,7 +117,7 @@ data: Runtime dependency of takari-lifecycle, tycho. Build dependency of glassfish-jsp, tycho. eclipse: - buildorder: 120 + buildorder: 110 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -126,14 +126,14 @@ data: Build dependency of eclipse, eclipse-ecf, eclipse-emf, jetty, takari-lifecycle, tycho. eclipse-ecf: - buildorder: 110 + buildorder: 100 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. Build dependency of eclipse. eclipse-emf: - buildorder: 110 + buildorder: 100 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -355,7 +355,7 @@ data: takari-lifecycle, takari-plugin-testing, takari-pom, tesla-polyglot. takari-plugin-testing: - buildorder: 90 + buildorder: 20 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -378,7 +378,7 @@ data: rationale: > Module API. tesla-polyglot: - buildorder: 90 + buildorder: 10 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -396,7 +396,7 @@ data: eclipse-emf, eclipse-jgit, eclipse-license, takari-tycho-support, tycho, tycho-extras. tycho-extras: - buildorder: 100 + buildorder: 90 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > From 634df08a0b67e3789f529786e5f4457c34a1df4d Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 30 Apr 2019 11:31:56 +0100 Subject: [PATCH 14/56] Build Eclipse without contributor tools --- tycho.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tycho.yaml b/tycho.yaml index 60a31de..7fe596f 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -51,6 +51,7 @@ data: %_with_bootstrap 1 %_with_jp_minimal 1 %_without_jgit_eclipse_features 1 + %_without_contrib_tools 1 components: rpms: apache-commons-el: From a376ae121ab590c3a3fe5060eee3310d9bb0ff17 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 30 Apr 2019 14:45:06 +0100 Subject: [PATCH 15/56] Restrict build to F30 --- tycho.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho.yaml b/tycho.yaml index 7fe596f..ba23a2c 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -30,7 +30,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] - platform: [] + platform: [f30] requires: javapackages-tools: [201801] platform: [] From 9f89ef80692267b0b0d3eeddb6c975a0839bfce6 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 30 Apr 2019 15:00:34 +0100 Subject: [PATCH 16/56] Revert "Restrict build to F30" See https://pagure.io/fm-orchestrator/issue/1243 for details. This reverts commit a376ae121ab590c3a3fe5060eee3310d9bb0ff17. --- tycho.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho.yaml b/tycho.yaml index ba23a2c..7fe596f 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -30,7 +30,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] - platform: [f30] + platform: [] requires: javapackages-tools: [201801] platform: [] From e360bc6732b2fa4e47eb3b995a3e55f2e7173e26 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 30 Apr 2019 15:06:14 +0100 Subject: [PATCH 17/56] Restrict build to "not F31" --- tycho.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho.yaml b/tycho.yaml index 7fe596f..384328c 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -30,7 +30,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] - platform: [] + platform: [-f31] requires: javapackages-tools: [201801] platform: [] From b868c7fc2709a2139db2af8f5aebba57435d6bbe Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 1 May 2019 17:03:01 +0100 Subject: [PATCH 18/56] Bootstrap build From 384380c7d456c4ebb4d3f35f2d90eb7c8cb28a40 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 1 May 2019 21:54:04 +0100 Subject: [PATCH 19/56] Bootstrap build take 2 From 1d615d089ee611db0357b8ebb31fe736230a74a3 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 3 May 2019 00:24:32 +0100 Subject: [PATCH 20/56] Perform second bootstrap to build takari-lifecycle against JDT --- tycho.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tycho.yaml b/tycho.yaml index 384328c..b8d0f70 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -31,6 +31,7 @@ data: - buildrequires: javapackages-tools: [201801] platform: [-f31] + tycho: [1.3] requires: javapackages-tools: [201801] platform: [] From 685c52d5a3e0ce459ea0a3e6607677b0a417cb5f Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 3 May 2019 08:28:00 +0100 Subject: [PATCH 21/56] Perform second bootstrap to build takari-lifecycle against JDT From bf0d5aca75e488e41136a5af59cf3af5429bb492 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 3 May 2019 13:03:22 +0100 Subject: [PATCH 22/56] Temporarily disable takari-tycho-support --- tycho.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tycho.yaml b/tycho.yaml index b8d0f70..e28e460 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -43,7 +43,7 @@ data: api: rpms: - cbi-plugins - - takari-tycho-support + # - takari-tycho-support - tycho - tycho-extras buildopts: @@ -373,12 +373,12 @@ data: takari-incrementalbuild, takari-lifecycle, takari-plugin-testing, takari-tycho-support, tesla-polyglot. - takari-tycho-support: - buildorder: 90 - ref: tycho - arches: [x86_64, ppc64le, aarch64, s390x] - rationale: > - Module API. + # takari-tycho-support: + # buildorder: 90 + # ref: tycho + # arches: [x86_64, ppc64le, aarch64, s390x] + # rationale: > + # Module API. tesla-polyglot: buildorder: 10 ref: tycho From f1579aca954892aa79032ec018773a93b6ca4e8f Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 7 May 2019 10:31:38 +0100 Subject: [PATCH 23/56] Perform full non-bootstrap build --- tycho.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tycho.yaml b/tycho.yaml index e28e460..6d29706 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -43,13 +43,12 @@ data: api: rpms: - cbi-plugins - # - takari-tycho-support + - takari-tycho-support - tycho - tycho-extras buildopts: rpms: macros: | - %_with_bootstrap 1 %_with_jp_minimal 1 %_without_jgit_eclipse_features 1 %_without_contrib_tools 1 @@ -373,12 +372,12 @@ data: takari-incrementalbuild, takari-lifecycle, takari-plugin-testing, takari-tycho-support, tesla-polyglot. - # takari-tycho-support: - # buildorder: 90 - # ref: tycho - # arches: [x86_64, ppc64le, aarch64, s390x] - # rationale: > - # Module API. + takari-tycho-support: + buildorder: 90 + ref: tycho + arches: [x86_64, ppc64le, aarch64, s390x] + rationale: > + Module API. tesla-polyglot: buildorder: 10 ref: tycho From 7bffa58aa9ee71175d049f9386db67c0677f0564 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 7 May 2019 17:20:58 +0100 Subject: [PATCH 24/56] Rebuild against new javapackages-tools module From eed187ba7f68b9c6d220e62450a6041d59597a55 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 7 May 2019 21:33:09 +0100 Subject: [PATCH 25/56] Build tycho without test bundles From 80c0dda54608765b81a62b8a2ad0680cd0191456 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 8 May 2019 12:16:36 +0100 Subject: [PATCH 26/56] Order ECF after EMF --- tycho.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tycho.yaml b/tycho.yaml index 6d29706..e7e13f8 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -118,7 +118,7 @@ data: Runtime dependency of takari-lifecycle, tycho. Build dependency of glassfish-jsp, tycho. eclipse: - buildorder: 110 + buildorder: 120 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -127,7 +127,7 @@ data: Build dependency of eclipse, eclipse-ecf, eclipse-emf, jetty, takari-lifecycle, tycho. eclipse-ecf: - buildorder: 100 + buildorder: 110 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > From e7d6078cee0d6e65b078b8f5afe11f4844871bfd Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 23 May 2019 21:45:50 +0100 Subject: [PATCH 27/56] Avoid the need to have jgit present for tycho. --- koschei.cfg | 1 - tycho.yaml | 55 ++++++----------------------------------------------- 2 files changed, 6 insertions(+), 50 deletions(-) diff --git a/koschei.cfg b/koschei.cfg index 92aa23d..67385de 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -195,7 +195,6 @@ config = { "macros": { "_with_bootstrap": 1, "_with_jp_minimal": 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 e7e13f8..83ff520 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -50,7 +50,6 @@ data: rpms: macros: | %_with_jp_minimal 1 - %_without_jgit_eclipse_features 1 %_without_contrib_tools 1 components: rpms: @@ -61,20 +60,6 @@ data: 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: tycho @@ -89,13 +74,6 @@ data: 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: 50 ref: tycho @@ -140,13 +118,6 @@ data: 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 @@ -162,13 +133,6 @@ data: 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: 10 ref: tycho @@ -225,8 +189,8 @@ data: ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse-jgit, takari-lifecycle. - Build dependency of eclipse-jgit, takari-lifecycle. + Runtime dependency of takari-lifecycle. + Build dependency of takari-lifecycle. icu4j: buildorder: 10 ref: tycho @@ -268,13 +232,6 @@ data: 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: tycho @@ -288,8 +245,8 @@ data: ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse, eclipse-jgit. - Build dependency of eclipse, eclipse-jgit. + Runtime dependency of eclipse. + Build dependency of eclipse. kxml: buildorder: 20 ref: tycho @@ -394,8 +351,8 @@ data: Runtime dependency of cbi-plugins, takari-tycho-support, tycho-extras. Build dependency of cbi-plugins, eclipse, eclipse-ecf, - eclipse-emf, eclipse-jgit, eclipse-license, - takari-tycho-support, tycho, tycho-extras. + eclipse-emf, eclipse-license, takari-tycho-support, + tycho, tycho-extras. tycho-extras: buildorder: 90 ref: tycho From 9249636fc714344e08e0b5c978803588e682a27e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 24 May 2019 09:50:58 +0100 Subject: [PATCH 28/56] Rebuild with fixed Eclipse BRs From 2e467ee6a40999dc2286d9b1d0ed330702a5c95f Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 31 May 2019 00:09:09 +0100 Subject: [PATCH 29/56] Bootstrap build for 1.4 --- tycho.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tycho.yaml b/tycho.yaml index 83ff520..b84bc4e 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -30,8 +30,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] - platform: [-f31] - tycho: [1.3] + platform: [] requires: javapackages-tools: [201801] platform: [] @@ -49,6 +48,7 @@ data: buildopts: rpms: macros: | + %_with_bootstrap 1 %_with_jp_minimal 1 %_without_contrib_tools 1 components: From 268f94ecd83f4426972df5a17c9d4f37b5cb1fdd Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 31 May 2019 12:20:57 +0100 Subject: [PATCH 30/56] Better ordering for bootstrapping. --- .gitignore | 2 ++ clone_rpms.sh | 13 ++++++++ gen_build_order_graph.py | 54 +++++++++++++++++++++++++++++++ tycho.yaml | 69 +++++++++++++++++----------------------- 4 files changed, 99 insertions(+), 39 deletions(-) create mode 100644 .gitignore create mode 100755 clone_rpms.sh create mode 100755 gen_build_order_graph.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e4e766e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/*.png +/rpms/ diff --git a/clone_rpms.sh b/clone_rpms.sh new file mode 100755 index 0000000..e01107d --- /dev/null +++ b/clone_rpms.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +mkdir -p rpms +pushd rpms 2>&1 >/dev/null + +for pkg in $(grep -B1 --no-group-separator buildorder ../tycho.yaml | grep -v buildorder | sed -e 's/:$//') ; do + if [ ! -d "$pkg" ] ; then + fedpkg clone $pkg + (cd $pkg && fedpkg switch-branch f30 && fedpkg switch-branch master && fedpkg switch-branch tycho) + fi +done + +popd 2>&1 >/dev/null diff --git a/gen_build_order_graph.py b/gen_build_order_graph.py new file mode 100755 index 0000000..01dbab7 --- /dev/null +++ b/gen_build_order_graph.py @@ -0,0 +1,54 @@ +#!/usr/bin/python3 + +import yaml +from pygraphviz import AGraph +from subprocess import call + +with open("tycho.yaml", 'r') as stream: + yaml = yaml.safe_load(stream) + +rpms = yaml['data']['components']['rpms'] + +g = AGraph(directed=True, name="G", strict=False, label="Build Order Graph") +ranks = [] +for key, value in rpms.items(): + rank = value['buildorder'] + if rank not in ranks: + ranks.append(rank) + subg = g.get_subgraph(f"{rank}") + if subg is None: + subg = g.add_subgraph(name=f"{rank}", label=f"Build Order {rank}", rank="same") + subg.add_node(f"{rank}") + subg.add_node(key) + rs = value['rationale'].replace('\n', ' ').split('.') + reqs = [] + breqs = [] + for r in rs: + r = r.strip() + if not r or r == 'Module API': + continue + if r.startswith('Runtime dependency of'): + r = r[len('Runtime dependency of'):] + reqs = [x.strip() for x in r.split(',')] + if r.startswith('Build dependency of'): + r = r[len('Build dependency of'):] + breqs = [x.strip() for x in r.split(',')] + for req in reqs: + # For Rs, check if also a BR + if req not in breqs: + g.add_edge(key, req, color='blue') + else: + g.add_edge(key, req, color='purple') + for breq in breqs: + # For BRs, check if also a R + if breq not in reqs: + g.add_edge(key, breq, color='red') +ranks.sort() +for idx, rank in enumerate(ranks): + if idx+1 < len(ranks): + g.add_edge(rank, ranks[idx+1], weight=1000) + + +print(g.string()) +g.draw("build_order_graph.png", prog="dot") +call('eog build_order_graph.png &', shell=True) diff --git a/tycho.yaml b/tycho.yaml index b84bc4e..dc2602d 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -42,9 +42,9 @@ data: api: rpms: - cbi-plugins - - takari-tycho-support - tycho - tycho-extras + - takari-tycho-support buildopts: rpms: macros: | @@ -72,8 +72,8 @@ data: ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. - Build dependency of eclipse. + Runtime dependency of eclipse, tycho. + Build dependency of eclipse, tycho. cbi-plugins: buildorder: 50 ref: tycho @@ -96,23 +96,21 @@ data: Runtime dependency of takari-lifecycle, tycho. Build dependency of glassfish-jsp, tycho. eclipse: - buildorder: 120 + buildorder: 80 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. + Runtime dependency of takari-lifecycle. + Build dependency of takari-lifecycle. eclipse-ecf: - buildorder: 110 + buildorder: 70 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. Build dependency of eclipse. eclipse-emf: - buildorder: 100 + buildorder: 60 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -175,29 +173,29 @@ data: ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. - Build dependency of eclipse. + Runtime dependency of eclipse, tycho. + Build dependency of eclipse, tycho. glassfish-jsp: buildorder: 20 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. - Build dependency of eclipse. + Runtime dependency of eclipse, tycho. + Build dependency of eclipse, tycho. google-gson: buildorder: 10 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of takari-lifecycle. - Build dependency of takari-lifecycle. + Runtime dependency of eclipse, takari-lifecycle. + Build dependency of eclipse, takari-lifecycle. icu4j: buildorder: 10 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. - Build dependency of eclipse. + Runtime dependency of eclipse, tycho. + Build dependency of eclipse, tycho. jackson-annotations: buildorder: 30 ref: tycho @@ -279,15 +277,15 @@ data: ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. - Build dependency of eclipse. + Runtime dependency of eclipse, tycho. + Build dependency of eclipse, tycho. sat4j: buildorder: 10 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of eclipse. - Build dependency of eclipse. + Runtime dependency of eclipse, tycho. + Build dependency of eclipse, tycho. takari-archiver: buildorder: 10 ref: tycho @@ -303,34 +301,27 @@ data: Runtime dependency of takari-lifecycle. Build dependency of takari-lifecycle. takari-lifecycle: - buildorder: 70 + buildorder: 90 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-pom. - Build dependency of eclipse-m2e-workspace, - takari-archiver, takari-incrementalbuild, - takari-lifecycle, takari-plugin-testing, takari-pom, - tesla-polyglot. + Build dependency of takari-pom. takari-plugin-testing: buildorder: 20 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Build dependency of takari-incrementalbuild, - takari-lifecycle. + Build dependency of takari-lifecycle. takari-pom: - buildorder: 80 + buildorder: 100 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. + Build dependency of takari-tycho-support. takari-tycho-support: - buildorder: 90 + buildorder: 110 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -352,9 +343,9 @@ data: takari-tycho-support, tycho-extras. Build dependency of cbi-plugins, eclipse, eclipse-ecf, eclipse-emf, eclipse-license, takari-tycho-support, - tycho, tycho-extras. + tycho-extras. tycho-extras: - buildorder: 90 + buildorder: 50 ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > @@ -371,8 +362,8 @@ data: ref: tycho arches: [x86_64, ppc64le, aarch64, s390x] rationale: > - Runtime dependency of batik, eclipse. - Build dependency of batik, eclipse. + Runtime dependency of batik. + Build dependency of batik. xpp3: buildorder: 10 ref: tycho From 41537a882f29c063768e038fb0fbaf7a2c916163 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 31 May 2019 20:47:41 +0100 Subject: [PATCH 31/56] Perform full non-bootstrap build --- tycho.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/tycho.yaml b/tycho.yaml index dc2602d..9e1511d 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -48,7 +48,6 @@ data: buildopts: rpms: macros: | - %_with_bootstrap 1 %_with_jp_minimal 1 %_without_contrib_tools 1 components: From 4a09955c346bfaf91c27b08b2b6e50096e172f95 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 31 May 2019 20:50:48 +0100 Subject: [PATCH 32/56] Perform full non-bootstrap build --- tycho.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tycho.yaml b/tycho.yaml index 9e1511d..3e2dacc 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -30,6 +30,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] + tycho: [1.4] platform: [] requires: javapackages-tools: [201801] From 7a6ef0584bf90ffcb444c4075f4c6ca12305d00c Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sat, 1 Jun 2019 08:13:43 +0100 Subject: [PATCH 33/56] Rebuild with fixed takari-lifecycle BRs From d151464362c5b2d8a3bd71a208541d49be654db2 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 5 Jun 2019 21:06:42 +0100 Subject: [PATCH 34/56] Minor improvement to clone script --- clone_rpms.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/clone_rpms.sh b/clone_rpms.sh index e01107d..0558d91 100755 --- a/clone_rpms.sh +++ b/clone_rpms.sh @@ -1,12 +1,16 @@ #!/bin/bash +script_location=$( (cd $(dirname $0) && pwd) ) + +module=$(basename $script_location) + mkdir -p rpms pushd rpms 2>&1 >/dev/null -for pkg in $(grep -B1 --no-group-separator buildorder ../tycho.yaml | grep -v buildorder | sed -e 's/:$//') ; do +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 f30 && fedpkg switch-branch master && fedpkg switch-branch tycho) + (cd $pkg ; fedpkg switch-branch master ; fedpkg switch-branch $module) fi done From dd7d886b573e357f693eff5782b8ad91a494c6ef Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 11 Jun 2019 00:32:28 +0100 Subject: [PATCH 35/56] Minor improvement to clone script --- clone_rpms.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 8c664225ec54ac448be6e0ce6f0bfafcf02cbf08 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 12 Jun 2019 02:11:55 +0100 Subject: [PATCH 36/56] Rebuild with new lucene --- clone_rpms.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clone_rpms.sh b/clone_rpms.sh index b21c525..4e71537 100755 --- a/clone_rpms.sh +++ b/clone_rpms.sh @@ -11,8 +11,8 @@ 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 ; if ! fedpkg switch-branch $module ; then echo $pkg >> ../need_branch ; fi) fi + (cd $pkg ; git pull ; if ! fedpkg switch-branch $module ; then echo $pkg >> ../need_branch ; fi) done popd 2>&1 >/dev/null From 174721e3ed62b76ae9ad246a69454e1cfca5ff7e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 12 Jun 2019 03:37:47 +0100 Subject: [PATCH 37/56] Rebuild Eclipse against Lucene 8.0 From 902ba2b4f8ac97771d4ca877a6ccc3cca1bb4081 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 12 Jun 2019 10:58:07 +0100 Subject: [PATCH 38/56] Debootstrap build of Eclipse From 56fe24ba77a9c508965ce2051c7727e5d5cb76a6 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 16 Jun 2019 13:44:33 +0100 Subject: [PATCH 39/56] Rebuild with new Jetty, EMF and ECF From 0a185200f31fa6d6faa3481e70f5df5d3c627bfe Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 19 Jun 2019 11:22:01 +0100 Subject: [PATCH 40/56] Build with Eclipse 4.12 From 7c637776c5e0dbc3ab8d20f2ff2bdc5fb40de85e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 20 Jun 2019 18:34:21 +0100 Subject: [PATCH 41/56] Build with fixed batik deps From 37c2df3c91a1629810631a4b18ec5d0b3ca2bb6a Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 25 Jun 2019 10:52:06 +0100 Subject: [PATCH 42/56] Improved graph generator script --- gen_build_order_graph.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gen_build_order_graph.py b/gen_build_order_graph.py index 01dbab7..cca0b93 100755 --- a/gen_build_order_graph.py +++ b/gen_build_order_graph.py @@ -19,13 +19,15 @@ for key, value in rpms.items(): if subg is None: subg = g.add_subgraph(name=f"{rank}", label=f"Build Order {rank}", rank="same") subg.add_node(f"{rank}") - subg.add_node(key) - rs = value['rationale'].replace('\n', ' ').split('.') reqs = [] breqs = [] - for r in rs: + api = False + for r in value['rationale'].replace('\n', ' ').split('.'): r = r.strip() - if not r or r == 'Module API': + if not r: + continue + if r == 'Module API': + api = True continue if r.startswith('Runtime dependency of'): r = r[len('Runtime dependency of'):] @@ -33,6 +35,10 @@ for key, value in rpms.items(): if r.startswith('Build dependency of'): r = r[len('Build dependency of'):] breqs = [x.strip() for x in r.split(',')] + if api: + subg.add_node(key, color='green') + else: + subg.add_node(key) for req in reqs: # For Rs, check if also a BR if req not in breqs: From 8f6080ae15447d0d06338dde060ebce01d0044a3 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 25 Jun 2019 21:53:48 +0100 Subject: [PATCH 43/56] Fix BRs of eclipse-ecf --- tycho.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho.yaml b/tycho.yaml index 3e2dacc..41e3c3d 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -370,4 +370,4 @@ data: arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of felix-scr, kxml. - Build dependency of eclipse-ecf, felix-scr, kxml. + Build dependency of felix-scr, kxml. From d75e578e543f0c3fb041130f5de1321519f4a7a9 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 24 Jul 2019 12:07:14 +0100 Subject: [PATCH 44/56] Rebuild to test MBS fix From b3eb0058172e31420c5b1c5c928c841bb11a69d9 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 8 Aug 2019 14:24:13 +0100 Subject: [PATCH 45/56] Scripts are moved elsewhere --- .gitignore | 2 -- clone_rpms.sh | 18 ------------ gen_build_order_graph.py | 60 ---------------------------------------- 3 files changed, 80 deletions(-) delete mode 100644 .gitignore delete mode 100755 clone_rpms.sh delete mode 100755 gen_build_order_graph.py diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e4e766e..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.png -/rpms/ diff --git a/clone_rpms.sh b/clone_rpms.sh deleted file mode 100755 index 4e71537..0000000 --- a/clone_rpms.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -script_location=$( (cd $(dirname $0) && pwd) ) - -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 - fi - (cd $pkg ; git pull ; if ! fedpkg switch-branch $module ; then echo $pkg >> ../need_branch ; fi) -done - -popd 2>&1 >/dev/null diff --git a/gen_build_order_graph.py b/gen_build_order_graph.py deleted file mode 100755 index cca0b93..0000000 --- a/gen_build_order_graph.py +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/python3 - -import yaml -from pygraphviz import AGraph -from subprocess import call - -with open("tycho.yaml", 'r') as stream: - yaml = yaml.safe_load(stream) - -rpms = yaml['data']['components']['rpms'] - -g = AGraph(directed=True, name="G", strict=False, label="Build Order Graph") -ranks = [] -for key, value in rpms.items(): - rank = value['buildorder'] - if rank not in ranks: - ranks.append(rank) - subg = g.get_subgraph(f"{rank}") - if subg is None: - subg = g.add_subgraph(name=f"{rank}", label=f"Build Order {rank}", rank="same") - subg.add_node(f"{rank}") - reqs = [] - breqs = [] - api = False - for r in value['rationale'].replace('\n', ' ').split('.'): - r = r.strip() - if not r: - continue - if r == 'Module API': - api = True - continue - if r.startswith('Runtime dependency of'): - r = r[len('Runtime dependency of'):] - reqs = [x.strip() for x in r.split(',')] - if r.startswith('Build dependency of'): - r = r[len('Build dependency of'):] - breqs = [x.strip() for x in r.split(',')] - if api: - subg.add_node(key, color='green') - else: - subg.add_node(key) - for req in reqs: - # For Rs, check if also a BR - if req not in breqs: - g.add_edge(key, req, color='blue') - else: - g.add_edge(key, req, color='purple') - for breq in breqs: - # For BRs, check if also a R - if breq not in reqs: - g.add_edge(key, breq, color='red') -ranks.sort() -for idx, rank in enumerate(ranks): - if idx+1 < len(ranks): - g.add_edge(rank, ranks[idx+1], weight=1000) - - -print(g.string()) -g.draw("build_order_graph.png", prog="dot") -call('eog build_order_graph.png &', shell=True) From e2fd1f31b7c1f3c70a311d8f1c68dc325d959d6c Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 9 Aug 2019 17:11:51 +0100 Subject: [PATCH 46/56] Try restricting platforms --- tycho.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho.yaml b/tycho.yaml index 41e3c3d..7ac02b0 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -31,7 +31,7 @@ data: - buildrequires: javapackages-tools: [201801] tycho: [1.4] - platform: [] + platform: [f30] requires: javapackages-tools: [201801] platform: [] From f5b3276ba8c63a61d8cbe4da8f384b2767046701 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 9 Aug 2019 17:19:44 +0100 Subject: [PATCH 47/56] Try the inverse restriction --- tycho.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho.yaml b/tycho.yaml index 7ac02b0..910d144 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -31,7 +31,7 @@ data: - buildrequires: javapackages-tools: [201801] tycho: [1.4] - platform: [f30] + platform: [-f29] requires: javapackages-tools: [201801] platform: [] From 131847f7f60aa717eb6da69d5891b6859098f9b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 13 Aug 2019 20:09:05 +0000 Subject: [PATCH 48/56] Branching f31 from rawhide Signed-off-by: Fedora Release Engineering From 121e68e62c917b919a4f9d321ec512d890aacb62 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 28 Aug 2019 10:56:50 +0100 Subject: [PATCH 49/56] Rebootstrap for F31 --- tycho.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tycho.yaml b/tycho.yaml index 910d144..600ee1f 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -30,8 +30,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] - tycho: [1.4] - platform: [-f29] + platform: [-f29,-f32] requires: javapackages-tools: [201801] platform: [] @@ -49,6 +48,7 @@ data: buildopts: rpms: macros: | + %_with_bootstrap 1 %_with_jp_minimal 1 %_without_contrib_tools 1 components: From d89da7d4ad8c876c88affca09f9eaabde678fe3d Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 29 Aug 2019 09:47:52 +0100 Subject: [PATCH 50/56] Full rebuild --- tycho.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho.yaml b/tycho.yaml index 600ee1f..85f55a4 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -30,6 +30,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] + tycho: [1.4] platform: [-f29,-f32] requires: javapackages-tools: [201801] @@ -48,7 +49,6 @@ data: buildopts: rpms: macros: | - %_with_bootstrap 1 %_with_jp_minimal 1 %_without_contrib_tools 1 components: From 20043c875713397d2a5e7bcdc77c3181d0bef4a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 22 Sep 2019 14:46:09 +0000 Subject: [PATCH 51/56] Branching f31 from rawhide, fourth attempt after platform:f32 enablement due to https://pagure.io/releng/issue/8664 Signed-off-by: Fedora Release Engineering From 74a1bc2804d6202ad8b039860ebbf6fbd57b19da Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 24 Sep 2019 16:02:15 +0100 Subject: [PATCH 52/56] Rebuild From 9956f3dc9cb53717b950496e7a163cfb95e72932 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 2 Dec 2019 13:41:34 +0000 Subject: [PATCH 53/56] Fix git refs --- tycho.yaml | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/tycho.yaml b/tycho.yaml index 85f55a4..044a2e6 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -55,76 +55,76 @@ data: rpms: apache-commons-el: buildorder: 10 - ref: tycho + ref: 4bc90bfbda27ebde061e169e5e913cfcb94c181b arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. Build dependency of eclipse. auto: buildorder: 20 - ref: tycho + ref: 31c859ae62e8d15b63d02edc7da3c38eb4a812bc arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of cbi-plugins. Build dependency of cbi-plugins. batik: buildorder: 20 - ref: tycho + ref: 596b95ad16452db49ebc780621c9802c9ee42964 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, tycho. Build dependency of eclipse, tycho. cbi-plugins: buildorder: 50 - ref: tycho + ref: 43e76463dd0cb71d6e477bbde3fbcb8285bd0512 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. Build dependency of eclipse. decentxml: buildorder: 10 - ref: tycho + ref: d84f7d2e881f5917bf0215b77afb5df8d7e96088 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of cbi-plugins, tycho. Build dependency of cbi-plugins, tycho. ecj: buildorder: 10 - ref: tycho + ref: 8656cf59730ab4667076974d72acc6e418699269 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-lifecycle, tycho. Build dependency of glassfish-jsp, tycho. eclipse: buildorder: 80 - ref: tycho + ref: 47e0dcd891088ef2b3dec05cbccf96d2e566cbed arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-lifecycle. Build dependency of takari-lifecycle. eclipse-ecf: buildorder: 70 - ref: tycho + ref: aa71b18ba3ec8bad9096843722c22799cada4fde arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. Build dependency of eclipse. eclipse-emf: buildorder: 60 - ref: tycho + ref: bc94f784d6a97cf1622c36891aec26fcb7e47020 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. Build dependency of eclipse, eclipse-ecf. eclipse-license: buildorder: 50 - ref: tycho + ref: 6aff27bb670d8b7f03b9b85d4201939b1115e102 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Build dependency of eclipse, eclipse-ecf. eclipse-m2e-workspace: buildorder: 10 - ref: tycho + ref: df448176641c558fc9803ffd9c988a32105b4bc0 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-lifecycle, @@ -133,28 +133,28 @@ data: takari-plugin-testing. fasterxml-oss-parent: buildorder: 10 - ref: tycho + ref: 971e94c71ac698846f228847c5cdc44d68f03e31 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jackson-parent. Build dependency of jackson-parent. felix-gogo-command: buildorder: 30 - ref: tycho + ref: 245e924169c00b824ffb8b388775b2911cbc9c33 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. Build dependency of eclipse. felix-gogo-parent: buildorder: 10 - ref: tycho + ref: cc1a4b747e3c7f62a3f5ba98201d95221717fd90 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 + ref: 316d383629fcebae2496e98263b00b69752b96ce arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, felix-gogo-command, @@ -163,76 +163,76 @@ data: felix-gogo-shell, felix-scr. felix-gogo-shell: buildorder: 30 - ref: tycho + ref: 2d499a00a7a1800609081849547e75164cfd7617 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. Build dependency of eclipse. felix-scr: buildorder: 30 - ref: tycho + ref: 50c4923f6ac5803814077771b8d5f378e166022c arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, tycho. Build dependency of eclipse, tycho. glassfish-jsp: buildorder: 20 - ref: tycho + ref: f3ea322f3a8981b7f6ae4fbbcd5f7c297295b349 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, tycho. Build dependency of eclipse, tycho. google-gson: buildorder: 10 - ref: tycho + ref: 2082cf5289a7b6f7c19b75818c78fcc4e592a245 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, takari-lifecycle. Build dependency of eclipse, takari-lifecycle. icu4j: buildorder: 10 - ref: tycho + ref: b37cf1deb2d801ec9555048569c4a72da1f910a6 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, tycho. Build dependency of eclipse, tycho. jackson-annotations: buildorder: 30 - ref: tycho + ref: e9a5a12e116548f05cc7eb63f9849e12cbbe43db arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jackson-databind. Build dependency of jackson-databind. jackson-bom: buildorder: 30 - ref: tycho + ref: db3923263b1da21ff1e98342e4b9da3b6349740f arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Build dependency of jackson-core, jackson-databind. jackson-core: buildorder: 40 - ref: tycho + ref: 003a80e4e57157411bfee57e0a809a49a0ac7cd4 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jackson-databind, mustache-java. Build dependency of jackson-databind, mustache-java. jackson-databind: buildorder: 50 - ref: tycho + ref: 817a21eacce8d805c3fa5dad095d502a04c7ccb4 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of mustache-java. Build dependency of mustache-java. jackson-parent: buildorder: 20 - ref: tycho + ref: 3100435a44424980c758cea9f79b8314d1787186 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of jackson-bom. Build dependency of jackson-annotations, jackson-bom. javapoet: buildorder: 10 - ref: tycho + ref: 6b4b287e878e182cba089d13825418b93f245b45 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of auto, takari-incrementalbuild. @@ -240,102 +240,102 @@ data: takari-lifecycle. jetty: buildorder: 10 - ref: tycho + ref: 3b5dbed6274fadfa08d91d18f3ec5612fffe1d4f arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. Build dependency of eclipse. kxml: buildorder: 20 - ref: tycho + ref: 2a5ee5b2ed5de9ed50e60b5f12fece8e823eef53 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of felix-scr. Build dependency of felix-scr. lucene: buildorder: 10 - ref: tycho + ref: f4f08e4b8ecf6a105ca9a62c75d80510dbbc1447 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse. Build dependency of eclipse. mustache-java: buildorder: 60 - ref: tycho + ref: 0e7d4ab06e975a10226efc57fec8a60c508f955a arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-lifecycle. Build dependency of takari-lifecycle. replacer: buildorder: 10 - ref: tycho + ref: 150f43ebba8f5576206a3f0bc79e03f7b636b385 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Build dependency of jackson-core, jackson-databind. sac: buildorder: 10 - ref: tycho + ref: e98e6c2cb8b383b05ad0fd2818ef2a6622ee7c3b arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, tycho. Build dependency of eclipse, tycho. sat4j: buildorder: 10 - ref: tycho + ref: 9dc375ce427728595e552dea6bf6a8bb1bfade99 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of eclipse, tycho. Build dependency of eclipse, tycho. takari-archiver: buildorder: 10 - ref: tycho + ref: 113879725700d0b92c11a5cb618c74d6bf90792e arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-lifecycle. Build dependency of takari-lifecycle. takari-incrementalbuild: buildorder: 20 - ref: tycho + ref: 8a0fdab0929d794ee0174a764aa867880e210689 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-lifecycle. Build dependency of takari-lifecycle. takari-lifecycle: buildorder: 90 - ref: tycho + ref: 2ee324d79f66dd38aa704241ba4e29adf1db47ac arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-pom. Build dependency of takari-pom. takari-plugin-testing: buildorder: 20 - ref: tycho + ref: 24871222f84995ec24a8390c7afa6f2c2d2ba79f arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Build dependency of takari-lifecycle. takari-pom: buildorder: 100 - ref: tycho + ref: 529579931b9b1df7f8b6ec0801d9d250f58447a0 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of takari-tycho-support. Build dependency of takari-tycho-support. takari-tycho-support: buildorder: 110 - ref: tycho + ref: 0e5a8519d29952c92d48d19f95c020d8043597db arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. tesla-polyglot: buildorder: 10 - ref: tycho + ref: 9a8bb67b2c083078b83ac455e87055bd7f141d81 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of tycho-extras. Build dependency of tycho-extras. tycho: buildorder: 40 - ref: tycho + ref: c5f63fde050b2655e34f641f8a5a6472e229f608 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. @@ -346,27 +346,27 @@ data: tycho-extras. tycho-extras: buildorder: 50 - ref: tycho + ref: 0b3ba152efaf1d71fe6001fef9b15ec35e246769 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Module API. Build dependency of eclipse, eclipse-ecf, eclipse-emf. xml-maven-plugin: buildorder: 10 - ref: tycho + ref: 5acb49f0491133a9d897c3d840b930fd78e6c1ac arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Build dependency of eclipse. xmlgraphics-commons: buildorder: 10 - ref: tycho + ref: 047db54f2c389cb5afcdf5720183c79844ac6377 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of batik. Build dependency of batik. xpp3: buildorder: 10 - ref: tycho + ref: cb386294c51db845a3fa801ea2b591daf7abac71 arches: [x86_64, ppc64le, aarch64, s390x] rationale: > Runtime dependency of felix-scr, kxml. From eaf5d58fa591c72e729b4e2288ee7a076bf9667d Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 2 Dec 2019 13:42:42 +0000 Subject: [PATCH 54/56] Invert platform req to ensure we don't build on rawhide after f32 is branched. --- tycho.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho.yaml b/tycho.yaml index 044a2e6..e8a4051 100644 --- a/tycho.yaml +++ b/tycho.yaml @@ -31,7 +31,7 @@ data: - buildrequires: javapackages-tools: [201801] tycho: [1.4] - platform: [-f29,-f32] + platform: [f30, f31] requires: javapackages-tools: [201801] platform: [] From 169b44617cf0ff9af67a29720fae36811b8df643 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 15 Feb 2020 02:07:15 +0000 Subject: [PATCH 55/56] Branching f32 from rawhide Signed-off-by: Fedora Release Engineering From a55038b32d089d5a899b9322867f6a2442984a3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Aug 2020 15:07:18 +0000 Subject: [PATCH 56/56] Branching f33 from rawhide Signed-off-by: Fedora Release Engineering