From f583c3f489e6fbeec3bf8ced0040ce4dc4698d46 Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Tue, 5 Sep 2017 13:01:13 +0200 Subject: [PATCH 01/12] Initial version of resteasy module Signed-off-by: Tomas Hozza --- resteasy.yaml | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 resteasy.yaml diff --git a/resteasy.yaml b/resteasy.yaml new file mode 100644 index 0000000..defa1f7 --- /dev/null +++ b/resteasy.yaml @@ -0,0 +1,151 @@ +document: modulemd +version: 1 +data: + summary: resteasy module + description: resteasy module + license: + module: + - MIT + dependencies: + buildrequires: + bootstrap: master + requires: + platform: master + platform-placeholder: master + references: + community: https://docs.pagure.org/modularity/ + documentation: https://github.com/modularity-modules/resteasy + tracker: https://github.com/modularity-modules/resteasy + profiles: + default: + - resteasy + - resteasy-atom-provider + - resteasy-client + - resteasy-core + - resteasy-fastinfoset-provider + - resteasy-jackson-provider + - resteasy-jackson2-provider + - resteasy-javadoc + - resteasy-jaxb-provider + - resteasy-jettison-provider + - resteasy-json-p-provider + - resteasy-multipart-provider + - resteasy-netty3 + - resteasy-optional + - resteasy-test + - resteasy-validator-provider-11 + - resteasy-yaml-provider + api: + rpms: + - resteasy + - resteasy-atom-provider + - resteasy-client + - resteasy-core + - resteasy-fastinfoset-provider + - resteasy-jackson-provider + - resteasy-jackson2-provider + - resteasy-javadoc + - resteasy-jaxb-provider + - resteasy-jettison-provider + - resteasy-json-p-provider + - resteasy-multipart-provider + - resteasy-netty3 + - resteasy-optional + - resteasy-test + - resteasy-validator-provider-11 + - resteasy-yaml-provider + components: + rpms: + apache-commons-codec: + rationale: Generated. + ref: master + apache-commons-io: + rationale: Generated. + ref: master + apache-commons-logging: + rationale: Generated. + ref: master + bea-stax: + rationale: Generated. + ref: master + copy-jdk-configs: + rationale: Generated. + ref: master + freetype: + rationale: Generated. + ref: master + glassfish-fastinfoset: + rationale: Generated. + ref: master + glassfish-jaxb: + rationale: Generated. + ref: master + glassfish-jaxb-api: + rationale: Generated. + ref: master + httpcomponents-client: + rationale: Generated. + ref: master + httpcomponents-core: + rationale: Generated. + ref: master + istack-commons: + rationale: Generated. + ref: master + jackson: + rationale: Generated. + ref: master + java-1.8.0-openjdk: + rationale: Generated. + ref: master + javapackages-tools: + rationale: Generated. + ref: master + jboss-annotations-1.2-api: + rationale: Generated. + ref: master + jboss-jaxrs-2.0-api: + rationale: Generated. + ref: master + jboss-logging: + rationale: Generated. + ref: master + jcip-annotations: + rationale: Generated. + ref: master + joda-time: + rationale: Generated. + ref: master + jsr-311: + rationale: Generated. + ref: master + libpng: + rationale: Generated. + ref: master + lua-posix: + rationale: Generated. + ref: master + objectweb-asm3: + rationale: Generated. + ref: master + relaxngDatatype: + rationale: Generated. + ref: master + resteasy: + rationale: Generated. + ref: master + stax2-api: + rationale: Generated. + ref: master + stax-ex: + rationale: Generated. + ref: master + which: + rationale: Generated. + ref: master + xmlstreambuffer: + rationale: Generated. + ref: master + xsom: + rationale: Generated. + ref: master From 7c5abd1bbc8df363429e95bee985cb6d7ba46b5f Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Tue, 5 Sep 2017 15:20:07 +0200 Subject: [PATCH 02/12] add generated modulemd --- resteasy.yaml | 117 ++++++++++++++------------------------------------ 1 file changed, 33 insertions(+), 84 deletions(-) diff --git a/resteasy.yaml b/resteasy.yaml index defa1f7..aa97bef 100644 --- a/resteasy.yaml +++ b/resteasy.yaml @@ -2,7 +2,7 @@ document: modulemd version: 1 data: summary: resteasy module - description: resteasy module + description: This resteasy module has been generated. license: module: - MIT @@ -11,141 +11,90 @@ data: bootstrap: master requires: platform: master - platform-placeholder: master + java: master + apache-commons: master references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/resteasy tracker: https://github.com/modularity-modules/resteasy - profiles: - default: - - resteasy - - resteasy-atom-provider - - resteasy-client - - resteasy-core - - resteasy-fastinfoset-provider - - resteasy-jackson-provider - - resteasy-jackson2-provider - - resteasy-javadoc - - resteasy-jaxb-provider - - resteasy-jettison-provider - - resteasy-json-p-provider - - resteasy-multipart-provider - - resteasy-netty3 - - resteasy-optional - - resteasy-test - - resteasy-validator-provider-11 - - resteasy-yaml-provider api: rpms: - - resteasy - resteasy-atom-provider - resteasy-client - resteasy-core - - resteasy-fastinfoset-provider - resteasy-jackson-provider - - resteasy-jackson2-provider - - resteasy-javadoc - resteasy-jaxb-provider - - resteasy-jettison-provider - - resteasy-json-p-provider - - resteasy-multipart-provider - - resteasy-netty3 - - resteasy-optional - - resteasy-test - - resteasy-validator-provider-11 - - resteasy-yaml-provider + profiles: + default: + description: A generated profile based on top-lvl package list. + rpms: + - resteasy-atom-provider + - resteasy-client + - resteasy-core + - resteasy-jackson-provider + - resteasy-jaxb-provider components: rpms: - apache-commons-codec: - rationale: Generated. - ref: master - apache-commons-io: - rationale: Generated. - ref: master - apache-commons-logging: - rationale: Generated. - ref: master bea-stax: rationale: Generated. - ref: master - copy-jdk-configs: - rationale: Generated. - ref: master - freetype: - rationale: Generated. - ref: master + ref: f27 glassfish-fastinfoset: rationale: Generated. - ref: master + ref: f27 glassfish-jaxb: rationale: Generated. - ref: master + ref: f27 glassfish-jaxb-api: rationale: Generated. - ref: master + ref: f27 httpcomponents-client: rationale: Generated. - ref: master + ref: f27 httpcomponents-core: rationale: Generated. - ref: master + ref: f27 istack-commons: rationale: Generated. - ref: master + ref: f27 jackson: rationale: Generated. - ref: master - java-1.8.0-openjdk: - rationale: Generated. - ref: master - javapackages-tools: - rationale: Generated. - ref: master + ref: f27 jboss-annotations-1.2-api: rationale: Generated. - ref: master + ref: f27 jboss-jaxrs-2.0-api: rationale: Generated. - ref: master + ref: f27 jboss-logging: rationale: Generated. - ref: master + ref: f27 jcip-annotations: rationale: Generated. - ref: master + ref: f27 joda-time: rationale: Generated. - ref: master + ref: f27 jsr-311: rationale: Generated. - ref: master - libpng: - rationale: Generated. - ref: master - lua-posix: - rationale: Generated. - ref: master + ref: f27 objectweb-asm3: rationale: Generated. - ref: master + ref: f27 relaxngDatatype: rationale: Generated. - ref: master + ref: f27 resteasy: rationale: Generated. - ref: master + ref: f27 stax2-api: rationale: Generated. - ref: master + ref: f27 stax-ex: rationale: Generated. - ref: master - which: - rationale: Generated. - ref: master + ref: f27 xmlstreambuffer: rationale: Generated. - ref: master + ref: f27 xsom: rationale: Generated. - ref: master + ref: f27 From 6246223a586c5825ad888b1eb95efdfbe237fb35 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 9 Nov 2017 13:41:59 +0100 Subject: [PATCH 03/12] initial 3.0 version, conflicts with maven --- resteasy.yaml | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 resteasy.yaml diff --git a/resteasy.yaml b/resteasy.yaml new file mode 100644 index 0000000..e98fb76 --- /dev/null +++ b/resteasy.yaml @@ -0,0 +1,109 @@ +document: modulemd +version: 1 +data: + summary: resteasy module + description: This resteasy module has been generated. + license: + module: + - MIT + dependencies: + buildrequires: + bootstrap: f27 + maven: master + requires: + platform: f27 + java: 8 + apache-commons: f27 + references: + community: https://docs.pagure.org/modularity/ + documentation: https://github.com/modularity-modules/resteasy + tracker: https://github.com/modularity-modules/resteasy + api: + rpms: + - resteasy-atom-provider + - resteasy-client + - resteasy-core + - resteasy-jackson-provider + - resteasy-jaxb-provider + profiles: + default: + description: A generated profile based on top-lvl package list. + rpms: + - resteasy-atom-provider + - resteasy-client + - resteasy-core + - resteasy-jackson-provider + - resteasy-jaxb-provider + components: + rpms: + # in maven: + bea-stax: + rationale: Generated. + ref: f27 + glassfish-fastinfoset: + rationale: Generated. + ref: f27 + glassfish-jaxb: + rationale: Generated. + ref: f27 + # in maven: + glassfish-jaxb-api: + rationale: Generated. + ref: f27 + # in maven: + httpcomponents-client: + rationale: Generated. + ref: f27 + # in maven: + httpcomponents-core: + rationale: Generated. + ref: f27 + istack-commons: + rationale: Generated. + ref: f27 + # in maven: + jackson: + rationale: Generated. + ref: f27 + jboss-annotations-1.2-api: + rationale: Generated. + ref: f27 + jboss-jaxrs-2.0-api: + rationale: Generated. + ref: f27 + jboss-logging: + rationale: Generated. + ref: f27 + jcip-annotations: + rationale: Generated. + ref: f27 + # in maven: + joda-time: + rationale: Generated. + ref: f27 + jsr-311: + rationale: Generated. + ref: f27 + # in maven: + objectweb-asm3: + rationale: Generated. + ref: f27 + # in maven: + relaxngDatatype: + rationale: Generated. + ref: f27 + resteasy: + rationale: Generated. + ref: f27 + stax2-api: + rationale: Generated. + ref: f27 + stax-ex: + rationale: Generated. + ref: f27 + xmlstreambuffer: + rationale: Generated. + ref: f27 + xsom: + rationale: Generated. + ref: f27 From b900b58dd99962a7a87d7dc00c25ccece2081a45 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 15 Nov 2017 14:08:24 +0100 Subject: [PATCH 04/12] disable maven BR --- resteasy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resteasy.yaml b/resteasy.yaml index e98fb76..90c6006 100644 --- a/resteasy.yaml +++ b/resteasy.yaml @@ -9,7 +9,7 @@ data: dependencies: buildrequires: bootstrap: f27 - maven: master + # maven: master requires: platform: f27 java: 8 From 6e8fcf41890485f2038bda7061f6d66844f0dfd9 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 15 Nov 2017 22:26:11 +0100 Subject: [PATCH 05/12] build 3.0 stream --- resteasy.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resteasy.yaml b/resteasy.yaml index 90c6006..cacb439 100644 --- a/resteasy.yaml +++ b/resteasy.yaml @@ -14,6 +14,10 @@ data: platform: f27 java: 8 apache-commons: f27 + # maven: f27 doesn't exist yet, we have only master which + # requires platform: master + # At the moment this module is not installable + # maven: f27 references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/resteasy From 4368da6c2fe5efe1dae25a3739c2ceb6a3baefb5 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 20 Nov 2017 16:17:33 +0100 Subject: [PATCH 06/12] require maven:f27, filter out packages shipped in maven Signed-off-by: Karsten Hopp --- resteasy.yaml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/resteasy.yaml b/resteasy.yaml index cacb439..f45500d 100644 --- a/resteasy.yaml +++ b/resteasy.yaml @@ -14,10 +14,7 @@ data: platform: f27 java: 8 apache-commons: f27 - # maven: f27 doesn't exist yet, we have only master which - # requires platform: master - # At the moment this module is not installable - # maven: f27 + maven: f27 references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/resteasy @@ -38,6 +35,26 @@ data: - resteasy-core - resteasy-jackson-provider - resteasy-jaxb-provider + filter: + rpms: + - bea-stax + - bea-stax-api + - bea-stax-javadoc + - glassfish-jaxb-api + - glassfish-jaxb-api-javadoc + - httpcomponents-client + - httpcomponents-client-cache + - httpcomponents-client-javadoc + - httpcomponents-core + - httpcomponents-core-javadoc + - jackson + - jackson-javadoc + - joda-time + - joda-time-javadoc + - objectweb-asm3 + - objectweb-asm3-javadoc + - relaxngDatatype + - relaxngDatatype-javadoc components: rpms: # in maven: From f9fd5e7daa1a30a765f3bd1e754b41aeaea3fbeb Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 21 Nov 2017 13:13:51 +0100 Subject: [PATCH 07/12] disable components that are in bootstrap and maven --- resteasy.yaml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/resteasy.yaml b/resteasy.yaml index f45500d..13e8238 100644 --- a/resteasy.yaml +++ b/resteasy.yaml @@ -58,9 +58,9 @@ data: components: rpms: # in maven: - bea-stax: - rationale: Generated. - ref: f27 + #bea-stax: + # rationale: Generated. + # ref: f27 glassfish-fastinfoset: rationale: Generated. ref: f27 @@ -68,24 +68,24 @@ data: rationale: Generated. ref: f27 # in maven: - glassfish-jaxb-api: - rationale: Generated. - ref: f27 + #glassfish-jaxb-api: + # rationale: Generated. + # ref: f27 # in maven: - httpcomponents-client: - rationale: Generated. - ref: f27 + #httpcomponents-client: + # rationale: Generated. + # ref: f27 # in maven: - httpcomponents-core: - rationale: Generated. - ref: f27 + #httpcomponents-core: + # rationale: Generated. + # ref: f27 istack-commons: rationale: Generated. ref: f27 # in maven: - jackson: - rationale: Generated. - ref: f27 + #jackson: + # rationale: Generated. + # ref: f27 jboss-annotations-1.2-api: rationale: Generated. ref: f27 @@ -99,20 +99,20 @@ data: rationale: Generated. ref: f27 # in maven: - joda-time: - rationale: Generated. - ref: f27 + #joda-time: + # rationale: Generated. + # ref: f27 jsr-311: rationale: Generated. ref: f27 # in maven: - objectweb-asm3: - rationale: Generated. - ref: f27 + #objectweb-asm3: + # rationale: Generated. + # ref: f27 # in maven: - relaxngDatatype: - rationale: Generated. - ref: f27 + #relaxngDatatype: + # rationale: Generated. + # ref: f27 resteasy: rationale: Generated. ref: f27 From fa508708ade434f67b4a2fc175d2802950803624 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 21 Nov 2017 15:41:36 +0100 Subject: [PATCH 08/12] drop packages from maven --- resteasy.yaml | 52 --------------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/resteasy.yaml b/resteasy.yaml index 13e8238..7fba229 100644 --- a/resteasy.yaml +++ b/resteasy.yaml @@ -35,57 +35,17 @@ data: - resteasy-core - resteasy-jackson-provider - resteasy-jaxb-provider - filter: - rpms: - - bea-stax - - bea-stax-api - - bea-stax-javadoc - - glassfish-jaxb-api - - glassfish-jaxb-api-javadoc - - httpcomponents-client - - httpcomponents-client-cache - - httpcomponents-client-javadoc - - httpcomponents-core - - httpcomponents-core-javadoc - - jackson - - jackson-javadoc - - joda-time - - joda-time-javadoc - - objectweb-asm3 - - objectweb-asm3-javadoc - - relaxngDatatype - - relaxngDatatype-javadoc components: rpms: - # in maven: - #bea-stax: - # rationale: Generated. - # ref: f27 glassfish-fastinfoset: rationale: Generated. ref: f27 glassfish-jaxb: rationale: Generated. ref: f27 - # in maven: - #glassfish-jaxb-api: - # rationale: Generated. - # ref: f27 - # in maven: - #httpcomponents-client: - # rationale: Generated. - # ref: f27 - # in maven: - #httpcomponents-core: - # rationale: Generated. - # ref: f27 istack-commons: rationale: Generated. ref: f27 - # in maven: - #jackson: - # rationale: Generated. - # ref: f27 jboss-annotations-1.2-api: rationale: Generated. ref: f27 @@ -98,21 +58,9 @@ data: jcip-annotations: rationale: Generated. ref: f27 - # in maven: - #joda-time: - # rationale: Generated. - # ref: f27 jsr-311: rationale: Generated. ref: f27 - # in maven: - #objectweb-asm3: - # rationale: Generated. - # ref: f27 - # in maven: - #relaxngDatatype: - # rationale: Generated. - # ref: f27 resteasy: rationale: Generated. ref: f27 From df994483b07252fb1791a3caaf0a3502d631cb66 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 27 Nov 2017 14:04:13 +0000 Subject: [PATCH 09/12] move jsr-311 and stax2-api out of resteasy ...and into maven, see: https://src.fedoraproject.org/modules/maven/pull-request/2 Signed-off-by: Stephen Gallagher --- resteasy.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/resteasy.yaml b/resteasy.yaml index 7fba229..bac017d 100644 --- a/resteasy.yaml +++ b/resteasy.yaml @@ -58,15 +58,9 @@ data: jcip-annotations: rationale: Generated. ref: f27 - jsr-311: - rationale: Generated. - ref: f27 resteasy: rationale: Generated. ref: f27 - stax2-api: - rationale: Generated. - ref: f27 stax-ex: rationale: Generated. ref: f27 From 5b95c91e7731aa997956fc4f88ac03a44eb6a816 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 28 Nov 2017 16:23:25 +0100 Subject: [PATCH 10/12] add back jackson and its deps The maven module was the wrong place for these. While a separate 'jackson' module is the more clean thing to do, this is much quicker. --- resteasy.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/resteasy.yaml b/resteasy.yaml index bac017d..5ffa67d 100644 --- a/resteasy.yaml +++ b/resteasy.yaml @@ -46,6 +46,11 @@ data: istack-commons: rationale: Generated. ref: f27 + jackson: + buildorder: 1 + rationale: > + Runtime dependency of resteasy. + ref: f27 jboss-annotations-1.2-api: rationale: Generated. ref: f27 @@ -58,9 +63,19 @@ data: jcip-annotations: rationale: Generated. ref: f27 + jsr-311: + rationale: > + Runtime dependency of jackson. + Build dependency of jackson. + ref: f27 resteasy: rationale: Generated. ref: f27 + stax2-api: + rationale: > + Runtime dependency of jackson. + Build dependency of jackson. + ref: f27 stax-ex: rationale: Generated. ref: f27 From 5f022dbc78afa6862bfc1ad3b3d09d6c3f6e048a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 28 Nov 2017 18:26:01 +0100 Subject: [PATCH 11/12] bump From 42acfe97509266a5740768233b9829e14d410d83 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 6 Dec 2017 14:04:13 +0100 Subject: [PATCH 12/12] user master references, add jackson back --- resteasy.yaml | 62 ++++++++++++++++++++------------------------------- 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/resteasy.yaml b/resteasy.yaml index aa97bef..ed81285 100644 --- a/resteasy.yaml +++ b/resteasy.yaml @@ -13,6 +13,7 @@ data: platform: master java: master apache-commons: master + maven: master references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/resteasy @@ -35,66 +36,51 @@ data: - resteasy-jaxb-provider components: rpms: - bea-stax: - rationale: Generated. - ref: f27 glassfish-fastinfoset: rationale: Generated. - ref: f27 + ref: master glassfish-jaxb: rationale: Generated. - ref: f27 - glassfish-jaxb-api: - rationale: Generated. - ref: f27 - httpcomponents-client: - rationale: Generated. - ref: f27 - httpcomponents-core: - rationale: Generated. - ref: f27 + ref: master istack-commons: rationale: Generated. - ref: f27 + ref: master jackson: - rationale: Generated. - ref: f27 + buildorder: 1 + rationale: > + Runtime dependency of resteasy. + ref: master jboss-annotations-1.2-api: rationale: Generated. - ref: f27 + ref: master jboss-jaxrs-2.0-api: rationale: Generated. - ref: f27 + ref: master jboss-logging: rationale: Generated. - ref: f27 + ref: master jcip-annotations: rationale: Generated. - ref: f27 - joda-time: - rationale: Generated. - ref: f27 + ref: master jsr-311: - rationale: Generated. - ref: f27 - objectweb-asm3: - rationale: Generated. - ref: f27 - relaxngDatatype: - rationale: Generated. - ref: f27 + rationale: > + Runtime dependency of jackson. + Build dependency of jackson. + ref: master resteasy: rationale: Generated. - ref: f27 + ref: master stax2-api: - rationale: Generated. - ref: f27 + rationale: > + Runtime dependency of jackson. + Build dependency of jackson. + ref: master stax-ex: rationale: Generated. - ref: f27 + ref: master xmlstreambuffer: rationale: Generated. - ref: f27 + ref: master xsom: rationale: Generated. - ref: f27 + ref: master