Import from CS git

2025-03-17 17:47:41 +03:00 · 2025-03-17 17:47:41 +03:00 · b091d1f9eb
commit b091d1f9eb
parent 5351cac28c
1 changed files with 89 additions and 82 deletions
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@ -2,7 +2,7 @@
 document: modulemd
 version: 2
 data:
-    stream: 3.8
+    stream: 3.9
    context: 470dcefd
    static_context: true
    summary: Java project management and project comprehension tool
@ -16,28 +16,40 @@ data:
            - MIT
    dependencies:
        - buildrequires:
-              javapackages-tools: [202201]
+              javapackages-tools: [202501]
              platform: [el9]
          requires:
              platform: [el9]
    profiles:
        common:
+            rpms:
+                - maven
+        openjdk8:
+            rpms:
+                - maven-openjdk8
+        openjdk11:
            rpms:
                - maven-openjdk11
+        openjdk17:
+            rpms:
+                - maven-openjdk17
+        openjdk21:
+            rpms:
+                - maven-openjdk21
    api:
        rpms:
            - maven
            - maven-openjdk8
            - maven-openjdk11
            - maven-openjdk17
+            - maven-openjdk21
    filter:
        rpms:
+            - aopalliance-javadoc
            - apache-commons-cli-javadoc
            - apache-commons-codec-javadoc
            - apache-commons-io-javadoc
-            - apache-commons-lang3-javadoc
            - atinject-javadoc
-            - cdi-api-javadoc
            - google-guice-javadoc
            - guava-javadoc
            - guava-testlib
@ -47,13 +59,14 @@ data:
            - guice-grapher
            - guice-jmx
            - guice-jndi
-            - guice-multibindings
            - guice-parent
            - guice-servlet
            - guice-throwingproviders
            - httpcomponents-client-javadoc
            - httpcomponents-core-javadoc
            - jakarta-annotations-javadoc
+            - jansi-debuginfo
+            - jansi-debugsource
            - jansi-javadoc
            - jsr-305-javadoc
            - jul-to-slf4j
@ -64,14 +77,13 @@ data:
            - maven-wagon-javadoc
            - plexus-cipher-javadoc
            - plexus-classworlds-javadoc
-            - plexus-containers
            - plexus-containers-component-metadata
-            - plexus-containers-container-default
            - plexus-containers-javadoc
            - plexus-interpolation-javadoc
            - plexus-sec-dispatcher-javadoc
            - plexus-utils-javadoc
            - sisu-javadoc
+            - sisu-maven-plugin
            - slf4j-javadoc
            - slf4j-jcl
            - slf4j-jdk14
@ -81,107 +93,102 @@ data:
    buildopts:
        rpms:
            macros: |
-                %_without_maven_resolver_extra_modules 1
                %java_arches aarch64 ppc64le s390x x86_64
    components:
        rpms:
            apache-commons-cli:
                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
+                ref: stream-maven-3.9-rhel-9.6.0
                rationale: Runtime dependency of maven.
            apache-commons-codec:
                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
+                ref: stream-maven-3.9-rhel-9.6.0
                rationale: Runtime dependency of maven.
            apache-commons-io:
                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
+                ref: stream-maven-3.9-rhel-9.6.0
                rationale: Runtime dependency of maven.
-            apache-commons-lang3:
+            aopalliance:
                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            atinject:
-                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            cdi-api:
-                buildorder: 20
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            google-guice:
-                buildorder: 30
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            guava:
-                buildorder: 20
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            httpcomponents-client:
-                buildorder: 20
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            httpcomponents-core:
-                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            jakarta-annotations:
-                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            jansi:
-                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
+                ref: stream-maven-3.9-rhel-9.6.0
                rationale: Runtime dependency of maven.
            jsr-305:
                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
+                ref: stream-maven-3.9-rhel-9.6.0
                rationale: Runtime dependency of maven.
-            maven:
-                buildorder: 50
-                ref: stream-maven-3.8-rhel-9.2.0
-                rationale: Module API.
-            maven-resolver:
-                buildorder: 40
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            maven-shared-utils:
-                buildorder: 20
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            maven-wagon:
-                buildorder: 30
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            plexus-cipher:
+            atinject:
                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
+                ref: stream-maven-3.9-rhel-9.6.0
                rationale: Runtime dependency of maven.
            plexus-classworlds:
                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            plexus-containers:
-                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            plexus-interpolation:
-                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
-                rationale: Runtime dependency of maven.
-            plexus-sec-dispatcher:
-                buildorder: 20
-                ref: stream-maven-3.8-rhel-9.1.0
+                ref: stream-maven-3.9-rhel-9.6.0
                rationale: Runtime dependency of maven.
            plexus-utils:
                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
+                ref: stream-maven-3.9-rhel-9.6.0
                rationale: Runtime dependency of maven.
-            sisu:
-                buildorder: 30
-                ref: stream-maven-3.8-rhel-9.1.0
+            plexus-containers:
+                buildorder: 10
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            httpcomponents-core:
+                buildorder: 10
+                ref: stream-maven-3.9-rhel-9.6.0
                rationale: Runtime dependency of maven.
            slf4j:
                buildorder: 10
-                ref: stream-maven-3.8-rhel-9.1.0
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            jakarta-annotations:
+                buildorder: 10
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            jansi:
+                buildorder: 10
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            plexus-interpolation:
+                buildorder: 10
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            guava:
+                buildorder: 20
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            sisu:
+                buildorder: 20
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            httpcomponents-client:
+                buildorder: 20
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            maven-shared-utils:
+                buildorder: 20
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            plexus-cipher:
+                buildorder: 20
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            google-guice:
+                buildorder: 30
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            plexus-sec-dispatcher:
+                buildorder: 30
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            maven-wagon:
+                buildorder: 30
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            maven-resolver:
+                buildorder: 40
+                ref: stream-maven-3.9-rhel-9.6.0
+                rationale: Runtime dependency of maven.
+            maven:
+                buildorder: 50
+                ref: stream-maven-3.9-rhel-9.6.0
                rationale: Runtime dependency of maven.