From 759417324442b458d0767d8fde09eb8adc9fb7b7 Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Thu, 29 Jun 2023 11:16:00 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .fmf/version | 1 + .gitignore | 33 +++++++++++++++++++++++----- README.md | 3 +++ ci.fmf | 1 + gating.yaml | 9 ++++++++ generate-bundled-provides.sh | 42 ++++++++++++++++++++++++++++++++++++ generate-sources-list.sh | 8 +++++++ plans/javapackages.fmf | 7 ++++++ plans/smoke.fmf | 12 +++++++++++ sources | 2 +- 10 files changed, 112 insertions(+), 6 deletions(-) create mode 100644 .fmf/version create mode 100644 README.md create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 generate-bundled-provides.sh create mode 100644 generate-sources-list.sh create mode 100644 plans/javapackages.fmf create mode 100644 plans/smoke.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index a756a1b..26aa478 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/javapackages-bootstrap-1.0.0.tar.xz /ant.tar.xz /apache-pom.tar.xz /apiguardian.tar.xz @@ -21,7 +22,6 @@ /commons-parent-pom.tar.xz /cup.tar.xz /easymock.tar.xz -/extra-enforcer-rules.tar.xz /felix-parent-pom.tar.xz /felix-utils.tar.xz /fusesource-pom.tar.xz @@ -33,11 +33,11 @@ /httpcomponents-parent-pom.tar.xz /injection-api.tar.xz /jansi.tar.xz -/javapackages-bootstrap-1.7.1.tar.xz /jcommander.tar.xz -/jdom.tar.xz /jdom2.tar.xz +/jdom.tar.xz /jflex.tar.xz +/jsoup.tar.xz /jsr-305.tar.xz /junit4.tar.xz /junit5.tar.xz @@ -67,9 +67,9 @@ /maven-shared-utils.tar.xz /maven-source-plugin.tar.xz /maven-surefire.tar.xz +/maven.tar.xz /maven-verifier.tar.xz /maven-wagon.tar.xz -/maven.tar.xz /mockito.tar.xz /modello.tar.xz /mojo-parent-pom.tar.xz @@ -81,7 +81,6 @@ /osgi-core.tar.xz /oss-parent-pom.tar.xz /plexus-archiver.tar.xz -/plexus-build-api.tar.xz /plexus-cipher.tar.xz /plexus-classworlds.tar.xz /plexus-compiler.tar.xz @@ -96,6 +95,7 @@ /plexus-utils.tar.xz /qdox.tar.xz /servlet-api.tar.xz +/sisu-build-api.tar.xz /sisu-inject.tar.xz /sisu-mojos.tar.xz /sisu-plexus.tar.xz @@ -107,3 +107,26 @@ /xmlunit.tar.xz /xmvn.tar.xz /xz-java.tar.xz +/javapackages-bootstrap-1.1.0.tar.xz +/javapackages-bootstrap-1.2.0.tar.xz +/javapackages-bootstrap-1.3.0.tar.xz +/javapackages-bootstrap-1.4.0.tar.xz +/javapackages-bootstrap-1.5.0.tar.xz +/1e296d5.tar.gz +/d348d92.tar.gz +/plexus-build-api.tar.xz +/94debe8.tar.gz +/1ccbeaf.tar.gz +/2daa95f.tar.gz +/d896ef9.tar.gz +/a0c34e8.tar.gz +/98aeb0b.tar.gz +/d76c032.tar.gz +/00bdfe7.tar.gz +/8493092.tar.gz +/9f283b7.tar.gz +/1cfada9.tar.gz +/4f9a68a.tar.gz +/extra-enforcer-rules.tar.xz +/javapackages-bootstrap-1.7.0.tar.xz +/javapackages-bootstrap-1.7.1.tar.xz diff --git a/README.md b/README.md new file mode 100644 index 0000000..f6b4b45 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# javapackages-bootstrap + +The javapackages-bootstrap package diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..7b6e38f --- /dev/null +++ b/gating.yaml @@ -0,0 +1,9 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/generate-bundled-provides.sh b/generate-bundled-provides.sh new file mode 100644 index 0000000..c882335 --- /dev/null +++ b/generate-bundled-provides.sh @@ -0,0 +1,42 @@ +#!/bin/sh +set -eu + +./generate-sources-list.sh | sed -n ' +s/^.* \(.*\)\.tar\.xz$/\1 \1/ +T +s/^commons-beanutils /apache-commons-beanutils / +s/^commons-cli /apache-commons-cli / +s/^commons-codec /apache-commons-codec / +s/^commons-collections /apache-commons-collections / +s/^commons-compress /apache-commons-compress / +s/^commons-io /apache-commons-io / +s/^commons-jxpath /apache-commons-jxpath / +s/^commons-lang /apache-commons-lang3 / +s/^commons-logging /apache-commons-logging / +s/^commons-parent-pom /apache-commons-parent / +s/^apache-pom /apache-parent / +s/^bnd /aqute-bnd / +s/^injection-api /atinject / +s/^jcommander /beust-jcommander / +s/^cdi /cdi-api / +s/^felix-parent-pom /felix-parent / +s/^guice /google-guice / +s/^httpcomponents-parent-pom /httpcomponents-project / +s/^common-annotations-api /jakarta-annotations / +s/^servlet-api /jakarta-servlet / +s/^cup /java_cup / +s/^junit4 /junit / +s/^maven-parent-pom /maven-parent / +s/^build-helper-maven-plugin /maven-plugin-build-helper / +s/^maven-bundle-plugin /maven-plugin-bundle / +s/^mojo-parent-pom /mojo-parent / +s/^asm /objectweb-asm / +s/^osgi-cmpn /osgi-compendium / +s/^sisu-inject /sisu / +s/^oss-parent-pom /sonatype-oss-parent / +s/^velocity-engine /velocity / +p +' | while read fp mp; do +. ./javapackages-bootstrap-*/project/$mp.properties +echo "Provides: bundled($fp) = $version" +done diff --git a/generate-sources-list.sh b/generate-sources-list.sh new file mode 100644 index 0000000..a372245 --- /dev/null +++ b/generate-sources-list.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -eu + +i=1000 +for p in $(ls javapackages-bootstrap-*/project/*.properties | xargs -n1 basename | sed s/.properties$//); do + i=$(expr $i + 1) + echo "Source$i: $p.tar.xz" +done diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..def0914 --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: + Run javapackages-specific tests +discover: + how: fmf + url: https://pagure.io/javapackages-validator-tests +execute: + how: tmt diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..ce42085 --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,12 @@ +summary: Basic smoke test +execute: + script: + - /usr/libexec/javapackages-bootstrap/mvn --version + - /usr/share/javapackages-bootstrap/bin/mvn --version + - /usr/libexec/javapackages-bootstrap/xmvn --version + - /usr/libexec/javapackages-bootstrap/xmvn-install --help + - /usr/libexec/javapackages-bootstrap/xmvn-resolve --help + - /usr/libexec/javapackages-bootstrap/xmvn-subst --help + - /usr/libexec/javapackages-bootstrap/ant -version + - echo 'non terminal bar; bar::=;' | /usr/libexec/javapackages-bootstrap/cup + - /usr/libexec/javapackages-bootstrap/jflex -version diff --git a/sources b/sources index 99133e8..99ca6af 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ +SHA512 (javapackages-bootstrap-1.7.1.tar.xz) = 2bb425478127950d242193f62cb2eb19abc6ed017368f6ca9b7449ea4688542e8d9abf8f523f88259d0fd2bf741ea317e388597771735493ebeca2aead5c1f46 SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152 SHA512 (apache-pom.tar.xz) = feebe0142114a6fb61dec26153bdef4314554d109bcf4910518ae9ecaf27e5dd9dc1f03d48271833f3497ab7045265900c5816708f513ae834643c533cd1291f SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf @@ -33,7 +34,6 @@ SHA512 (httpcomponents-core.tar.xz) = 6b643a3808e966b3f1d2dcdc5539d1d547f6e7460e SHA512 (httpcomponents-parent-pom.tar.xz) = 587e23e2c6caff80b61e1c6fc8b2a591ffb1175c1e3a5a95d611d9fb3e2dab85ef317b3f982424b727070356240fd24a7cbcce20e2e5bd787cac2bc6d93e2a71 SHA512 (injection-api.tar.xz) = a0faaa4aa4a94d1cf01387b9d327da2be5d5c016b6fa6aca3aed0d75d4bec2c9a04df12fdc3c67f17b03918584ab5261f8dc20ab620f1289e34f8ad8ee23c9a6 SHA512 (jansi.tar.xz) = 374f5ba2f55abd9ff5e15f009f94e9878bc077a62e0bd3ae3b18c5089c754478eefa991d8a4331330e052f7a65e551995821308cdb14e260dd84d6236945010e -SHA512 (javapackages-bootstrap-1.7.1.tar.xz) = 2bb425478127950d242193f62cb2eb19abc6ed017368f6ca9b7449ea4688542e8d9abf8f523f88259d0fd2bf741ea317e388597771735493ebeca2aead5c1f46 SHA512 (jcommander.tar.xz) = 9ff34b0e5dd391125c1f9a03175dffece39107ee133f5553323762ac10421161d693711934f10666b8177ab801a0dd03a63942b5635dae1aeb3432635cecb10e SHA512 (jdom.tar.xz) = 1a36168a0b8f2b9057855198e097fcb50992d9d79892cdeeb20eada43ad7a79acf4fda0a06496b8a36cb537577575504efc066774912a1c4d08288e716232579 SHA512 (jdom2.tar.xz) = f05f9114c337a20111a88e6e045de57d034344246f568f09f75344160cd8243a6bb5cbf14429f09090a1e3c3dcd2b05e5441ee7686c4a222f433eade81c25384