From eeb2e5a475bcf014c4f8f4f3faffbc1c07528a31 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 10 Apr 2018 21:03:10 +0200 Subject: [PATCH 01/20] 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/20] 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/20] 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/20] 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/20] 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/20] 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/20] 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 81c4875b9995943c2f3de67207247d765f614fc4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 16 Apr 2019 04:02:16 +0200 Subject: [PATCH 08/20] Update Koji config in koschei.cfg --- koschei.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koschei.cfg b/koschei.cfg index 92930f2..d3b2d5b 100644 --- a/koschei.cfg +++ b/koschei.cfg @@ -97,7 +97,7 @@ config = { "server": "https://koji.kjnet.xyz/kojihub", "topurl": "https://koji.kjnet.xyz/kojifiles", "multicall_chunk_size": 1000, - "tag_name": "hybrid", + "tag_name": "jp-201801", }, "dependency": { "repo_arch": "x86_64", From 3da5a9c52a988c79dc379c7452e69fa01aaeea85 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 16 Apr 2019 04:03:32 +0200 Subject: [PATCH 09/20] Include additional components Adds the following components to the module: - httpcomponents-client-cache - maven-resolver-transport-file - maven-resolver-transport-http Resolves rhbz#1698504 --- maven.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/maven.yaml b/maven.yaml index 2f782a1..169ec11 100644 --- a/maven.yaml +++ b/maven.yaml @@ -54,7 +54,6 @@ data: - guice-throwingproviders - hawtjni - hawtjni-javadoc - - httpcomponents-client-cache - httpcomponents-client-javadoc - httpcomponents-core-javadoc - jansi-javadoc @@ -69,8 +68,6 @@ data: - 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 @@ -210,13 +207,14 @@ data: buildorder: 20 ref: javapackages rationale: > - Runtime dependency of maven, maven-wagon. + Runtime dependency of maven, maven-resolver, + maven-wagon. httpcomponents-core: buildorder: 10 ref: javapackages rationale: > Runtime dependency of httpcomponents-client, maven, - maven-wagon. + maven-resolver, maven-wagon. jansi: buildorder: 30 ref: javapackages @@ -297,4 +295,5 @@ data: buildorder: 10 ref: javapackages rationale: > - Runtime dependency of maven, maven-wagon. + Runtime dependency of maven, maven-resolver, + maven-wagon. From 3067797addc5dc6a55facc4fae15c85741596ce4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 16 Apr 2019 23:16:30 +0200 Subject: [PATCH 10/20] New CG build From b0f40bdc81da35de37652954ea7692a02fbf4223 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 16 Apr 2019 23:18:33 +0200 Subject: [PATCH 11/20] New CG build From 5fec27ad4bdfb65bfcd8589e754147d7d8abc7c4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 9 Oct 2019 08:56:35 +0200 Subject: [PATCH 12/20] Drop glassfish-el, resolves rhbz#1759179 --- maven.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/maven.yaml b/maven.yaml index 169ec11..53ae3ca 100644 --- a/maven.yaml +++ b/maven.yaml @@ -36,8 +36,6 @@ data: - atinject-tck - cdi-api-javadoc - geronimo-annotation-javadoc - - glassfish-el - - glassfish-el-javadoc - google-guice-javadoc - guava20-javadoc - guava20-testlib @@ -183,11 +181,6 @@ data: ref: javapackages rationale: > Runtime dependency of maven. - glassfish-el: - buildorder: 10 - ref: javapackages - rationale: > - Runtime dependency of cdi-api. google-guice: buildorder: 20 ref: javapackages From e6b4f10ac1f91f5c21e29d3f3579494c3035f57e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 15 Oct 2019 13:34:25 +0200 Subject: [PATCH 13/20] Switch to platform:f29 --- maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven.yaml b/maven.yaml index 53ae3ca..4db338a 100644 --- a/maven.yaml +++ b/maven.yaml @@ -14,7 +14,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] - platform: [f28] + platform: [f29] requires: platform: [] profiles: From 5616423c025f020b262bcfcadcdae566ceaeb963 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 30 Oct 2019 09:06:39 +0100 Subject: [PATCH 14/20] Drop jboss-interceptors-1.2-api --- maven.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maven.yaml b/maven.yaml index 4db338a..f066f2c 100644 --- a/maven.yaml +++ b/maven.yaml @@ -56,7 +56,6 @@ data: - httpcomponents-core-javadoc - jansi-javadoc - jansi-native-javadoc - - jboss-interceptors-1.2-api-javadoc - jsoup-javadoc - jul-to-slf4j - log4j-over-slf4j @@ -218,11 +217,6 @@ data: ref: javapackages rationale: > Runtime dependency of jansi, maven. - jboss-interceptors-1.2-api: - buildorder: 10 - ref: javapackages - rationale: > - Runtime dependency of cdi-api. jsoup: buildorder: 10 ref: javapackages From 9c01ca02a1f9c9c3591411279d060a01a8fa8ce4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 30 Oct 2019 10:42:29 +0100 Subject: [PATCH 15/20] New CG build for Fedora 29 From a86632fa4047f39ffaaaa6d69d2b1b12cb4cbc94 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 30 Oct 2019 10:42:30 +0100 Subject: [PATCH 16/20] New CG build for Fedora 30 From d794e8573d900226e648eddd4b8988d574207d62 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 30 Oct 2019 10:42:31 +0100 Subject: [PATCH 17/20] New CG build for Fedora 31+ From bb5b4516271f611fb92e64c2b1f32d8991823ef6 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 7 Apr 2020 15:30:13 -0400 Subject: [PATCH 18/20] Re-add glassfish-el without filtering it Resolves: rhbz#1759179 This reverts commit 5fec27ad4bdfb65bfcd8589e754147d7d8abc7c4. Signed-off-by: Stephen Gallagher --- maven.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maven.yaml b/maven.yaml index f066f2c..9b027e7 100644 --- a/maven.yaml +++ b/maven.yaml @@ -180,6 +180,11 @@ data: ref: javapackages rationale: > Runtime dependency of maven. + glassfish-el: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of cdi-api. google-guice: buildorder: 20 ref: javapackages From ed792d2514d476e4989c2d8eab34edce279b0d15 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 7 Apr 2020 15:36:26 -0400 Subject: [PATCH 19/20] Bump the build platform to F30 Signed-off-by: Stephen Gallagher --- maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven.yaml b/maven.yaml index 9b027e7..592f853 100644 --- a/maven.yaml +++ b/maven.yaml @@ -14,7 +14,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] - platform: [f29] + platform: [f30] requires: platform: [] profiles: From 86d4e61a7c1d157a42229f898de3598816710a29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Aug 2020 16:39:57 +0000 Subject: [PATCH 20/20] Branching f33 from rawhide Signed-off-by: Fedora Release Engineering