From 13d5b0e0bd7808f43ff0b244de3d1a4978385ab4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 11 Apr 2018 14:23:22 +0200 Subject: [PATCH 01/32] Switch to modulemd v2 --- ant.yaml | 15 +++---- koschei.cfg | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 8 deletions(-) create mode 100644 koschei.cfg diff --git a/ant.yaml b/ant.yaml index 53fced3..51ff4d3 100644 --- a/ant.yaml +++ b/ant.yaml @@ -1,6 +1,6 @@ --- document: modulemd -version: 1 +version: 2 data: summary: Java build tool description: >- @@ -16,11 +16,10 @@ data: module: - MIT dependencies: - buildrequires: - javapackages-tools: master - java: master - requires: - java: master + - buildrequires: + javapackages-tools: [201801] + requires: + platform: [] profiles: default: rpms: @@ -91,8 +90,8 @@ data: %_without_testlib 1 components: rpms: - # ant-1.10.1-8.fc28.1 ant: + buildorder: 10 + ref: javapackages rationale: > Module API. - ref: ce4b0fb diff --git a/koschei.cfg b/koschei.cfg new file mode 100644 index 0000000..cc56865 --- /dev/null +++ b/koschei.cfg @@ -0,0 +1,126 @@ +# -*- python -*- +# vim: ft=python +config = { + "buildrequires": [ + "javapackages-tools", + ], + "requires": [ + "platform", + ], + + "bootstrap": False, + "full_refs": False, + "default_ref": "javapackages", + "include_build_deps": False, + "closure": False, + "filter_unused": True, + "topo_sort": True, + + "api": [ + "ant", + ], + "profiles": { + "default": ["ant"], + }, + "filter": [ + ], + "includes": [ + ], + "excludes": [ + "javapackages-tools", + "java-1.7.0-openjdk", + "java-1.8.0-openjdk", + ], + "frozen_refs": [ + "python-lxml", + ], + "stream_override": { + "javapackages-tools": { + "1.10": "[201801]", + }, + "platform": { + "1.10": "[]", + }, + }, + + "macros": { + "_with_xmvn_javadoc": 1, + "_without_asciidoc": 1, + "_without_avalon": 1, + "_without_bouncycastle": 1, + "_without_cython": 1, + "_without_dafsa": 1, + "_without_desktop": 1, + "_without_doxygen": 1, + "_without_dtd": 1, + "_without_eclipse": 1, + "_without_ehcache": 1, + "_without_emacs": 1, + "_without_equinox": 1, + "_without_fop": 1, + "_without_ftp": 1, + "_without_gradle": 1, + "_without_groovy": 1, + "_without_hadoop": 1, + "_without_hsqldb": 1, + "_without_itext": 1, + "_without_jackson": 1, + "_without_jmh": 1, + "_without_jna": 1, + "_without_jpa": 1, + "_without_logback": 1, + "_without_markdown": 1, + "_without_memcached": 1, + "_without_memoryfilesystem": 1, + "_without_obr": 1, + "_without_python": 1, + "_without_reporting": 1, + "_without_scm": 1, + "_without_snappy": 1, + "_without_spring": 1, + "_without_ssh": 1, + "_without_testlib": 1, + }, + + "summary": "Java build tool", + "description": """\ + Apache Ant is a Java library and command-line tool whose mission + is to drive processes described in build files as targets and extension + points dependent upon each other. The main known usage of Ant is the + build of Java applications. Ant supplies a number of built-in tasks + allowing to compile, assemble, test and run Java applications. Ant can + also be used effectively to build non Java applications, for instance C + or C++ applications. More generally, Ant can be used to pilot any type + of process which can be described in terms of targets and tasks. + """, + + "koji_config": { + "server": "https://koji.fedoraproject.org/kojihub", + "topurl": "https://kojipkgs.fedoraproject.org", + "multicall_chunk_size": 1000, + }, + "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" + }, + }, + }, +} From efb686945a977ec8322eca2401e96e8da0f4e3f2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Jun 2018 17:41:41 +0200 Subject: [PATCH 02/32] Rebase to Ant 1.10.4 --- ant.yaml | 1 + koschei.cfg | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ant.yaml b/ant.yaml index 51ff4d3..833f621 100644 --- a/ant.yaml +++ b/ant.yaml @@ -76,6 +76,7 @@ data: %_without_jmh 1 %_without_jna 1 %_without_jpa 1 + %_without_junit5 1 %_without_logback 1 %_without_markdown 1 %_without_memcached 1 diff --git a/koschei.cfg b/koschei.cfg index cc56865..1bb9406 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -68,6 +68,7 @@ config = { "_without_jmh": 1, "_without_jna": 1, "_without_jpa": 1, + "_without_junit5": 1, "_without_logback": 1, "_without_markdown": 1, "_without_memcached": 1, @@ -95,9 +96,10 @@ config = { """, "koji_config": { - "server": "https://koji.fedoraproject.org/kojihub", - "topurl": "https://kojipkgs.fedoraproject.org", + "server": "https://koji.kjnet.xyz/kojihub", + "topurl": "https://koji.kjnet.xyz/kojifiles", "multicall_chunk_size": 1000, + "tag_name": "hybrid", }, "dependency": { "repo_arch": "x86_64", From 44a0934fea4d83e2879e5859527a98dbf098a13d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 30 Jun 2018 03:29:20 +0200 Subject: [PATCH 03/32] Remove lxml from frozen refs --- koschei.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/koschei.cfg b/koschei.cfg index 1bb9406..02edf15 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -32,7 +32,6 @@ config = { "java-1.8.0-openjdk", ], "frozen_refs": [ - "python-lxml", ], "stream_override": { "javapackages-tools": { From 423eb02639cb5c69f391465ab0064bb281a97fa1 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 6 Aug 2018 14:36:02 +0200 Subject: [PATCH 04/32] Rebase to 1.10.5 From 1bf07ae7e441399ee621ceccfed76d10a5b46459 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 15 Aug 2018 12:43:42 -0400 Subject: [PATCH 05/32] Rebuild for F30 branch Signed-off-by: Stephen Gallagher From f24802eefc3386d6dda18ce721be9ff453b626d7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 20 Sep 2018 18:40:59 +0200 Subject: [PATCH 06/32] Rebuild for platform:f30 From 562213cbe24817fe6458b9dc9946e54a8ac7f65d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Sep 2018 10:32:38 +0200 Subject: [PATCH 07/32] Remove unneeded macros --- ant.yaml | 36 ------------------------------------ koschei.cfg | 36 ------------------------------------ 2 files changed, 72 deletions(-) diff --git a/ant.yaml b/ant.yaml index 833f621..d4c97ab 100644 --- a/ant.yaml +++ b/ant.yaml @@ -52,43 +52,7 @@ data: buildopts: rpms: macros: | - %_with_xmvn_javadoc 1 - %_without_asciidoc 1 - %_without_avalon 1 - %_without_bouncycastle 1 - %_without_cython 1 - %_without_dafsa 1 - %_without_desktop 1 - %_without_doxygen 1 - %_without_dtd 1 - %_without_eclipse 1 - %_without_ehcache 1 - %_without_emacs 1 - %_without_equinox 1 - %_without_fop 1 - %_without_ftp 1 - %_without_gradle 1 - %_without_groovy 1 - %_without_hadoop 1 - %_without_hsqldb 1 - %_without_itext 1 - %_without_jackson 1 - %_without_jmh 1 - %_without_jna 1 - %_without_jpa 1 %_without_junit5 1 - %_without_logback 1 - %_without_markdown 1 - %_without_memcached 1 - %_without_memoryfilesystem 1 - %_without_obr 1 - %_without_python 1 - %_without_reporting 1 - %_without_scm 1 - %_without_snappy 1 - %_without_spring 1 - %_without_ssh 1 - %_without_testlib 1 components: rpms: ant: diff --git a/koschei.cfg b/koschei.cfg index 02edf15..5b1daf7 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -43,43 +43,7 @@ config = { }, "macros": { - "_with_xmvn_javadoc": 1, - "_without_asciidoc": 1, - "_without_avalon": 1, - "_without_bouncycastle": 1, - "_without_cython": 1, - "_without_dafsa": 1, - "_without_desktop": 1, - "_without_doxygen": 1, - "_without_dtd": 1, - "_without_eclipse": 1, - "_without_ehcache": 1, - "_without_emacs": 1, - "_without_equinox": 1, - "_without_fop": 1, - "_without_ftp": 1, - "_without_gradle": 1, - "_without_groovy": 1, - "_without_hadoop": 1, - "_without_hsqldb": 1, - "_without_itext": 1, - "_without_jackson": 1, - "_without_jmh": 1, - "_without_jna": 1, - "_without_jpa": 1, "_without_junit5": 1, - "_without_logback": 1, - "_without_markdown": 1, - "_without_memcached": 1, - "_without_memoryfilesystem": 1, - "_without_obr": 1, - "_without_python": 1, - "_without_reporting": 1, - "_without_scm": 1, - "_without_snappy": 1, - "_without_spring": 1, - "_without_ssh": 1, - "_without_testlib": 1, }, "summary": "Java build tool", From 7698257285115f0616bb9ad7b564f2267d0187fa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Nov 2018 09:49:59 +0100 Subject: [PATCH 08/32] Add explicit buildrequires on platform --- ant.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ant.yaml b/ant.yaml index d4c97ab..cc0131b 100644 --- a/ant.yaml +++ b/ant.yaml @@ -18,6 +18,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] + platform: [f28] requires: platform: [] profiles: From b818b0de1104ca1bee6afeeec86c12c4ce466951 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Nov 2018 05:27:58 +0100 Subject: [PATCH 09/32] Enable all ant subpackages including junit5 Resolves: rhbz#1631451 --- ant.yaml | 156 +++++++++++++++++++++++++++++++++++++++++++++++++--- koschei.cfg | 21 ++++++- 2 files changed, 168 insertions(+), 9 deletions(-) diff --git a/ant.yaml b/ant.yaml index cc0131b..f0fa22b 100644 --- a/ant.yaml +++ b/ant.yaml @@ -28,8 +28,6 @@ data: api: rpms: - ant - filter: - rpms: - ant-antlr - ant-apache-bcel - ant-apache-bsf @@ -40,24 +38,166 @@ data: - ant-apache-xalan2 - ant-commons-logging - ant-commons-net - - ant-javadoc - ant-javamail - ant-jdepend - ant-jmf - ant-jsch - ant-junit - - ant-manual + - ant-junit5 - ant-swing - ant-testutil - ant-xz - buildopts: + filter: rpms: - macros: | - %_without_junit5 1 + - ant-javadoc + - ant-manual + - antlr-C++ + - antlr-javadoc + - antlr-manual + - apache-commons-logging-javadoc + - apache-commons-net-javadoc + - bcel-javadoc + - bsf-javadoc + - hamcrest + - hamcrest-demo + - hamcrest-javadoc + - jakarta-oro-javadoc + - javamail-javadoc + - jdepend-demo + - jdepend-javadoc + - jsch-javadoc + - junit-javadoc + - junit-manual + - junit5-guide + - junit5-javadoc + - jzlib-demo + - jzlib-javadoc + - log4j12-javadoc + - regexp-javadoc + - xalan-j2-demo + - xalan-j2-javadoc + - xalan-j2-manual + - xalan-j2-xsltc + - xerces-j2-demo + - xerces-j2-javadoc + - xml-commons-apis-javadoc + - xml-commons-apis-manual + - xml-commons-resolver-javadoc + - xz-java-javadoc components: rpms: ant: - buildorder: 10 + buildorder: 40 ref: javapackages rationale: > Module API. + antlr: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of ant. + apache-commons-logging: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of ant, bsf. + apache-commons-net: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of ant. + bcel: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of ant. + bsf: + buildorder: 20 + ref: javapackages + rationale: > + Runtime dependency of ant. + hamcrest: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of junit. + jakarta-oro: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of ant. + javamail: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of ant. + jdepend: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of ant. + jsch: + buildorder: 20 + ref: javapackages + rationale: > + Runtime dependency of ant. + junit: + buildorder: 20 + ref: javapackages + rationale: > + Runtime dependency of ant, junit5. + junit5: + buildorder: 30 + ref: javapackages + rationale: > + Runtime dependency of ant. + jzlib: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of jsch. + log4j12: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of ant. + opentest4j: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of junit5. + regexp: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of ant. + univocity-parsers: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of junit5. + xalan-j2: + buildorder: 30 + ref: javapackages + rationale: > + Runtime dependency of ant. + xerces-j2: + buildorder: 20 + ref: javapackages + rationale: > + Runtime dependency of xalan-j2. + xml-commons-apis: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of xalan-j2, xerces-j2. + xml-commons-resolver: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of ant, xerces-j2. + xz-java: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of ant. diff --git a/koschei.cfg b/koschei.cfg index 5b1daf7..610d3c2 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -3,6 +3,7 @@ config = { "buildrequires": [ "javapackages-tools", + "platform", ], "requires": [ "platform", @@ -18,6 +19,25 @@ config = { "api": [ "ant", + "ant-antlr", + "ant-apache-bcel", + "ant-apache-bsf", + "ant-apache-log4j", + "ant-apache-oro", + "ant-apache-regexp", + "ant-apache-resolver", + "ant-apache-xalan2", + "ant-commons-logging", + "ant-commons-net", + "ant-javamail", + "ant-jdepend", + "ant-jmf", + "ant-jsch", + "ant-junit", + "ant-junit5", + "ant-swing", + "ant-testutil", + "ant-xz", ], "profiles": { "default": ["ant"], @@ -43,7 +63,6 @@ config = { }, "macros": { - "_without_junit5": 1, }, "summary": "Java build tool", From f13a601bede7fae5fd2fcfcccc415f12a0c36c63 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Nov 2018 05:42:14 +0100 Subject: [PATCH 10/32] Add apiguardian --- ant.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ant.yaml b/ant.yaml index f0fa22b..9cee5a8 100644 --- a/ant.yaml +++ b/ant.yaml @@ -56,6 +56,8 @@ data: - antlr-manual - apache-commons-logging-javadoc - apache-commons-net-javadoc + - apiguardian + - apiguardian-javadoc - bcel-javadoc - bsf-javadoc - hamcrest @@ -73,7 +75,9 @@ data: - jzlib-demo - jzlib-javadoc - log4j12-javadoc + - opentest4j-javadoc - regexp-javadoc + - univocity-parsers-javadoc - xalan-j2-demo - xalan-j2-javadoc - xalan-j2-manual @@ -106,6 +110,11 @@ data: ref: javapackages rationale: > Runtime dependency of ant. + apiguardian: + buildorder: 10 + ref: javapackages + rationale: > + Build dependency of junit5. bcel: buildorder: 10 ref: javapackages From 707ef1bc24f46ed5c96c94f6f14e5130e5fee551 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Nov 2018 05:46:25 +0100 Subject: [PATCH 11/32] Fix refs for ant, apiguardian, opentest4j, junit5, univocity-parsers --- ant.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ant.yaml b/ant.yaml index 9cee5a8..e22553c 100644 --- a/ant.yaml +++ b/ant.yaml @@ -92,7 +92,8 @@ data: rpms: ant: buildorder: 40 - ref: javapackages + ref: ec6653d + #ref: javapackages rationale: > Module API. antlr: @@ -112,7 +113,8 @@ data: Runtime dependency of ant. apiguardian: buildorder: 10 - ref: javapackages + ref: 4817aa2 + #ref: javapackages rationale: > Build dependency of junit5. bcel: @@ -157,7 +159,8 @@ data: Runtime dependency of ant, junit5. junit5: buildorder: 30 - ref: javapackages + ref: 8119da9 + #ref: javapackages rationale: > Runtime dependency of ant. jzlib: @@ -172,7 +175,8 @@ data: Runtime dependency of ant. opentest4j: buildorder: 10 - ref: javapackages + ref: a285d9b + #ref: javapackages rationale: > Runtime dependency of junit5. regexp: @@ -182,7 +186,8 @@ data: Runtime dependency of ant. univocity-parsers: buildorder: 10 - ref: javapackages + ref: a285d9b + #ref: javapackages rationale: > Runtime dependency of junit5. xalan-j2: From bc967b6ea866bd35778233ade6e4662b411299ab Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Nov 2018 05:57:34 +0100 Subject: [PATCH 12/32] Fix typos in git refs --- ant.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ant.yaml b/ant.yaml index e22553c..792593a 100644 --- a/ant.yaml +++ b/ant.yaml @@ -113,7 +113,7 @@ data: Runtime dependency of ant. apiguardian: buildorder: 10 - ref: 4817aa2 + ref: 4817a2a #ref: javapackages rationale: > Build dependency of junit5. @@ -175,7 +175,7 @@ data: Runtime dependency of ant. opentest4j: buildorder: 10 - ref: a285d9b + ref: c797cfc #ref: javapackages rationale: > Runtime dependency of junit5. From 82545c3ff2e5a5c0c1d6a48752f07606d05aab51 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Nov 2018 15:09:39 +0100 Subject: [PATCH 13/32] New CG build From 505b8bcf2207718db1dece3b9e9b85cf25044eca Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 9 Apr 2019 03:07:10 +0200 Subject: [PATCH 14/32] Don't filter-out hamcrest, rhbz#1692089 --- ant.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ant.yaml b/ant.yaml index 792593a..2e390e1 100644 --- a/ant.yaml +++ b/ant.yaml @@ -60,7 +60,6 @@ data: - apiguardian-javadoc - bcel-javadoc - bsf-javadoc - - hamcrest - hamcrest-demo - hamcrest-javadoc - jakarta-oro-javadoc From 928ff38749263f1ccb81bfa2f1fd9a9afb3ef3e2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 9 Apr 2019 10:27:50 +0200 Subject: [PATCH 15/32] Rebuild with latest component versions --- ant.yaml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/ant.yaml b/ant.yaml index 2e390e1..c2cec71 100644 --- a/ant.yaml +++ b/ant.yaml @@ -91,8 +91,7 @@ data: rpms: ant: buildorder: 40 - ref: ec6653d - #ref: javapackages + ref: javapackages rationale: > Module API. antlr: @@ -112,8 +111,7 @@ data: Runtime dependency of ant. apiguardian: buildorder: 10 - ref: 4817a2a - #ref: javapackages + ref: javapackages rationale: > Build dependency of junit5. bcel: @@ -158,8 +156,7 @@ data: Runtime dependency of ant, junit5. junit5: buildorder: 30 - ref: 8119da9 - #ref: javapackages + ref: javapackages rationale: > Runtime dependency of ant. jzlib: @@ -174,8 +171,7 @@ data: Runtime dependency of ant. opentest4j: buildorder: 10 - ref: c797cfc - #ref: javapackages + ref: javapackages rationale: > Runtime dependency of junit5. regexp: @@ -185,8 +181,7 @@ data: Runtime dependency of ant. univocity-parsers: buildorder: 10 - ref: a285d9b - #ref: javapackages + ref: javapackages rationale: > Runtime dependency of junit5. xalan-j2: From cecf358f17a3e013ea609f49ed190ab4cf96ffcb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 9 Apr 2019 11:17:34 +0200 Subject: [PATCH 16/32] New CG build From 6f7e4fdf4f6f0e6dccaa8a937b41e6e428f18101 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 9 Apr 2019 11:19:57 +0200 Subject: [PATCH 17/32] New CG build From 2aadd300da0ba1adbea8c9f71cfc32d6b9be8d91 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 7 May 2019 16:43:48 +0200 Subject: [PATCH 18/32] Actually enable junit5 support Resolves: rhbz#1692089 From 3707a399e57b4c187179fdfb3073d55fd6882090 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 7 May 2019 16:44:06 +0200 Subject: [PATCH 19/32] New CG build From 91393ef030bc085f8b0874ff7ed864c8a26d87fb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 7 May 2019 16:44:06 +0200 Subject: [PATCH 20/32] New CG build From f851aac5f786128b796bfa7cb927551559872f81 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 8 May 2019 07:51:49 +0200 Subject: [PATCH 21/32] New CG build From 53264f16f1373a5de49555f67e93d7283e967c3f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 2 Dec 2020 11:09:07 +0100 Subject: [PATCH 22/32] Remove koschei.cfg --- koschei.cfg | 110 ---------------------------------------------------- 1 file changed, 110 deletions(-) delete mode 100644 koschei.cfg diff --git a/koschei.cfg b/koschei.cfg deleted file mode 100644 index 610d3c2..0000000 --- a/koschei.cfg +++ /dev/null @@ -1,110 +0,0 @@ -# -*- python -*- -# vim: ft=python -config = { - "buildrequires": [ - "javapackages-tools", - "platform", - ], - "requires": [ - "platform", - ], - - "bootstrap": False, - "full_refs": False, - "default_ref": "javapackages", - "include_build_deps": False, - "closure": False, - "filter_unused": True, - "topo_sort": True, - - "api": [ - "ant", - "ant-antlr", - "ant-apache-bcel", - "ant-apache-bsf", - "ant-apache-log4j", - "ant-apache-oro", - "ant-apache-regexp", - "ant-apache-resolver", - "ant-apache-xalan2", - "ant-commons-logging", - "ant-commons-net", - "ant-javamail", - "ant-jdepend", - "ant-jmf", - "ant-jsch", - "ant-junit", - "ant-junit5", - "ant-swing", - "ant-testutil", - "ant-xz", - ], - "profiles": { - "default": ["ant"], - }, - "filter": [ - ], - "includes": [ - ], - "excludes": [ - "javapackages-tools", - "java-1.7.0-openjdk", - "java-1.8.0-openjdk", - ], - "frozen_refs": [ - ], - "stream_override": { - "javapackages-tools": { - "1.10": "[201801]", - }, - "platform": { - "1.10": "[]", - }, - }, - - "macros": { - }, - - "summary": "Java build tool", - "description": """\ - Apache Ant is a Java library and command-line tool whose mission - is to drive processes described in build files as targets and extension - points dependent upon each other. The main known usage of Ant is the - build of Java applications. Ant supplies a number of built-in tasks - allowing to compile, assemble, test and run Java applications. Ant can - also be used effectively to build non Java applications, for instance C - or C++ applications. More generally, Ant can be used to pilot any type - of process which can be described in terms of targets and tasks. - """, - - "koji_config": { - "server": "https://koji.kjnet.xyz/kojihub", - "topurl": "https://koji.kjnet.xyz/kojifiles", - "multicall_chunk_size": 1000, - "tag_name": "hybrid", - }, - "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" - }, - }, - }, -} From 19f9a2b59b61b1bad0bf593ec607bac45b13b28a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 2 Dec 2020 11:09:40 +0100 Subject: [PATCH 23/32] New build against javapackages-tools 202001 --- ant.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ant.yaml b/ant.yaml index c2cec71..6ab8181 100644 --- a/ant.yaml +++ b/ant.yaml @@ -17,8 +17,8 @@ data: - MIT dependencies: - buildrequires: - javapackages-tools: [201801] - platform: [f28] + javapackages-tools: [202001] + platform: [f32] requires: platform: [] profiles: From cda8f9bca87d981ccd9ff1430b636824aebd9c5d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 3 Dec 2020 09:15:42 +0100 Subject: [PATCH 24/32] Switch to stream-ant-1.10 branches --- ant.yaml | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/ant.yaml b/ant.yaml index 6ab8181..02bd238 100644 --- a/ant.yaml +++ b/ant.yaml @@ -90,122 +90,122 @@ data: components: rpms: ant: - buildorder: 40 - ref: javapackages + buildorder: 50 + ref: stream-ant-1.10 rationale: > Module API. antlr: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. apache-commons-logging: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant, bsf. apache-commons-net: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. apiguardian: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Build dependency of junit5. bcel: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. bsf: - buildorder: 20 - ref: javapackages + buildorder: 40 + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. hamcrest: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of junit. jakarta-oro: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. javamail: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. jdepend: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. jsch: buildorder: 20 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. junit: buildorder: 20 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant, junit5. junit5: buildorder: 30 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. jzlib: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of jsch. log4j12: - buildorder: 10 - ref: javapackages + buildorder: 20 + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. opentest4j: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of junit5. regexp: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. univocity-parsers: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of junit5. xalan-j2: buildorder: 30 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. xerces-j2: buildorder: 20 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of xalan-j2. xml-commons-apis: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of xalan-j2, xerces-j2. xml-commons-resolver: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant, xerces-j2. xz-java: buildorder: 10 - ref: javapackages + ref: stream-ant-1.10 rationale: > Runtime dependency of ant. From e9efcbbb4f05c5b0f1ee51a52c6ea54e9dad21c7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 3 Dec 2020 09:43:03 +0100 Subject: [PATCH 25/32] Build on all platforms except el8 --- ant.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ant.yaml b/ant.yaml index 02bd238..878f6ac 100644 --- a/ant.yaml +++ b/ant.yaml @@ -18,9 +18,9 @@ data: dependencies: - buildrequires: javapackages-tools: [202001] - platform: [f32] + platform: [-el8] requires: - platform: [] + platform: [-el8] profiles: default: rpms: From a09c8c8e43c3403af7ecabebf66598bb870b358c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 3 Dec 2020 14:12:22 +0100 Subject: [PATCH 26/32] Rebuild with updated javamail From 641d4d5ac88d32ddd8c03551d380936a4f437d2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 1 Feb 2021 15:22:18 +0000 Subject: [PATCH 27/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering From cc9307c75802ed811e7335ae357af73b1ed33e79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 1 Feb 2021 15:57:27 +0000 Subject: [PATCH 28/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering From b805d47e09b88f95ec38ae9cda65266a446df71d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 9 Feb 2021 22:38:07 +0000 Subject: [PATCH 29/32] Branching f34 from rawhide Signed-off-by: Fedora Release Engineering From eb09eb7099137e10a7fff79a7debdf32efc508bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 06:32:35 +0000 Subject: [PATCH 30/32] Branching f34 from rawhide Signed-off-by: Fedora Release Engineering From d49cf8d51141026743392a03c6d72933fed9d116 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 06:41:35 +0000 Subject: [PATCH 31/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From e3c51255d3d6bfdd504c902fbf6c0a1fe7c0b92f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 7 Jan 2022 09:30:32 +0100 Subject: [PATCH 32/32] Ant is shipped as non-modular package --- README.md | 3 - ant.yaml | 211 ---------------------------------------------------- dead.module | 1 + 3 files changed, 1 insertion(+), 214 deletions(-) delete mode 100644 README.md delete mode 100644 ant.yaml create mode 100644 dead.module diff --git a/README.md b/README.md deleted file mode 100644 index 4e56507..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# ant - -The ant package \ No newline at end of file diff --git a/ant.yaml b/ant.yaml deleted file mode 100644 index 878f6ac..0000000 --- a/ant.yaml +++ /dev/null @@ -1,211 +0,0 @@ ---- -document: modulemd -version: 2 -data: - summary: Java build tool - description: >- - Apache Ant is a Java library and command-line tool whose mission - is to drive processes described in build files as targets and extension - points dependent upon each other. The main known usage of Ant is the - build of Java applications. Ant supplies a number of built-in tasks - allowing to compile, assemble, test and run Java applications. Ant can - also be used effectively to build non Java applications, for instance C - or C++ applications. More generally, Ant can be used to pilot any type - of process which can be described in terms of targets and tasks. - license: - module: - - MIT - dependencies: - - buildrequires: - javapackages-tools: [202001] - platform: [-el8] - requires: - platform: [-el8] - profiles: - default: - rpms: - - ant - api: - rpms: - - ant - - ant-antlr - - ant-apache-bcel - - ant-apache-bsf - - ant-apache-log4j - - ant-apache-oro - - ant-apache-regexp - - ant-apache-resolver - - ant-apache-xalan2 - - ant-commons-logging - - ant-commons-net - - ant-javamail - - ant-jdepend - - ant-jmf - - ant-jsch - - ant-junit - - ant-junit5 - - ant-swing - - ant-testutil - - ant-xz - filter: - rpms: - - ant-javadoc - - ant-manual - - antlr-C++ - - antlr-javadoc - - antlr-manual - - apache-commons-logging-javadoc - - apache-commons-net-javadoc - - apiguardian - - apiguardian-javadoc - - bcel-javadoc - - bsf-javadoc - - hamcrest-demo - - hamcrest-javadoc - - jakarta-oro-javadoc - - javamail-javadoc - - jdepend-demo - - jdepend-javadoc - - jsch-javadoc - - junit-javadoc - - junit-manual - - junit5-guide - - junit5-javadoc - - jzlib-demo - - jzlib-javadoc - - log4j12-javadoc - - opentest4j-javadoc - - regexp-javadoc - - univocity-parsers-javadoc - - xalan-j2-demo - - xalan-j2-javadoc - - xalan-j2-manual - - xalan-j2-xsltc - - xerces-j2-demo - - xerces-j2-javadoc - - xml-commons-apis-javadoc - - xml-commons-apis-manual - - xml-commons-resolver-javadoc - - xz-java-javadoc - components: - rpms: - ant: - buildorder: 50 - ref: stream-ant-1.10 - rationale: > - Module API. - antlr: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. - apache-commons-logging: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant, bsf. - apache-commons-net: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. - apiguardian: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Build dependency of junit5. - bcel: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. - bsf: - buildorder: 40 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. - hamcrest: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of junit. - jakarta-oro: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. - javamail: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. - jdepend: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. - jsch: - buildorder: 20 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. - junit: - buildorder: 20 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant, junit5. - junit5: - buildorder: 30 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. - jzlib: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of jsch. - log4j12: - buildorder: 20 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. - opentest4j: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of junit5. - regexp: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. - univocity-parsers: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of junit5. - xalan-j2: - buildorder: 30 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. - xerces-j2: - buildorder: 20 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of xalan-j2. - xml-commons-apis: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of xalan-j2, xerces-j2. - xml-commons-resolver: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant, xerces-j2. - xz-java: - buildorder: 10 - ref: stream-ant-1.10 - rationale: > - Runtime dependency of ant. diff --git a/dead.module b/dead.module new file mode 100644 index 0000000..b5e089d --- /dev/null +++ b/dead.module @@ -0,0 +1 @@ +Ant is shipped as non-modular package