From 627fb404574f5cfad0dfcb93b4cb9be91b044513 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Thu, 20 Apr 2023 10:06:34 -0500 Subject: [PATCH] update rpm branch names and use c8s instead of c9s --- gating.yaml | 2 +- maven-3.8.yaml | 186 ------------------------------------------ maven.yaml | 55 +++++++------ plans/smoke-jdk11.fmf | 5 -- plans/smoke-jdk17.fmf | 5 -- plans/smoke-jdk8.fmf | 5 -- 6 files changed, 29 insertions(+), 229 deletions(-) delete mode 100644 maven-3.8.yaml delete mode 100644 plans/smoke-jdk11.fmf delete mode 100644 plans/smoke-jdk17.fmf delete mode 100644 plans/smoke-jdk8.fmf diff --git a/gating.yaml b/gating.yaml index eb7599c..e811d68 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,6 +1,6 @@ --- !Policy product_versions: - - rhel-9 + - rhel-8 decision_context: osci_compose_gate_modules subject_type: redhat-module rules: diff --git a/maven-3.8.yaml b/maven-3.8.yaml deleted file mode 100644 index e9370bd..0000000 --- a/maven-3.8.yaml +++ /dev/null @@ -1,186 +0,0 @@ ---- -document: modulemd -version: 2 -data: - name: maven - stream: 3.8 - 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. - license: - module: - - MIT - dependencies: - - buildrequires: - javapackages-tools: [202201] - platform: [el8] - requires: - platform: [el8] - profiles: - common: - rpms: - - maven-openjdk11 - api: - rpms: - - maven - - maven-openjdk8 - - maven-openjdk11 - - maven-openjdk17 - filter: - rpms: - - 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 - - guice-assistedinject - - guice-bom - - guice-extensions - - guice-grapher - - guice-jmx - - guice-jndi - - guice-multibindings - - guice-parent - - guice-servlet - - guice-throwingproviders - - httpcomponents-client-javadoc - - httpcomponents-core-javadoc - - jakarta-annotations-javadoc - - jansi-javadoc - - jsr-305-javadoc - - jul-to-slf4j - - log4j-over-slf4j - - maven-javadoc - - maven-resolver-javadoc - - maven-shared-utils-javadoc - - 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 - - slf4j-javadoc - - slf4j-jcl - - slf4j-jdk14 - - slf4j-manual - - slf4j-migrator - - slf4j-sources - buildopts: - rpms: - macros: | - %_without_maven_resolver_extra_modules 1 - %java_arches aarch64 ppc64le s390x x86_64 - components: - rpms: - apache-commons-cli: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - apache-commons-codec: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - apache-commons-io: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - apache-commons-lang3: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - atinject: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - cdi-api: - buildorder: 20 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - google-guice: - buildorder: 30 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - guava: - buildorder: 20 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - httpcomponents-client: - buildorder: 20 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - httpcomponents-core: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - jakarta-annotations: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - jansi: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - jsr-305: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - maven: - buildorder: 50 - ref: c8s-stream-3.8 - rationale: Module API. - maven-resolver: - buildorder: 40 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - maven-shared-utils: - buildorder: 20 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - maven-wagon: - buildorder: 30 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - plexus-cipher: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - plexus-classworlds: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - plexus-containers: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - plexus-interpolation: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - plexus-sec-dispatcher: - buildorder: 20 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - plexus-utils: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - sisu: - buildorder: 30 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. - slf4j: - buildorder: 10 - ref: c8s-stream-3.8 - rationale: Runtime dependency of maven. diff --git a/maven.yaml b/maven.yaml index 98140ca..26979d7 100644 --- a/maven.yaml +++ b/maven.yaml @@ -2,6 +2,7 @@ document: modulemd version: 2 data: + name: maven stream: 3.8 summary: Java project management and project comprehension tool description: >- @@ -15,9 +16,9 @@ data: dependencies: - buildrequires: javapackages-tools: [202201] - platform: [el9] + platform: [el8] requires: - platform: [el9] + platform: [el8] profiles: common: rpms: @@ -85,101 +86,101 @@ data: rpms: apache-commons-cli: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. apache-commons-codec: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. apache-commons-io: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. apache-commons-lang3: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. atinject: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. cdi-api: buildorder: 20 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. google-guice: buildorder: 30 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. guava: buildorder: 20 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. httpcomponents-client: buildorder: 20 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. httpcomponents-core: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. jakarta-annotations: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. jansi: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. jsr-305: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. maven: buildorder: 50 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Module API. maven-resolver: buildorder: 40 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. maven-shared-utils: buildorder: 20 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. maven-wagon: buildorder: 30 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. plexus-cipher: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. plexus-classworlds: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. plexus-containers: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. plexus-interpolation: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. plexus-sec-dispatcher: buildorder: 20 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. plexus-utils: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. sisu: buildorder: 30 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. slf4j: buildorder: 10 - ref: stream-maven-3.8-rhel-9.1.0 + ref: stream-maven-3.8-rhel-8.9.0 rationale: Runtime dependency of maven. diff --git a/plans/smoke-jdk11.fmf b/plans/smoke-jdk11.fmf deleted file mode 100644 index afdd048..0000000 --- a/plans/smoke-jdk11.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test - OpenJDK 11 -execute: - script: - - dnf -y swap maven-jdk-binding maven-openjdk11 - - mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar diff --git a/plans/smoke-jdk17.fmf b/plans/smoke-jdk17.fmf deleted file mode 100644 index 01c0d85..0000000 --- a/plans/smoke-jdk17.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test - OpenJDK 17 -execute: - script: - - dnf -y swap maven-jdk-binding maven-openjdk17 - - mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar diff --git a/plans/smoke-jdk8.fmf b/plans/smoke-jdk8.fmf deleted file mode 100644 index 8e4baf4..0000000 --- a/plans/smoke-jdk8.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test - OpenJDK 8 -execute: - script: - - dnf -y swap maven-jdk-binding maven-openjdk8 - - mvn -V dependency:get -Dartifact=junit:junit:4.12 && stat $HOME/.m2/repository/junit/junit/4.12/junit-4.12.jar