From f67240ada2b7d310ea1d0d37de2186c274a976b9 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 8 Aug 2019 16:03:08 -0400 Subject: [PATCH 01/11] Minor tweaks to the modulemd definition --- tomcat.yaml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/tomcat.yaml b/tomcat.yaml index 8d80475..871edde 100644 --- a/tomcat.yaml +++ b/tomcat.yaml @@ -22,30 +22,22 @@ data: - tomcat - tomcat-el-3.0-api - tomcat-jsp-2.3-api - - tomcatjss - tomcat-lib - - tomcat-servlet-3.1-api + - tomcat-servlet-4.0-api profiles: default: - description: A generated profile based on top-lvl package list. + description: A minimal tomcat installation. rpms: - tomcat - tomcat-el-3.0-api - tomcat-jsp-2.3-api - - tomcatjss - tomcat-lib - - tomcat-servlet-3.1-api + - tomcat-servlet-4.0-api components: rpms: ecj: rationale: Generated. - ref: f27 - jss: - rationale: Generated. - ref: f27 + ref: master tomcat: rationale: Generated. - ref: f27 - tomcatjss: - rationale: Generated. - ref: f27 + ref: master From 52cc812bcbbcd40cb139accd5e9aa86cf408c69f Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 12 Aug 2019 11:54:34 -0400 Subject: [PATCH 02/11] Updating summary and description along with dependency information --- tomcat.yaml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/tomcat.yaml b/tomcat.yaml index 871edde..c01cbdc 100644 --- a/tomcat.yaml +++ b/tomcat.yaml @@ -1,22 +1,21 @@ document: modulemd version: 1 data: - summary: tomcat module - description: This tomcat module has been generated. + summary: Apache Servlet/JSP Engine, RI for Servlet 4.0/JSP 2.3 API + description: >- + Tomcat is the servlet container that is used in the official Reference + Implementation for the Java Servlet and JavaServer Pages technologies. + The Java Servlet and JavaServer Pages specifications are developed by + Sun under the Java Community Process. license: module: - MIT dependencies: buildrequires: - bootstrap: master + platform: [] requires: - platform: master - java: master - apache-commons: master - references: - community: https://docs.pagure.org/modularity/ - documentation: https://github.com/modularity-modules/tomcat - tracker: https://github.com/modularity-modules/tomcat + platform: [] + javapackages-tools: [] api: rpms: - tomcat @@ -36,8 +35,8 @@ data: components: rpms: ecj: - rationale: Generated. + rationale: Required for building JSPs at Runtime. ref: master tomcat: - rationale: Generated. + rationale: Provides core server functionality. ref: master From e0e15aa7dd60207d91ddc40777972d3e0a15214d Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 12 Aug 2019 12:00:02 -0400 Subject: [PATCH 03/11] Try and fix yaml syntax --- tomcat.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tomcat.yaml b/tomcat.yaml index c01cbdc..ad6f10b 100644 --- a/tomcat.yaml +++ b/tomcat.yaml @@ -11,11 +11,11 @@ data: module: - MIT dependencies: - buildrequires: - platform: [] - requires: - platform: [] - javapackages-tools: [] + - buildrequires: + platform: [] + requires: + platform: [] + javapackages-tools: [] api: rpms: - tomcat From 419a2e1a31bc239c010a709d0c5f6cff7073a8b2 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 12 Aug 2019 12:15:47 -0400 Subject: [PATCH 04/11] Fix syntax and update modulemd version --- tomcat.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tomcat.yaml b/tomcat.yaml index ad6f10b..661333b 100644 --- a/tomcat.yaml +++ b/tomcat.yaml @@ -1,5 +1,6 @@ +--- document: modulemd -version: 1 +version: 2 data: summary: Apache Servlet/JSP Engine, RI for Servlet 4.0/JSP 2.3 API description: >- From 96714e2d00e9b214242d0a650533760b92512222 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 13 Aug 2019 20:08:36 +0000 Subject: [PATCH 05/11] Branching f31 from rawhide Signed-off-by: Fedora Release Engineering From 675493d91e00d8d7447c03cc5d6d0e9d111f925f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 22 Sep 2019 13:37:32 +0000 Subject: [PATCH 06/11] 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 819b62a13b791ad107c6dd43b958f8e1e3358e96 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 26 Sep 2019 16:46:57 -0400 Subject: [PATCH 07/11] Seems that this is unnecessary --- tomcat.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/tomcat.yaml b/tomcat.yaml index 661333b..4e28bdc 100644 --- a/tomcat.yaml +++ b/tomcat.yaml @@ -1,4 +1,3 @@ ---- document: modulemd version: 2 data: From b668f1bd7f2de54c3c9e05b01b36b747d9bba76a Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Mon, 30 Sep 2019 08:06:58 -0400 Subject: [PATCH 08/11] Ignore the local mbs db --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..44990c4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.mbs_local_build.db From c14c573140fb70bf0f5a368d9cd4bec83d3deb6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 6 Feb 2020 18:32:55 +0000 Subject: [PATCH 09/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 482e6ff787030685e3f68ee7b1b0abe83571658a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 15 Feb 2020 01:36:12 +0000 Subject: [PATCH 10/11] Branching f32 from rawhide Signed-off-by: Fedora Release Engineering From 42eb4eac67ed97357de2843459ed7d224bc774da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Aug 2020 14:32:21 +0000 Subject: [PATCH 11/11] Branching f33 from rawhide Signed-off-by: Fedora Release Engineering