From eeb2e5a475bcf014c4f8f4f3faffbc1c07528a31 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 10 Apr 2018 21:03:10 +0200 Subject: [PATCH 01/38] Switch refs to javapackages arbitrary branch --- maven.yaml | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/maven.yaml b/maven.yaml index 0c9f8f1..ecd685a 100644 --- a/maven.yaml +++ b/maven.yaml @@ -137,190 +137,190 @@ data: # aopalliance-1.0-15.fc28 aopalliance: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of google-guice, maven. # apache-commons-cli-1.4-2.fc28 apache-commons-cli: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of maven. # apache-commons-codec-1.11-1.fc28 apache-commons-codec: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of httpcomponents-client, maven. # apache-commons-io-2.6-1.fc28 apache-commons-io: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of maven, maven-shared-utils, maven-wagon. # apache-commons-lang3-3.7-1.fc28 apache-commons-lang3: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of maven. # apache-commons-logging-1.2-11.fc28 apache-commons-logging: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of httpcomponents-client, maven. # atinject-1-25.20100611svn86.fc28 atinject: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of cdi-api, google-guice, maven. # cdi-api-1.2-6.fc28 cdi-api: buildorder: 20 - ref: master + ref: javapackages rationale: > Runtime dependency of maven, sisu. # geronimo-annotation-1.0-21.fc28 geronimo-annotation: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of maven. # glassfish-el-3.0.1-0.6.b08.fc28 glassfish-el: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of cdi-api. # google-guice-4.1-8.fc28 google-guice: buildorder: 20 - ref: master + ref: javapackages rationale: > Runtime dependency of maven. # guava-18.0-11.fc28 guava: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of google-guice, maven. # hawtjni-1.15-2.fc28 hawtjni: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of jansi, jansi-native, maven. # httpcomponents-client-4.5.3-4.fc28 httpcomponents-client: buildorder: 20 - ref: master + ref: javapackages rationale: > Runtime dependency of maven, maven-wagon. # httpcomponents-core-4.4.9-1.fc28 httpcomponents-core: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of httpcomponents-client, maven, maven-wagon. # jansi-1.16-2.fc28 jansi: buildorder: 30 - ref: master + ref: javapackages rationale: > Runtime dependency of maven. # jansi-native-1.7-3.fc28 jansi-native: buildorder: 20 - ref: master + ref: javapackages multilib: [] rationale: > Runtime dependency of jansi, maven. # jboss-interceptors-1.2-api-1.0.0-7.fc28 jboss-interceptors-1.2-api: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of cdi-api. # jsoup-1.11.2-1.fc28 jsoup: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of maven-wagon. # maven-3.5.2-1.fc28 maven: buildorder: 50 - ref: master + ref: javapackages rationale: > Module API. # maven-resolver-1.1.0-2.fc28 maven-resolver: buildorder: 40 - ref: master + ref: javapackages rationale: > Runtime dependency of maven. # maven-shared-utils-3.1.0-5.fc28 maven-shared-utils: buildorder: 20 - ref: master + ref: javapackages rationale: > Runtime dependency of maven. # maven-wagon-3.0.0-1.fc28 maven-wagon: buildorder: 30 - ref: master + ref: javapackages rationale: > Runtime dependency of maven, maven-resolver. # plexus-cipher-1.7-13.fc28 plexus-cipher: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of maven, plexus-sec-dispatcher. # plexus-classworlds-2.5.2-8.fc28 plexus-classworlds: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of maven, sisu. # plexus-containers-1.7.1-3.fc28 plexus-containers: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of maven, sisu. # plexus-interpolation-1.22-8.fc28 plexus-interpolation: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of maven. # plexus-sec-dispatcher-1.4-23.fc28 plexus-sec-dispatcher: buildorder: 20 - ref: master + ref: javapackages rationale: > Runtime dependency of maven. # plexus-utils-3.0.24-4.fc28 plexus-utils: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of maven, maven-wagon, plexus-sec-dispatcher, sisu. # sisu-0.3.3-2.fc28 sisu: buildorder: 30 - ref: master + ref: javapackages rationale: > Runtime dependency of maven. # slf4j-1.7.25-2.fc28 slf4j: buildorder: 10 - ref: master + ref: javapackages rationale: > Runtime dependency of maven, maven-wagon. From c0b691ce29b574475cc3f59aa47a011e92414f82 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 10 Apr 2018 21:38:37 +0200 Subject: [PATCH 02/38] Buildrequire javapackages-tools 201801 --- maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven.yaml b/maven.yaml index ecd685a..bb50646 100644 --- a/maven.yaml +++ b/maven.yaml @@ -13,7 +13,7 @@ data: - MIT dependencies: - buildrequires: - javapackages-tools: [master] + javapackages-tools: [201801] requires: platform: [] profiles: From fb01854be77297ff90729d05f645d4d5657abaa4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 11 Apr 2018 13:21:31 +0200 Subject: [PATCH 03/38] Regenerate component list --- koschei.cfg | 31 +++++++++++++++---------------- maven.yaml | 37 +++---------------------------------- 2 files changed, 18 insertions(+), 50 deletions(-) diff --git a/koschei.cfg b/koschei.cfg index fbc4850..f0e6618 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -3,17 +3,14 @@ config = { "buildrequires": [ "javapackages-tools", - "java", - "platform", ], "requires": [ - "java", "platform", ], "bootstrap": False, - "full_refs": True, - "default_ref": None, + "full_refs": False, + "default_ref": "javapackages", "include_build_deps": False, "closure": False, "filter_unused": True, @@ -38,8 +35,11 @@ config = { "python-lxml", ], "stream_override": { - "java": { - "f27": "8", + "javapackages-tools": { + "3.5": "[201801]", + }, + "platform": { + "3.5": "[]", }, }, @@ -83,18 +83,17 @@ config = { }, "summary": "Java project management and project comprehension tool", - "description": [ - "Maven is a software project management and comprehension tool.", - "Based on the concept of a project object model (POM), Maven", - "can manage a project's build, reporting and documentation from", - "a central piece of information.", - ], + "description": """\ + Maven is a software project management and comprehension tool. + Based on the concept of a project object model (POM), Maven + can manage a project's build, reporting and documentation from + a central piece of information. + """, "koji_config": { - "server": "https://koji.lbzip2.org/kojihub", - "topurl": "https://koji.lbzip2.org/kojifiles", + "server": "https://koji.fedoraproject.org/kojihub", + "topurl": "https://kojipkgs.fedoraproject.org", "multicall_chunk_size": 1000, - "tag_name": "module", }, "dependency": { "repo_arch": "x86_64", diff --git a/maven.yaml b/maven.yaml index bb50646..2426429 100644 --- a/maven.yaml +++ b/maven.yaml @@ -38,7 +38,8 @@ data: - glassfish-el - glassfish-el-javadoc - google-guice-javadoc - - guava-javadoc + - guava20-javadoc + - guava20-testlib - guice-assistedinject - guice-bom - guice-extensions @@ -134,191 +135,159 @@ data: %_without_testlib 1 components: rpms: - # aopalliance-1.0-15.fc28 aopalliance: buildorder: 10 ref: javapackages rationale: > Runtime dependency of google-guice, maven. - # apache-commons-cli-1.4-2.fc28 apache-commons-cli: buildorder: 10 ref: javapackages rationale: > Runtime dependency of maven. - # apache-commons-codec-1.11-1.fc28 apache-commons-codec: buildorder: 10 ref: javapackages rationale: > Runtime dependency of httpcomponents-client, maven. - # apache-commons-io-2.6-1.fc28 apache-commons-io: buildorder: 10 ref: javapackages rationale: > Runtime dependency of maven, maven-shared-utils, maven-wagon. - # apache-commons-lang3-3.7-1.fc28 apache-commons-lang3: buildorder: 10 ref: javapackages rationale: > Runtime dependency of maven. - # apache-commons-logging-1.2-11.fc28 apache-commons-logging: buildorder: 10 ref: javapackages rationale: > Runtime dependency of httpcomponents-client, maven. - # atinject-1-25.20100611svn86.fc28 atinject: buildorder: 10 ref: javapackages rationale: > Runtime dependency of cdi-api, google-guice, maven. - # cdi-api-1.2-6.fc28 cdi-api: buildorder: 20 ref: javapackages rationale: > Runtime dependency of maven, sisu. - # geronimo-annotation-1.0-21.fc28 geronimo-annotation: buildorder: 10 ref: javapackages rationale: > Runtime dependency of maven. - # glassfish-el-3.0.1-0.6.b08.fc28 glassfish-el: buildorder: 10 ref: javapackages rationale: > Runtime dependency of cdi-api. - # google-guice-4.1-8.fc28 google-guice: buildorder: 20 ref: javapackages rationale: > Runtime dependency of maven. - # guava-18.0-11.fc28 - guava: + guava20: buildorder: 10 ref: javapackages rationale: > Runtime dependency of google-guice, maven. - # hawtjni-1.15-2.fc28 hawtjni: buildorder: 10 ref: javapackages rationale: > Runtime dependency of jansi, jansi-native, maven. - # httpcomponents-client-4.5.3-4.fc28 httpcomponents-client: buildorder: 20 ref: javapackages rationale: > Runtime dependency of maven, maven-wagon. - # httpcomponents-core-4.4.9-1.fc28 httpcomponents-core: buildorder: 10 ref: javapackages rationale: > Runtime dependency of httpcomponents-client, maven, maven-wagon. - # jansi-1.16-2.fc28 jansi: buildorder: 30 ref: javapackages rationale: > Runtime dependency of maven. - # jansi-native-1.7-3.fc28 jansi-native: buildorder: 20 ref: javapackages - multilib: [] rationale: > Runtime dependency of jansi, maven. - # jboss-interceptors-1.2-api-1.0.0-7.fc28 jboss-interceptors-1.2-api: buildorder: 10 ref: javapackages rationale: > Runtime dependency of cdi-api. - # jsoup-1.11.2-1.fc28 jsoup: buildorder: 10 ref: javapackages rationale: > Runtime dependency of maven-wagon. - # maven-3.5.2-1.fc28 maven: buildorder: 50 ref: javapackages rationale: > Module API. - # maven-resolver-1.1.0-2.fc28 maven-resolver: buildorder: 40 ref: javapackages rationale: > Runtime dependency of maven. - # maven-shared-utils-3.1.0-5.fc28 maven-shared-utils: buildorder: 20 ref: javapackages rationale: > Runtime dependency of maven. - # maven-wagon-3.0.0-1.fc28 maven-wagon: buildorder: 30 ref: javapackages rationale: > Runtime dependency of maven, maven-resolver. - # plexus-cipher-1.7-13.fc28 plexus-cipher: buildorder: 10 ref: javapackages rationale: > Runtime dependency of maven, plexus-sec-dispatcher. - # plexus-classworlds-2.5.2-8.fc28 plexus-classworlds: buildorder: 10 ref: javapackages rationale: > Runtime dependency of maven, sisu. - # plexus-containers-1.7.1-3.fc28 plexus-containers: buildorder: 10 ref: javapackages rationale: > Runtime dependency of maven, sisu. - # plexus-interpolation-1.22-8.fc28 plexus-interpolation: buildorder: 10 ref: javapackages rationale: > Runtime dependency of maven. - # plexus-sec-dispatcher-1.4-23.fc28 plexus-sec-dispatcher: buildorder: 20 ref: javapackages rationale: > Runtime dependency of maven. - # plexus-utils-3.0.24-4.fc28 plexus-utils: buildorder: 10 ref: javapackages rationale: > Runtime dependency of maven, maven-wagon, plexus-sec-dispatcher, sisu. - # sisu-0.3.3-2.fc28 sisu: buildorder: 30 ref: javapackages rationale: > Runtime dependency of maven. - # slf4j-1.7.25-2.fc28 slf4j: buildorder: 10 ref: javapackages From 224ccb2073e8c2dbb83b28c864873e277a71c468 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Jun 2018 17:39:08 +0200 Subject: [PATCH 04/38] Rebase to Maven 3.5.4 --- koschei.cfg | 7 ++++--- maven.yaml | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/koschei.cfg b/koschei.cfg index f0e6618..fa69076 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": { @@ -68,6 +67,7 @@ config = { "_without_jmh": 1, "_without_jna": 1, "_without_jpa": 1, + "_without_junit5": 1, "_without_logback": 1, "_without_markdown": 1, "_without_memcached": 1, @@ -91,9 +91,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", diff --git a/maven.yaml b/maven.yaml index 2426429..bda327a 100644 --- a/maven.yaml +++ b/maven.yaml @@ -121,6 +121,7 @@ data: %_without_jmh 1 %_without_jna 1 %_without_jpa 1 + %_without_junit5 1 %_without_logback 1 %_without_markdown 1 %_without_memcached 1 From d6a65ee84897fa297a1b046633e3d46cd7f13870 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 6 Aug 2018 11:09:04 +0200 Subject: [PATCH 05/38] Full rebuild --- maven.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maven.yaml b/maven.yaml index bda327a..630c971 100644 --- a/maven.yaml +++ b/maven.yaml @@ -104,6 +104,7 @@ data: %_without_cython 1 %_without_dafsa 1 %_without_desktop 1 + %_without_dom4j 1 %_without_doxygen 1 %_without_dtd 1 %_without_eclipse 1 @@ -130,10 +131,12 @@ data: %_without_python 1 %_without_reporting 1 %_without_scm 1 + %_without_snakeyaml 1 %_without_snappy 1 %_without_spring 1 %_without_ssh 1 %_without_testlib 1 + %_without_vfs 1 components: rpms: aopalliance: From 2532146cbf61696deb0559f7dafb6d815600a047 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Nov 2018 09:37:47 +0100 Subject: [PATCH 06/38] Update macros in koschei.cfg --- koschei.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/koschei.cfg b/koschei.cfg index fa69076..92930f2 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -50,6 +50,7 @@ config = { "_without_cython": 1, "_without_dafsa": 1, "_without_desktop": 1, + "_without_dom4j": 1, "_without_doxygen": 1, "_without_dtd": 1, "_without_eclipse": 1, @@ -76,10 +77,12 @@ config = { "_without_python": 1, "_without_reporting": 1, "_without_scm": 1, + "_without_snakeyaml": 1, "_without_snappy": 1, "_without_spring": 1, "_without_ssh": 1, "_without_testlib": 1, + "_without_vfs": 1, }, "summary": "Java project management and project comprehension tool", From af8d2de6081dc60d3c4b0d9a1eb10e728817e4f2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Nov 2018 09:48:47 +0100 Subject: [PATCH 07/38] Add explicit buildrequires on platform --- maven.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/maven.yaml b/maven.yaml index 630c971..2f782a1 100644 --- a/maven.yaml +++ b/maven.yaml @@ -14,6 +14,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] + platform: [f28] requires: platform: [] profiles: From 91e9b7ad58fb2778052bfca0e66c74147ff082ae Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 May 2019 09:07:05 +0200 Subject: [PATCH 08/38] Switch to MBI package set --- koschei.cfg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/koschei.cfg b/koschei.cfg index 92930f2..8378e8f 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -3,6 +3,7 @@ config = { "buildrequires": [ "javapackages-tools", + "platform", ], "requires": [ "platform", @@ -36,9 +37,11 @@ config = { "stream_override": { "javapackages-tools": { "3.5": "[201801]", + "master": "[201801]", }, "platform": { "3.5": "[]", + "master": "[]", }, }, @@ -97,7 +100,7 @@ config = { "server": "https://koji.kjnet.xyz/kojihub", "topurl": "https://koji.kjnet.xyz/kojifiles", "multicall_chunk_size": 1000, - "tag_name": "hybrid", + "tag_name": "jp-build", }, "dependency": { "repo_arch": "x86_64", From e225190aaff55c5c8118da0fc3e9cbbe91f9149e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 May 2019 09:13:01 +0200 Subject: [PATCH 09/38] Update to Maven 3.6 --- maven.yaml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/maven.yaml b/maven.yaml index 2f782a1..94a1d82 100644 --- a/maven.yaml +++ b/maven.yaml @@ -39,8 +39,8 @@ data: - glassfish-el - glassfish-el-javadoc - google-guice-javadoc - - guava20-javadoc - - guava20-testlib + - guava-javadoc + - guava-testlib - guice-assistedinject - guice-bom - guice-extensions @@ -50,7 +50,6 @@ data: - guice-multibindings - guice-parent - guice-servlet - - guice-testlib - guice-throwingproviders - hawtjni - hawtjni-javadoc @@ -61,6 +60,7 @@ data: - jansi-native-javadoc - jboss-interceptors-1.2-api-javadoc - jsoup-javadoc + - jsr-305-javadoc - jul-to-slf4j - log4j-over-slf4j - maven-hawtjni-plugin @@ -192,12 +192,12 @@ data: rationale: > Runtime dependency of cdi-api. google-guice: - buildorder: 20 + buildorder: 30 ref: javapackages rationale: > Runtime dependency of maven. - guava20: - buildorder: 10 + guava: + buildorder: 20 ref: javapackages rationale: > Runtime dependency of google-guice, maven. @@ -237,6 +237,11 @@ data: ref: javapackages rationale: > Runtime dependency of maven-wagon. + jsr-305: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of guava. maven: buildorder: 50 ref: javapackages @@ -297,4 +302,5 @@ data: buildorder: 10 ref: javapackages rationale: > - Runtime dependency of maven, maven-wagon. + Runtime dependency of maven, maven-resolver, + maven-wagon. From 9a95b295e475506b0a49f9da0e8214384e54bdc4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 May 2019 09:54:26 +0200 Subject: [PATCH 10/38] Add config for 3.6 stream --- koschei.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/koschei.cfg b/koschei.cfg index 8378e8f..9d3b2cd 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -37,10 +37,12 @@ config = { "stream_override": { "javapackages-tools": { "3.5": "[201801]", + "3.6": "[201801]", "master": "[201801]", }, "platform": { "3.5": "[]", + "3.6": "[]", "master": "[]", }, }, From 6a5cdc18c9639e603f04d053492a902c1e02dbac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 May 2019 09:55:23 +0200 Subject: [PATCH 11/38] Switch to stream-maven-3.6 branches --- koschei.cfg | 2 +- maven.yaml | 64 ++++++++++++++++++++++++++--------------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/koschei.cfg b/koschei.cfg index 9d3b2cd..9260eec 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -11,7 +11,7 @@ config = { "bootstrap": False, "full_refs": False, - "default_ref": "javapackages", + "default_ref": "stream-maven-3.6", "include_build_deps": False, "closure": False, "filter_unused": True, diff --git a/maven.yaml b/maven.yaml index 94a1d82..4693e33 100644 --- a/maven.yaml +++ b/maven.yaml @@ -142,165 +142,165 @@ data: rpms: aopalliance: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of google-guice, maven. apache-commons-cli: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven. apache-commons-codec: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of httpcomponents-client, maven. apache-commons-io: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven, maven-shared-utils, maven-wagon. apache-commons-lang3: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven. apache-commons-logging: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of httpcomponents-client, maven. atinject: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of cdi-api, google-guice, maven. cdi-api: buildorder: 20 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven, sisu. geronimo-annotation: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven. glassfish-el: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of cdi-api. google-guice: buildorder: 30 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven. guava: buildorder: 20 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of google-guice, maven. hawtjni: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of jansi, jansi-native, maven. httpcomponents-client: buildorder: 20 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven, maven-wagon. httpcomponents-core: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of httpcomponents-client, maven, maven-wagon. jansi: buildorder: 30 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven. jansi-native: buildorder: 20 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of jansi, maven. jboss-interceptors-1.2-api: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of cdi-api. jsoup: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven-wagon. jsr-305: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of guava. maven: buildorder: 50 - ref: javapackages + ref: stream-maven-3.6 rationale: > Module API. maven-resolver: buildorder: 40 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven. maven-shared-utils: buildorder: 20 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven. maven-wagon: buildorder: 30 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven, maven-resolver. plexus-cipher: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven, plexus-sec-dispatcher. plexus-classworlds: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven, sisu. plexus-containers: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven, sisu. plexus-interpolation: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven. plexus-sec-dispatcher: buildorder: 20 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven. plexus-utils: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven, maven-wagon, plexus-sec-dispatcher, sisu. sisu: buildorder: 30 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven. slf4j: buildorder: 10 - ref: javapackages + ref: stream-maven-3.6 rationale: > Runtime dependency of maven, maven-resolver, maven-wagon. From 2c6c1178825f7cf95699ae4ca11312e7055ef3e1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 May 2019 10:46:34 +0200 Subject: [PATCH 12/38] Disable tests in httpcomponents-core From c537ebbf50b82efb1de259843adfcbf1dec516b8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 May 2019 12:54:30 +0200 Subject: [PATCH 13/38] Disable tests in httpcomponents-client From 98a441b4e021615ac389e3044bff2b2ac371f2d2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 29 May 2019 08:50:57 +0200 Subject: [PATCH 14/38] Build against javapackages-tools:201901 --- koschei.cfg | 2 +- maven.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koschei.cfg b/koschei.cfg index 9260eec..70d4046 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -37,7 +37,7 @@ config = { "stream_override": { "javapackages-tools": { "3.5": "[201801]", - "3.6": "[201801]", + "3.6": "[201901]", "master": "[201801]", }, "platform": { diff --git a/maven.yaml b/maven.yaml index 4693e33..a5fba34 100644 --- a/maven.yaml +++ b/maven.yaml @@ -13,7 +13,7 @@ data: - MIT dependencies: - buildrequires: - javapackages-tools: [201801] + javapackages-tools: [201901] platform: [f28] requires: platform: [] From 09f83d95cc3cca67f85c2758881aaf3adff99153 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 29 May 2019 13:49:18 +0200 Subject: [PATCH 15/38] New CG build From f5d7bfb10d76d81b31c1f867c26cc92718f4697f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 30 May 2019 12:14:23 +0200 Subject: [PATCH 16/38] Backport Maven patch for Tycho P2 integration From 168daf97f3f849d4cdc3fd892b859af3f07aa14f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 30 May 2019 12:14:47 +0200 Subject: [PATCH 17/38] New CG build From 4bace1caf6b3826405c25ad242f846871b943fd5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 16:34:04 +0200 Subject: [PATCH 18/38] Drop apache-commons-logging, glassfish-el, jboss-interceptors-1.2-api --- koschei.cfg | 8 ++++---- maven.yaml | 54 +++++++++++------------------------------------------ 2 files changed, 15 insertions(+), 47 deletions(-) diff --git a/koschei.cfg b/koschei.cfg index 70d4046..65d7ae3 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -18,10 +18,10 @@ config = { "topo_sort": True, "api": [ - "maven", + "maven-3.6-maven", ], "profiles": { - "default": ["maven"], + "default": ["maven-3.6-maven"], }, "filter": [ ], @@ -38,7 +38,7 @@ config = { "javapackages-tools": { "3.5": "[201801]", "3.6": "[201901]", - "master": "[201801]", + "master": "[201901]", }, "platform": { "3.5": "[]", @@ -102,7 +102,7 @@ config = { "server": "https://koji.kjnet.xyz/kojihub", "topurl": "https://koji.kjnet.xyz/kojifiles", "multicall_chunk_size": 1000, - "tag_name": "jp-build", + "tag_name": "m36-hybrid", }, "dependency": { "repo_arch": "x86_64", diff --git a/maven.yaml b/maven.yaml index a5fba34..2534716 100644 --- a/maven.yaml +++ b/maven.yaml @@ -20,10 +20,10 @@ data: profiles: default: rpms: - - maven + - maven-3.6-maven api: rpms: - - maven + - maven-3.6-maven filter: rpms: - aopalliance-javadoc @@ -31,13 +31,10 @@ data: - apache-commons-codec-javadoc - apache-commons-io-javadoc - apache-commons-lang3-javadoc - - apache-commons-logging-javadoc - atinject-javadoc - atinject-tck - cdi-api-javadoc - geronimo-annotation-javadoc - - glassfish-el - - glassfish-el-javadoc - google-guice-javadoc - guava-javadoc - guava-testlib @@ -53,34 +50,22 @@ data: - guice-throwingproviders - hawtjni - hawtjni-javadoc - - httpcomponents-client-cache - httpcomponents-client-javadoc - httpcomponents-core-javadoc - jansi-javadoc - jansi-native-javadoc - - jboss-interceptors-1.2-api-javadoc - jsoup-javadoc - jsr-305-javadoc - jul-to-slf4j - log4j-over-slf4j - maven-hawtjni-plugin - maven-javadoc - - maven-resolver - maven-resolver-javadoc - - maven-resolver-test-util - - maven-resolver-transport-classpath - - maven-resolver-transport-file - - maven-resolver-transport-http - maven-shared-utils-javadoc - - maven-wagon - - maven-wagon-ftp - - maven-wagon-http-lightweight - maven-wagon-javadoc - - maven-wagon-providers - plexus-cipher-javadoc - plexus-classworlds-javadoc - plexus-containers - - plexus-containers-component-javadoc - plexus-containers-component-metadata - plexus-containers-container-default - plexus-containers-javadoc @@ -88,7 +73,6 @@ data: - plexus-sec-dispatcher-javadoc - plexus-utils-javadoc - sisu-javadoc - - slf4j-ext - slf4j-javadoc - slf4j-jcl - slf4j-jdk14 @@ -144,7 +128,7 @@ data: buildorder: 10 ref: stream-maven-3.6 rationale: > - Runtime dependency of google-guice, maven. + Runtime dependency of google-guice. apache-commons-cli: buildorder: 10 ref: stream-maven-3.6 @@ -154,23 +138,17 @@ data: buildorder: 10 ref: stream-maven-3.6 rationale: > - Runtime dependency of httpcomponents-client, maven. + Runtime dependency of httpcomponents-client. apache-commons-io: buildorder: 10 ref: stream-maven-3.6 rationale: > - Runtime dependency of maven, maven-shared-utils, - maven-wagon. + Runtime dependency of maven-shared-utils, maven-wagon. apache-commons-lang3: buildorder: 10 ref: stream-maven-3.6 rationale: > Runtime dependency of maven. - apache-commons-logging: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of httpcomponents-client, maven. atinject: buildorder: 10 ref: stream-maven-3.6 @@ -180,17 +158,12 @@ data: buildorder: 20 ref: stream-maven-3.6 rationale: > - Runtime dependency of maven, sisu. + Runtime dependency of sisu. geronimo-annotation: buildorder: 10 ref: stream-maven-3.6 rationale: > Runtime dependency of maven. - glassfish-el: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of cdi-api. google-guice: buildorder: 30 ref: stream-maven-3.6 @@ -200,22 +173,22 @@ data: buildorder: 20 ref: stream-maven-3.6 rationale: > - Runtime dependency of google-guice, maven. + Runtime dependency of google-guice. hawtjni: buildorder: 10 ref: stream-maven-3.6 rationale: > - Runtime dependency of jansi, jansi-native, maven. + Runtime dependency of jansi, jansi-native. httpcomponents-client: buildorder: 20 ref: stream-maven-3.6 rationale: > - Runtime dependency of maven, maven-wagon. + Runtime dependency of maven-wagon. httpcomponents-core: buildorder: 10 ref: stream-maven-3.6 rationale: > - Runtime dependency of httpcomponents-client, maven, + Runtime dependency of httpcomponents-client, maven-wagon. jansi: buildorder: 30 @@ -226,12 +199,7 @@ data: buildorder: 20 ref: stream-maven-3.6 rationale: > - Runtime dependency of jansi, maven. - jboss-interceptors-1.2-api: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of cdi-api. + Runtime dependency of jansi. jsoup: buildorder: 10 ref: stream-maven-3.6 From d497d3a2f0e29b5b22065483f1b49c6dcdf9e3f9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Jul 2019 08:12:11 +0200 Subject: [PATCH 19/38] Define new module build macros --- koschei.cfg | 46 ++++++---------------------------------------- maven.yaml | 49 +++++++++---------------------------------------- 2 files changed, 15 insertions(+), 80 deletions(-) diff --git a/koschei.cfg b/koschei.cfg index 65d7ae3..e69deb3 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -48,46 +48,12 @@ 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_dom4j": 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_snakeyaml": 1, - "_without_snappy": 1, - "_without_spring": 1, - "_without_ssh": 1, - "_without_testlib": 1, - "_without_vfs": 1, + "module_prefix": "%{_module_name}-%{_module_stream}-", + "module_package": "%package -n %{module_prefix}%{name} \\\n Summary: %{summary} \\\n %description -n %{module_prefix}%{name} \\\n %{summary}.", + "xmvn_install_repo": "install-%{_module_name}-%{_module_stream}", + "mvn_file": "echo Ignoring mvn_file", + "maven_alternatives_priority": "30600", + "maven_version_suffix": "-%{_module_stream}", }, "summary": "Java project management and project comprehension tool", diff --git a/maven.yaml b/maven.yaml index 2534716..c38b91c 100644 --- a/maven.yaml +++ b/maven.yaml @@ -82,46 +82,15 @@ 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_dom4j 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_snakeyaml 1 - %_without_snappy 1 - %_without_spring 1 - %_without_ssh 1 - %_without_testlib 1 - %_without_vfs 1 + %module_prefix %{_module_name}-%{_module_stream}- + %module_package %package -n %{module_prefix}%{name} \ + Summary: %{summary} \ + %description -n %{module_prefix}%{name} \ + %{summary}. + %xmvn_install_repo install-%{_module_name}-%{_module_stream} + %mvn_file echo Ignoring mvn_file + %maven_alternatives_priority 30600 + %maven_version_suffix -%{_module_stream} components: rpms: aopalliance: From 158511b1daa1d284e2877df7d383ac4e2fb7adcb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Jul 2019 08:43:28 +0200 Subject: [PATCH 20/38] Build against platform:f29 --- maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven.yaml b/maven.yaml index c38b91c..4d905e6 100644 --- a/maven.yaml +++ b/maven.yaml @@ -14,7 +14,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201901] - platform: [f28] + platform: [f29] requires: platform: [] profiles: From e54a1b4f8e8f15917b41f7a5e628edf1eb6996e7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Jul 2019 09:14:54 +0200 Subject: [PATCH 21/38] Try to define buildroot profile --- koschei.cfg | 1 + maven.yaml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/koschei.cfg b/koschei.cfg index e69deb3..38a7c9d 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -22,6 +22,7 @@ config = { ], "profiles": { "default": ["maven-3.6-maven"], + "buildroot": ["javapackages-config-maven-3.6"], }, "filter": [ ], diff --git a/maven.yaml b/maven.yaml index 4d905e6..0eb54a0 100644 --- a/maven.yaml +++ b/maven.yaml @@ -21,6 +21,9 @@ data: default: rpms: - maven-3.6-maven + buildroot: + rpms: + - javapackages-config-maven-3.6 api: rpms: - maven-3.6-maven From 8aec8970939771c3b80a6b72f833c232141ac385 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Jul 2019 09:21:07 +0200 Subject: [PATCH 22/38] Revert "Try to define buildroot profile" This reverts commit e54a1b4f8e8f15917b41f7a5e628edf1eb6996e7. --- koschei.cfg | 1 - maven.yaml | 3 --- 2 files changed, 4 deletions(-) diff --git a/koschei.cfg b/koschei.cfg index 38a7c9d..e69deb3 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -22,7 +22,6 @@ config = { ], "profiles": { "default": ["maven-3.6-maven"], - "buildroot": ["javapackages-config-maven-3.6"], }, "filter": [ ], diff --git a/maven.yaml b/maven.yaml index 0eb54a0..4d905e6 100644 --- a/maven.yaml +++ b/maven.yaml @@ -21,9 +21,6 @@ data: default: rpms: - maven-3.6-maven - buildroot: - rpms: - - javapackages-config-maven-3.6 api: rpms: - maven-3.6-maven From 83c78e238f8399e7ccec69ad05d6ba81cefb611b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Jul 2019 09:52:33 +0200 Subject: [PATCH 23/38] Set repo_include_all=True --- maven.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maven.yaml b/maven.yaml index 4d905e6..7222d16 100644 --- a/maven.yaml +++ b/maven.yaml @@ -11,6 +11,9 @@ data: license: module: - MIT + xmd: + mbs_options: + repo_include_all: True dependencies: - buildrequires: javapackages-tools: [201901] From bd2401af341ceacf00720c0aa358c64a92464fde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 13 Aug 2019 19:57:09 +0000 Subject: [PATCH 24/38] Branching f31 from rawhide Signed-off-by: Fedora Release Engineering From 29f9c4ff3ee7da5be0c0fce74a16912136f64ed8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 26 Aug 2019 14:00:59 +0000 Subject: [PATCH 25/38] Branching f31 from rawhide, second attempt after platform:f32 enablement Signed-off-by: Fedora Release Engineering From 5ab1e298e93250dbae854568370e5abc59fe90f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 4 Sep 2019 19:17:40 +0000 Subject: [PATCH 26/38] Branching f31 from rawhide, second attempt after platform:f31 enablement Signed-off-by: Fedora Release Engineering From 44d53ae40e0c73cef96bc03278c7e7b1a468a357 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Sep 2019 08:08:20 +0000 Subject: [PATCH 27/38] 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 ba14ea1544cf511bfeb5b02a39699dd2e24acbcc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 30 Oct 2019 19:15:42 +0100 Subject: [PATCH 28/38] Switch to platform:f31 --- maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven.yaml b/maven.yaml index 7222d16..a0a602d 100644 --- a/maven.yaml +++ b/maven.yaml @@ -17,7 +17,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201901] - platform: [f29] + platform: [f31] requires: platform: [] profiles: From 7199be188f23159bb068cbbaacbf3d3da4a44d41 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 30 Oct 2019 20:24:36 +0100 Subject: [PATCH 29/38] Remove buggy obsoletes from plexus-containers From 8a64595bca8fa90905ad09ad9a18ecd71ef59cc1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 2 Dec 2020 10:57:06 +0100 Subject: [PATCH 30/38] Remove koschei.cfg --- koschei.cfg | 97 ----------------------------------------------------- 1 file changed, 97 deletions(-) delete mode 100644 koschei.cfg diff --git a/koschei.cfg b/koschei.cfg deleted file mode 100644 index e69deb3..0000000 --- a/koschei.cfg +++ /dev/null @@ -1,97 +0,0 @@ -# -*- python -*- -# vim: ft=python -config = { - "buildrequires": [ - "javapackages-tools", - "platform", - ], - "requires": [ - "platform", - ], - - "bootstrap": False, - "full_refs": False, - "default_ref": "stream-maven-3.6", - "include_build_deps": False, - "closure": False, - "filter_unused": True, - "topo_sort": True, - - "api": [ - "maven-3.6-maven", - ], - "profiles": { - "default": ["maven-3.6-maven"], - }, - "filter": [ - ], - "includes": [ - ], - "excludes": [ - "javapackages-tools", - "java-1.7.0-openjdk", - "java-1.8.0-openjdk", - ], - "frozen_refs": [ - ], - "stream_override": { - "javapackages-tools": { - "3.5": "[201801]", - "3.6": "[201901]", - "master": "[201901]", - }, - "platform": { - "3.5": "[]", - "3.6": "[]", - "master": "[]", - }, - }, - - "macros": { - "module_prefix": "%{_module_name}-%{_module_stream}-", - "module_package": "%package -n %{module_prefix}%{name} \\\n Summary: %{summary} \\\n %description -n %{module_prefix}%{name} \\\n %{summary}.", - "xmvn_install_repo": "install-%{_module_name}-%{_module_stream}", - "mvn_file": "echo Ignoring mvn_file", - "maven_alternatives_priority": "30600", - "maven_version_suffix": "-%{_module_stream}", - }, - - "summary": "Java project management and project comprehension tool", - "description": """\ - Maven is a software project management and comprehension tool. - Based on the concept of a project object model (POM), Maven - can manage a project's build, reporting and documentation from - a central piece of information. - """, - - "koji_config": { - "server": "https://koji.kjnet.xyz/kojihub", - "topurl": "https://koji.kjnet.xyz/kojifiles", - "multicall_chunk_size": 1000, - "tag_name": "m36-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 4b609073bdac73930d41e6c4e087b04aeb5bf4ec Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 2 Dec 2020 10:59:42 +0100 Subject: [PATCH 31/38] Non-namespaced build against javapackages-tools 202001 --- maven.yaml | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/maven.yaml b/maven.yaml index a0a602d..bb2375c 100644 --- a/maven.yaml +++ b/maven.yaml @@ -11,22 +11,19 @@ data: license: module: - MIT - xmd: - mbs_options: - repo_include_all: True dependencies: - buildrequires: - javapackages-tools: [201901] - platform: [f31] + javapackages-tools: [202001] + platform: [f32] requires: platform: [] profiles: default: rpms: - - maven-3.6-maven + - maven api: rpms: - - maven-3.6-maven + - maven filter: rpms: - aopalliance-javadoc @@ -82,18 +79,6 @@ data: - slf4j-log4j12 - slf4j-manual - slf4j-sources - buildopts: - rpms: - macros: | - %module_prefix %{_module_name}-%{_module_stream}- - %module_package %package -n %{module_prefix}%{name} \ - Summary: %{summary} \ - %description -n %{module_prefix}%{name} \ - %{summary}. - %xmvn_install_repo install-%{_module_name}-%{_module_stream} - %mvn_file echo Ignoring mvn_file - %maven_alternatives_priority 30600 - %maven_version_suffix -%{_module_stream} components: rpms: aopalliance: From 9b208415acdaba47df9ceee44b830faed4be021a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 2 Dec 2020 12:09:11 +0100 Subject: [PATCH 32/38] Sync component list --- maven.yaml | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/maven.yaml b/maven.yaml index bb2375c..76ea0aa 100644 --- a/maven.yaml +++ b/maven.yaml @@ -26,15 +26,12 @@ data: - maven filter: rpms: - - aopalliance-javadoc - apache-commons-cli-javadoc - apache-commons-codec-javadoc - apache-commons-io-javadoc - apache-commons-lang3-javadoc - atinject-javadoc - - atinject-tck - cdi-api-javadoc - - geronimo-annotation-javadoc - google-guice-javadoc - guava-javadoc - guava-testlib @@ -48,17 +45,13 @@ data: - guice-parent - guice-servlet - guice-throwingproviders - - hawtjni - - hawtjni-javadoc - httpcomponents-client-javadoc - httpcomponents-core-javadoc + - jakarta-annotations-javadoc - jansi-javadoc - - jansi-native-javadoc - jsoup-javadoc - jsr-305-javadoc - jul-to-slf4j - - log4j-over-slf4j - - maven-hawtjni-plugin - maven-javadoc - maven-resolver-javadoc - maven-shared-utils-javadoc @@ -76,16 +69,10 @@ data: - slf4j-javadoc - slf4j-jcl - slf4j-jdk14 - - slf4j-log4j12 - slf4j-manual - slf4j-sources components: rpms: - aopalliance: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of google-guice. apache-commons-cli: buildorder: 10 ref: stream-maven-3.6 @@ -116,11 +103,6 @@ data: ref: stream-maven-3.6 rationale: > Runtime dependency of sisu. - geronimo-annotation: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven. google-guice: buildorder: 30 ref: stream-maven-3.6 @@ -131,11 +113,6 @@ data: ref: stream-maven-3.6 rationale: > Runtime dependency of google-guice. - hawtjni: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of jansi, jansi-native. httpcomponents-client: buildorder: 20 ref: stream-maven-3.6 @@ -147,16 +124,16 @@ data: rationale: > Runtime dependency of httpcomponents-client, maven-wagon. + jakarta-annotations: + buildorder: 10 + #ref: stream-maven-3.6 + rationale: > + Runtime dependency of maven. jansi: buildorder: 30 ref: stream-maven-3.6 rationale: > Runtime dependency of maven. - jansi-native: - buildorder: 20 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of jansi. jsoup: buildorder: 10 ref: stream-maven-3.6 From 51e53975de562aca2af05a467f05622c869d7d65 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 2 Dec 2020 16:10:10 +0100 Subject: [PATCH 33/38] Rebuild for all platforms --- maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven.yaml b/maven.yaml index 76ea0aa..b3b5945 100644 --- a/maven.yaml +++ b/maven.yaml @@ -14,7 +14,7 @@ data: dependencies: - buildrequires: javapackages-tools: [202001] - platform: [f32] + platform: [] requires: platform: [] profiles: From 17185c857ab2f413cd8ef780503f369e2f0eaf7b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 2 Dec 2020 16:13:24 +0100 Subject: [PATCH 34/38] Switch to arbitrary branch for jakarta-annotations --- maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven.yaml b/maven.yaml index b3b5945..8a86f4e 100644 --- a/maven.yaml +++ b/maven.yaml @@ -126,7 +126,7 @@ data: maven-wagon. jakarta-annotations: buildorder: 10 - #ref: stream-maven-3.6 + ref: stream-maven-3.6 rationale: > Runtime dependency of maven. jansi: From 514f7ddc194b10fbabea246e7bc59f76d07a2bcb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 3 Dec 2020 09:42:21 +0100 Subject: [PATCH 35/38] Don't build on el8 platform --- maven.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven.yaml b/maven.yaml index 8a86f4e..d7770f4 100644 --- a/maven.yaml +++ b/maven.yaml @@ -14,9 +14,9 @@ data: dependencies: - buildrequires: javapackages-tools: [202001] - platform: [] + platform: [-el8] requires: - platform: [] + platform: [-el8] profiles: default: rpms: From 47587d5a1f172c58bbcdaf146c111e069b419762 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 3 Feb 2021 12:27:17 +0000 Subject: [PATCH 36/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 4087c55e93dc5fe1cb62bcd87b53023d922c7d96 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 26 Mar 2021 08:23:28 -0400 Subject: [PATCH 37/38] Bump to rebuild Signed-off-by: Stephen Gallagher From a367a0e3f4e0019eb06e8bf437008b6cd5f7bfc6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 7 Jan 2022 09:37:12 +0100 Subject: [PATCH 38/38] Maven is shipped as non-modular package --- README.md | 3 - dead.module | 1 + maven.yaml | 208 ---------------------------------------------------- 3 files changed, 1 insertion(+), 211 deletions(-) delete mode 100644 README.md create mode 100644 dead.module delete mode 100644 maven.yaml diff --git a/README.md b/README.md deleted file mode 100644 index e99db58..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# maven - -Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information. \ No newline at end of file diff --git a/dead.module b/dead.module new file mode 100644 index 0000000..460e2f5 --- /dev/null +++ b/dead.module @@ -0,0 +1 @@ +Maven is shipped as non-modular package diff --git a/maven.yaml b/maven.yaml deleted file mode 100644 index d7770f4..0000000 --- a/maven.yaml +++ /dev/null @@ -1,208 +0,0 @@ ---- -document: modulemd -version: 2 -data: - summary: Java project management and project comprehension tool - description: >- - Maven is a software project management and comprehension tool. - Based on the concept of a project object model (POM), Maven - can manage a project's build, reporting and documentation from - a central piece of information. - license: - module: - - MIT - dependencies: - - buildrequires: - javapackages-tools: [202001] - platform: [-el8] - requires: - platform: [-el8] - profiles: - default: - rpms: - - maven - api: - rpms: - - maven - filter: - rpms: - - apache-commons-cli-javadoc - - apache-commons-codec-javadoc - - apache-commons-io-javadoc - - apache-commons-lang3-javadoc - - atinject-javadoc - - cdi-api-javadoc - - google-guice-javadoc - - guava-javadoc - - guava-testlib - - guice-assistedinject - - guice-bom - - guice-extensions - - guice-grapher - - guice-jmx - - guice-jndi - - guice-multibindings - - guice-parent - - guice-servlet - - guice-throwingproviders - - httpcomponents-client-javadoc - - httpcomponents-core-javadoc - - jakarta-annotations-javadoc - - jansi-javadoc - - jsoup-javadoc - - jsr-305-javadoc - - jul-to-slf4j - - maven-javadoc - - maven-resolver-javadoc - - maven-shared-utils-javadoc - - maven-wagon-javadoc - - plexus-cipher-javadoc - - plexus-classworlds-javadoc - - plexus-containers - - plexus-containers-component-metadata - - plexus-containers-container-default - - plexus-containers-javadoc - - plexus-interpolation-javadoc - - plexus-sec-dispatcher-javadoc - - plexus-utils-javadoc - - sisu-javadoc - - slf4j-javadoc - - slf4j-jcl - - slf4j-jdk14 - - slf4j-manual - - slf4j-sources - components: - rpms: - apache-commons-cli: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven. - apache-commons-codec: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of httpcomponents-client. - apache-commons-io: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven-shared-utils, maven-wagon. - apache-commons-lang3: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven. - atinject: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of cdi-api, google-guice, maven. - cdi-api: - buildorder: 20 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of sisu. - google-guice: - buildorder: 30 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven. - guava: - buildorder: 20 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of google-guice. - httpcomponents-client: - buildorder: 20 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven-wagon. - httpcomponents-core: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of httpcomponents-client, - maven-wagon. - jakarta-annotations: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven. - jansi: - buildorder: 30 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven. - jsoup: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven-wagon. - jsr-305: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of guava. - maven: - buildorder: 50 - ref: stream-maven-3.6 - rationale: > - Module API. - maven-resolver: - buildorder: 40 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven. - maven-shared-utils: - buildorder: 20 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven. - maven-wagon: - buildorder: 30 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven, maven-resolver. - plexus-cipher: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven, plexus-sec-dispatcher. - plexus-classworlds: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven, sisu. - plexus-containers: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven, sisu. - plexus-interpolation: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven. - plexus-sec-dispatcher: - buildorder: 20 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven. - plexus-utils: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven, maven-wagon, - plexus-sec-dispatcher, sisu. - sisu: - buildorder: 30 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven. - slf4j: - buildorder: 10 - ref: stream-maven-3.6 - rationale: > - Runtime dependency of maven, maven-resolver, - maven-wagon.