From b5f91fb41ae9976904f400d732ed7eb7ba36e1d1 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 9 Nov 2017 11:31:59 +0100 Subject: [PATCH 1/6] 10.4 branch with f27 dependencies --- pki.yaml | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 pki.yaml diff --git a/pki.yaml b/pki.yaml new file mode 100644 index 0000000..260e5f5 --- /dev/null +++ b/pki.yaml @@ -0,0 +1,85 @@ +document: modulemd +version: 1 +data: + summary: pki module + description: This pki module has been generated. + license: + module: + - MIT + dependencies: + buildrequires: + bootstrap: f27 + requires: + platform: f27 + java: 8 + tomcat: master + resteasy: 3.0 + apache-commons: f27 + python2-ecosystem: master + maven: master + networking-base: f27 + references: + community: https://docs.pagure.org/modularity/ + documentation: https://github.com/modularity-modules/pki + tracker: https://github.com/modularity-modules/pki + api: + rpms: + - pki-base + - pki-base-java + - pki-ca + - pki-kra + - pki-server + - pki-tools + - python2-ldap + - python3-nss + - python3-pluggy + - python3-pyldap + - python3-tox + - svrcore + - svrcore-devel + profiles: + default: + description: A generated profile based on top-lvl package list. + rpms: + - pki-base + - pki-base-java + - pki-ca + - pki-kra + - pki-server + - pki-tools + - python2-ldap + - python3-nss + - python3-pluggy + - python3-pyldap + - python3-tox + - svrcore + - svrcore-devel + components: + rpms: + python-nss: + rationale: Generated. + ref: f27 + buildorder: -5 + python-pyldap: + rationale: Generated. + ref: master + buildorder: -5 + nuxwdog: + rationale: Generated. + ref: f27 + buildorder: -3 + python-ldap: + rationale: Generated. + ref: f27 + buildorder: -3 + jss: + rationale: Generated. + ref: f27 + buildorder: -3 + ldapjdk: + rationale: Generated.. + ref: f27 + buildorder: -3 + pki-core: + rationale: Generated. + ref: f27 From 8e40f34b31cda257e99dbe2930d9164c02169eab Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 16 Nov 2017 00:13:42 +0100 Subject: [PATCH 2/6] build with resteasy 3.0 stream --- pki.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pki.yaml b/pki.yaml index 260e5f5..8b60b82 100644 --- a/pki.yaml +++ b/pki.yaml @@ -16,6 +16,8 @@ data: resteasy: 3.0 apache-commons: f27 python2-ecosystem: master + # This really needs to change to maven: f27 as this + # will pull in platform:master maven: master networking-base: f27 references: From 353fa2ddbce12b95c7a3c1a4a142b3f5f91662e0 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 16 Nov 2017 00:38:23 +0100 Subject: [PATCH 3/6] add python-tox --- pki.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pki.yaml b/pki.yaml index 8b60b82..da853c1 100644 --- a/pki.yaml +++ b/pki.yaml @@ -36,7 +36,6 @@ data: - python3-nss - python3-pluggy - python3-pyldap - - python3-tox - svrcore - svrcore-devel profiles: @@ -53,15 +52,22 @@ data: - python3-nss - python3-pluggy - python3-pyldap - - python3-tox - svrcore - svrcore-devel + filter: + rpms: + - python3-tox + - python2-tox components: rpms: python-nss: rationale: Generated. ref: f27 buildorder: -5 + python-tox: + rationale: Generated. + ref: master + buildorder: -10 python-pyldap: rationale: Generated. ref: master From e01d8355e055f321b8879cf5ae8bf9bfdb050829 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 16 Nov 2017 14:42:25 +0100 Subject: [PATCH 4/6] add python-pluggy --- pki.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pki.yaml b/pki.yaml index da853c1..f8bb515 100644 --- a/pki.yaml +++ b/pki.yaml @@ -56,14 +56,20 @@ data: - svrcore-devel filter: rpms: - - python3-tox + - python-pluggy + - python3-pluggy - python2-tox + - python3-tox components: rpms: python-nss: rationale: Generated. ref: f27 buildorder: -5 + python-pluggy: + rationale: Generated. + ref: master + buildorder: -10 python-tox: rationale: Generated. ref: master From d71fd6e425c16a114276518a41d1ac8604628f43 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 16 Nov 2017 16:17:08 +0100 Subject: [PATCH 5/6] add tomcatjss --- pki.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pki.yaml b/pki.yaml index f8bb515..5b64ae8 100644 --- a/pki.yaml +++ b/pki.yaml @@ -60,6 +60,7 @@ data: - python3-pluggy - python2-tox - python3-tox + - tomcatjss components: rpms: python-nss: @@ -94,6 +95,10 @@ data: rationale: Generated.. ref: f27 buildorder: -3 + tomcatjss: + rationale: Generated.. + ref: f27 + buildorder: -3 pki-core: rationale: Generated. ref: f27 From 59d8cea3496c1ade84aa470b59de527a329a790b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 21 Nov 2017 16:45:26 +0100 Subject: [PATCH 6/6] Port to platform:f27 All used modules must depend on platform:f27. --- pki.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pki.yaml b/pki.yaml index 5b64ae8..a81167a 100644 --- a/pki.yaml +++ b/pki.yaml @@ -12,13 +12,11 @@ data: requires: platform: f27 java: 8 - tomcat: master + tomcat: 8.0 resteasy: 3.0 apache-commons: f27 - python2-ecosystem: master - # This really needs to change to maven: f27 as this - # will pull in platform:master - maven: master + python2-ecosystem: f27 + maven: f27 networking-base: f27 references: community: https://docs.pagure.org/modularity/