Branching f33 from rawhide

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
Bump the build platform to F30
2020-08-19 16:39:57 +00:00 · 2020-04-07 15:36:26 -04:00 · 2020-04-07 15:30:34 -04:00 · 2019-10-30 10:47:46 +01:00 · 2019-10-30 10:47:17 +01:00 · 2019-10-30 10:46:41 +01:00
2 changed files with 64 additions and 96 deletions
--- 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,
@ -35,11 +32,13 @@ config = {
        "java-1.8.0-openjdk",
    ],
    "frozen_refs": [
-        "python-lxml",
    ],
    "stream_override": {
-        "java": {
-            "f27": "8",
+        "javapackages-tools": {
+            "3.5": "[201801]",
+        },
+        "platform": {
+            "3.5": "[]",
        },
    },

@ -51,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,
@ -68,6 +68,7 @@ config = {
        "_without_jmh": 1,
        "_without_jna": 1,
        "_without_jpa": 1,
+        "_without_junit5": 1,
        "_without_logback": 1,
        "_without_markdown": 1,
        "_without_memcached": 1,
@ -76,25 +77,27 @@ 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",
-    "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.kjnet.xyz/kojihub",
+        "topurl": "https://koji.kjnet.xyz/kojifiles",
        "multicall_chunk_size": 1000,
-        "tag_name": "module",
+        "tag_name": "jp-201801",
    },
    "dependency": {
        "repo_arch": "x86_64",
--- a/maven.yaml
+++ b/maven.yaml
@ -13,7 +13,8 @@ data:
            - MIT
    dependencies:
        - buildrequires:
-              javapackages-tools: [master]
+              javapackages-tools: [201801]
+              platform: [f30]
          requires:
              platform: []
    profiles:
@ -35,10 +36,9 @@ data:
            - atinject-tck
            - cdi-api-javadoc
            - geronimo-annotation-javadoc
-            - glassfish-el
-            - glassfish-el-javadoc
            - google-guice-javadoc
-            - guava-javadoc
+            - guava20-javadoc
+            - guava20-testlib
            - guice-assistedinject
            - guice-bom
            - guice-extensions
@ -52,12 +52,10 @@ 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
            - jul-to-slf4j
            - log4j-over-slf4j
@ -67,8 +65,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
@ -103,6 +99,7 @@ data:
                %_without_cython 1
                %_without_dafsa 1
                %_without_desktop 1
+                %_without_dom4j 1
                %_without_doxygen 1
                %_without_dtd 1
                %_without_eclipse 1
@ -120,6 +117,7 @@ data:
                %_without_jmh 1
                %_without_jna 1
                %_without_jpa 1
+                %_without_junit5 1
                %_without_logback 1
                %_without_markdown 1
                %_without_memcached 1
@ -128,199 +126,166 @@ 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-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:
+            guava20:
                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
+                    Runtime dependency of maven, maven-resolver,
+                         maven-wagon.
            httpcomponents-core:
                buildorder: 10
-                ref: master
+                ref: javapackages
                rationale: >
                    Runtime dependency of httpcomponents-client, maven,
-                         maven-wagon.
-            # jansi-1.16-2.fc28
+                         maven-resolver, maven-wagon.
            jansi:
                buildorder: 30
-                ref: master
+                ref: javapackages
                rationale: >
                    Runtime dependency of maven.
-            # jansi-native-1.7-3.fc28
            jansi-native:
                buildorder: 20
-                ref: master
-                multilib: []
+                ref: javapackages
                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
-                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.
+                    Runtime dependency of maven, maven-resolver,
+                         maven-wagon.
Author	SHA1	Message	Date
Fedora Release Engineering	86d4e61a7c	Branching f33 from rawhide Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-08-19 16:39:57 +00:00
Stephen Gallagher	ed792d2514	Bump the build platform to F30 Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>	2020-04-07 15:36:26 -04:00
Stephen Gallagher	bb5b451627	Re-add glassfish-el without filtering it Resolves: rhbz#1759179 This reverts commit `5fec27ad4b`. Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>	2020-04-07 15:30:34 -04:00
Mikolaj Izdebski	d794e8573d	New CG build for Fedora 31+	2019-10-30 10:47:46 +01:00
Mikolaj Izdebski	a86632fa40	New CG build for Fedora 30	2019-10-30 10:47:17 +01:00
Mikolaj Izdebski	9c01ca02a1	New CG build for Fedora 29	2019-10-30 10:46:41 +01:00
Mikolaj Izdebski	5616423c02	Drop jboss-interceptors-1.2-api	2019-10-30 09:06:39 +01:00
Mikolaj Izdebski	e6b4f10ac1	Switch to platform:f29	2019-10-15 13:34:25 +02:00
Mikolaj Izdebski	5fec27ad4b	Drop glassfish-el, resolves rhbz#1759179	2019-10-10 14:13:44 +01:00
Mikolaj Izdebski	b0f40bdc81	New CG build	2019-04-16 23:18:33 +02:00
Mikolaj Izdebski	3067797add	New CG build	2019-04-16 23:16:30 +02:00
Mikolaj Izdebski	3da5a9c52a	Include additional components Adds the following components to the module: - httpcomponents-client-cache - maven-resolver-transport-file - maven-resolver-transport-http Resolves rhbz#1698504	2019-04-16 04:03:32 +02:00
Mikolaj Izdebski	81c4875b99	Update Koji config in koschei.cfg	2019-04-16 04:02:16 +02:00
Mikolaj Izdebski	af8d2de608	Add explicit buildrequires on platform	2018-11-21 00:09:09 +01:00
Mikolaj Izdebski	2532146cbf	Update macros in koschei.cfg	2018-11-20 09:37:47 +01:00
Michael Simacek	d6a65ee848	Full rebuild	2018-08-06 11:09:04 +02:00
Mikolaj Izdebski	224ccb2073	Rebase to Maven 3.5.4	2018-06-29 17:39:19 +02:00
Mikolaj Izdebski	fb01854be7	Regenerate component list	2018-04-11 13:24:02 +02:00
Mikolaj Izdebski	c0b691ce29	Buildrequire javapackages-tools 201801	2018-04-10 21:38:37 +02:00
Mikolaj Izdebski	eeb2e5a475	Switch refs to javapackages arbitrary branch	2018-04-10 21:03:10 +02:00